XX-9567 - misc missing files and get rpm build working again

danchang · Jun 2, 2011 · 65bb1f6 · 65bb1f6
1 parent 9a7c8c0
commit 65bb1f6
Show file tree

Hide file tree

Showing 264 changed files with 798 additions and 1,820 deletions.
diff --git a/OpenACD b/OpenACD
diff --git a/config/project.am b/config/project.am
@@ -4,7 +4,6 @@
 utility_am_required ?= $(error Please include utility.am)
 $(utility_am_required)
 
-
 EXTRA_DIST = \
     config/revision-gen \
     CONTRIBUTORS \

diff --git a/mak/00-modules.mk.in b/mak/00-modules.mk.in
@@ -53,7 +53,6 @@ sipx = \
   sipXkarel \
   sipXnortel \
   sipXlg-nortel \
-  sipXlinksys \
   sipXmitel \
   sipXpolycom \
   sipXsnom \

diff --git a/sipXacdStatistics/LICENSE.txt → sipXaastra/CONTRIBUTORS b/sipXacdStatistics/LICENSE.txt → sipXaastra/CONTRIBUTORS
diff --git a/sipXaastra/LICENSE b/sipXaastra/LICENSE
@@ -0,0 +1,10 @@
+Copyright © 2011 SIPfoundry Inc.
+
+Certain elements licensed under a Contributor Agreement. Contributors retain copyright to elements licensed under a Contributor Agreement.
+
+Licensed to the user under the Affero General Public License (AGPL) version 3 or newer.
+
+The SIPfoundry and sipXecs names and logos are the property of SIPfoundry Inc. an may not be used without permission.
+
+This license and the SIPfoundry copyright may not be removed.
+All user facing (Web) interfaces that provide access to functionality or services provided in full or in part by this software must display the license and SIPfoundry copyright in a clearly visible way. By using this software you grant the right to SIPfoundry to use your name and logo to make such representation.
diff --git a/sipXaastra/README b/sipXaastra/README
diff --git a/sipXaastra/sipxaastra.spec.in b/sipXaastra/sipxaastra.spec.in
@@ -45,7 +45,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %{_sysconfdir}/sipxpbx/aastra/*
-%{_datadir}/java/sipXecs/sipXconfig/sipXaastra.jar
+%{_datadir}/java/sipXecs/sipXconfig/plugins/sipXaastra.jar
 
 
 
diff --git a/sipXaastra/test/Makefile.am b/sipXaastra/test/Makefile.am
@@ -2,6 +2,10 @@ include $(top_srcdir)/config/utility.am
 include $(top_srcdir)/config/java.am
 include $(top_srcdir)/src/common.am
 
+EXTRA_DIST = \
+	$(test_SRC) \
+	$(test_RESOURCES)
+
 noinst_DATA = javac-test
 
 test_PKGS = \
@@ -23,3 +27,4 @@ test_DEPS = \
 test_JAVAFLAGS = -Dclasspath.dir=$(srcdir) -Dbasedir=$(top_builddir)
 
 test_SRC = $(shell cd $(srcdir); find org -name '*.java')
+test_RESOURCES = $(shell cd $(srcdir); find org -not -name '*.java')
diff --git a/sipXacccode/bin/Makefile.am b/sipXacccode/bin/Makefile.am
@@ -7,7 +7,7 @@ EXTRA_DIST = \
 bin_SCRIPTS = \
     sipxacccode.sh
 
-$(bin_SCRIPTS) : % : %.in
+$(bin_SCRIPTS) : % : %.in Makefile
 	@$(call SearchAndReplace,$<,$@,sipxacc_PKGS)
 
 CLEANFILES = $(bin_SCRIPTS)
diff --git a/sipXacccode/bin/sipxacccode.sh.in b/sipXacccode/bin/sipxacccode.sh.in
@@ -1,4 +1,4 @@
-#!/bin/bash -x
+#!/bin/bash
 
 #
 # Copyright (C) 2010 Avaya, certain elements licensed under a Contributor Agreement.

diff --git a/sipXacccode/etc/Makefile.am b/sipXacccode/etc/Makefile.am
@@ -9,7 +9,7 @@ procdir = \
 proc_DATA = \
 	sipxacccode-process.xml
 
-$(proc_DATA) : % : %.in
+$(proc_DATA) : % : %.in Makefile
 	$(call SearchAndReplace, $<, $@)
 
 CLEANFILES = $(proc_DATA)
diff --git a/sipXacccode/meta/Makefile.am b/sipXacccode/meta/Makefile.am
@@ -8,7 +8,7 @@ EXTRA_DIST = \
 
 schemadir = @SIPX_DATADIR@/schema
 
-$(schema_DATA) : % : %.in
+$(schema_DATA) : % : %.in Makefile
 	@$(call SearchAndReplace,$<,$@)
 
 CLEANFILES = $(schema_DATA)
diff --git a/sipXacd/bin/Makefile.am b/sipXacd/bin/Makefile.am
@@ -6,7 +6,7 @@ bin_SCRIPTS = \
 EXTRA_DIST = \
 	$(bin_SCRIPTS:=.in)
 
-$(bin_SCRIPTS) : % : %.in
+$(bin_SCRIPTS) : % : %.in Makefile
 	@$(call SearchAndReplace,$<,$@)
 
 CLEANFILES = $(bin_SCRIPTS)
diff --git a/sipXacd/etc/Makefile.am b/sipXacd/etc/Makefile.am
@@ -9,7 +9,7 @@ procdir = \
 proc_DATA = \
 	sipxacd-process.xml
 
-$(proc_DATA) : % : %.in
+$(proc_DATA) : % : %.in Makefile
 	@$(call SearchAndReplace, $<, $@)
 
 CLEANFILES = $(proc_DATA)
diff --git a/sipXacdStatistics/CONTRIBUTORS b/sipXacdStatistics/CONTRIBUTORS
@@ -0,0 +1,6 @@
+
+On March 24th, 2004, Pingtel Corp. contributed this source code to 
+SIPfoundry, Inc.  While we are only crediting authors and contributors
+who wish to be named, we would like to thank everyone from the Pingtel 
+team who helped to build this.
+