[Pkg-voip-commits] r1297 - asterisk/trunk/debian

[Kilian Krause]

Author: kilian
Date: 2006-02-18 17:55:56 +0000 (Sat, 18 Feb 2006)
New Revision: 1297

Modified:
   asterisk/trunk/debian/changelog
   asterisk/trunk/debian/control
   asterisk/trunk/debian/rules
Log:
add back chan_h323 with new OpenH323


Modified: asterisk/trunk/debian/changelog
===================================================================
--- asterisk/trunk/debian/changelog	2006-02-18 17:53:47 UTC (rev 1296)
+++ asterisk/trunk/debian/changelog	2006-02-18 17:55:56 UTC (rev 1297)
@@ -1,8 +1,8 @@
-asterisk (1:1.2.4.dfsg-6) UNRELEASED; urgency=low
+asterisk (1:1.2.4.dfsg-6) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * Add chan_h323 back with new Atlas_devel3 OpenH323.
 
- -- Kilian Krause <kilian at debian.org>  Tue, 14 Feb 2006 20:38:52 +0000
+ -- Kilian Krause <kilian at debian.org>  Sat, 18 Feb 2006 17:55:24 +0000
 
 asterisk (1:1.2.4.dfsg-5) unstable; urgency=low
 

Modified: asterisk/trunk/debian/control
===================================================================
--- asterisk/trunk/debian/control	2006-02-18 17:53:47 UTC (rev 1296)
+++ asterisk/trunk/debian/control	2006-02-18 17:55:56 UTC (rev 1297)
@@ -4,7 +4,7 @@
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
 Uploaders: Mark Purcell <msp at debian.org>, Kilian Krause <kilian at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Santiago Garcia Mantinan <manty at debian.org>, Simon Richter <sjr at debian.org>, Tzafrir Cohen <tzafrir.cohen at xorcom.com>
 Standards-Version: 3.6.1
-Build-Depends: debhelper (>= 4.0.4), sed (>= 3.95), zlib1g-dev, libgtk1.2-dev, libreadline5-dev, libgsm1-dev, libssl-dev, libzap-dev, libtonezone-dev (>= 1:1.2.3-1), bison, libasound2-dev, postgresql-dev, unixodbc-dev, libpri-dev (>= 1.2.2-1), dpatch (>= 2.0.10), zaptel-source (>= 1:1.2.3-1), autotools-dev, libnewt-dev, libsqlite-dev, libspeex-dev, graphviz, libcurl3-dev, doxygen, gsfonts, libpopt-dev
+Build-Depends: debhelper (>= 4.0.4), sed (>= 3.95), zlib1g-dev, libgtk1.2-dev, libreadline5-dev, libgsm1-dev, libssl-dev, libzap-dev, libtonezone-dev (>= 1:1.2.3-1), bison, libasound2-dev, postgresql-dev, unixodbc-dev, libpri-dev (>= 1.2.2-1), dpatch (>= 2.0.10), zaptel-source (>= 1:1.2.3-1), autotools-dev, libnewt-dev, libsqlite-dev, libspeex-dev, graphviz, libcurl3-dev, doxygen, gsfonts, libpopt-dev, libopenh323-dev (>= 1.17.4-1)
 
 Package: asterisk
 Architecture: all

Modified: asterisk/trunk/debian/rules
===================================================================
--- asterisk/trunk/debian/rules	2006-02-18 17:53:47 UTC (rev 1296)
+++ asterisk/trunk/debian/rules	2006-02-18 17:55:56 UTC (rev 1297)
@@ -34,8 +34,8 @@
 	INSTALL_PROGRAM += -s
 endif
 
-#export OPENH323DIR=/usr/share/openh323
-#export PWLIBDIR=/usr/share/pwlib
+export OPENH323DIR=/usr/share/openh323
+export PWLIBDIR=/usr/share/pwlib
 
 include /usr/share/dpatch/dpatch.make
 
@@ -88,7 +88,7 @@
 
 	# Add here command to compile/build the package.
 	$(MAKE)
-	#cd channels/h323; make
+	$(MAKE) -C channels/h323
 	$(MAKE) -C $(BRISTUFF_DIR)
 
 	touch $@
@@ -114,7 +114,7 @@
 	dh_testroot
 	
 	# Add here commands to clean up after the build process.
-	#-test -d channels/h323 && $(MAKE) -C channels/h323 clean
+	-test -d channels/h323 && $(MAKE) -C channels/h323 clean
 	-$(RM) -f channels/h323/libchanh323.a
 	-$(MAKE) clean
 	-$(RM) -rf debian/build
@@ -143,7 +143,7 @@
 	
 	# Add here commands to install the package into debian/<packagename>
 	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install samples
-	#cp channels/h323/h323.conf.sample $(CURDIR)/debian/tmp/etc/asterisk/h323.conf
+	cp channels/h323/h323.conf.sample $(CURDIR)/debian/tmp/etc/asterisk/h323.conf
 	mkdir -p $(CURDIR)/debian/tmp/etc/default/
 	cp debian/asterisk.default $(CURDIR)/debian/tmp/etc/default/asterisk
 	mkdir -p $(CURDIR)/debian/tmp/usr/lib/cgi-bin/asterisk/