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

Tue Aug 14 19:10:18 UTC 2007

Author: msp
Date: 2007-08-14 19:10:18 +0000 (Tue, 14 Aug 2007)
New Revision: 4012

Modified:
   asterisk/trunk/debian/changelog
   asterisk/trunk/debian/control
   asterisk/trunk/debian/rules
Log:
* Removing build requirement gtk (maybe needed for building the
* asterisk-h323 is broken at present (See #xxxx) 
  - do not ship or depend on h323

Modified: asterisk/trunk/debian/changelog
===================================================================

--- asterisk/trunk/debian/changelog	2007-08-12 09:36:37 UTC (rev 4011)
+++ asterisk/trunk/debian/changelog	2007-08-14 19:10:18 UTC (rev 4012)
@@ -2,11 +2,15 @@
 
   [ Tzafrir Cohen ]
   * New upstream release.
-  * Removing build requirement gtk (maybe needed for building the 
+  * Removing build requirement gtk (maybe needed for building the
     non-usable gtk console. If anybody needs it, please file a bug report.)
 
- -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Sat, 11 Aug 2007 19:59:06 +0000
+  [ Mark Purcell ]
+  * asterisk-h323 is broken at present (See #xxxx) 
+    - do not ship or depend on h323
 
+ -- Mark Purcell <msp at debian.org>  Tue, 14 Aug 2007 18:20:54 +0100
+
 asterisk (1:1.4.10~dfsg-1) unstable; urgency=low
 
   * New upstream release

Modified: asterisk/trunk/debian/control
===================================================================
--- asterisk/trunk/debian/control	2007-08-12 09:36:37 UTC (rev 4011)
+++ asterisk/trunk/debian/control	2007-08-14 19:10:18 UTC (rev 4012)
@@ -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>, Faidon Liambotis <paravoid at debian.org>
 Standards-Version: 3.7.2
-Build-Depends: debhelper (>= 5), sed (>= 3.95), zlib1g-dev, libreadline5-dev, libgsm1-dev, libssl-dev, libtonezone-dev (>= 1:1.4.1~0), bison, libasound2-dev, libpq-dev, unixodbc-dev, libpri-dev (>= 1.4), dpatch (>= 2.0.10), zaptel-source (>= 1:1.4.1~0), autotools-dev, libnewt-dev, libsqlite-dev, libspeex-dev, graphviz, libcurl4-dev | libcurl-dev, doxygen, gsfonts, libpopt-dev, libopenh323-dev (>= 1.17.4-1), libiksemel-dev, libradiusclient-ng-dev, freetds-dev, libvorbis-dev, libsnmp10-dev | libsnmp-dev, libc-client-dev
+Build-Depends: debhelper (>= 5), sed (>= 3.95), zlib1g-dev, libreadline5-dev, libgsm1-dev, libssl-dev, libtonezone-dev (>= 1:1.4.1~0), bison, libasound2-dev, libpq-dev, unixodbc-dev, libpri-dev (>= 1.4), dpatch (>= 2.0.10), zaptel-source (>= 1:1.4.1~0), autotools-dev, libnewt-dev, libsqlite-dev, libspeex-dev, graphviz, libcurl4-dev | libcurl-dev, doxygen, gsfonts, libpopt-dev, libiksemel-dev, libradiusclient-ng-dev, freetds-dev, libvorbis-dev, libsnmp10-dev | libsnmp-dev, libc-client-dev
 XS-Vcs-Svn: svn://svn.debian.org/pkg-voip/asterisk/
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/asterisk/
 
@@ -40,16 +40,6 @@
  .
  Website: http://www.asterisk.org.
 
-Package: asterisk-h323
-Architecture: any
-Section: comm
-Depends: asterisk, ${shlibs:Depends}
-Description: Asterisk's H.323 VoIP channel
- Asterisk is an Open Source PBX and telephony toolkit.
- .
- This package provides H.323 support for the Asterisk Open Source PBX system.
- It is the stock H.323 channel originally written by Nufone.
-
 Package: asterisk-doc
 Recommends: asterisk
 Section: doc

Modified: asterisk/trunk/debian/rules
===================================================================
--- asterisk/trunk/debian/rules	2007-08-12 09:36:37 UTC (rev 4011)
+++ asterisk/trunk/debian/rules	2007-08-14 19:10:18 UTC (rev 4012)
@@ -68,22 +68,26 @@
 	
 	# Without --with-gsm the internal gsm will be used
 	$(FETCH_ENV) ./configure --with-gsm \
-		--with-pwlib=/usr/share/pwlib/include/ --with-h323=/usr/share/openh323/ \
 		--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
                 --prefix=/usr \
                 --mandir=\$${prefix}/share/man \
                 --infodir=\$${prefix}/share/info
+		# asterisk-h323 is broken at presnet don't ship
+		# --with-pwlib=/usr/share/pwlib/include/ 
+		# --with-h323=/usr/share/openh323/ \
 
 
 menuselect.makeopts: config.status
 	$(FETCH_ENV) $(MAKE) menuselect.makeopts
 	sed -i -e '/^MENUSELECT_MOH=/d' menuselect.makeopts
 
-	# some voodoo in order to get chan_h323 built, and make it in one
-	# build pass:
-	# enable chan_h323 (not enabled by default). Note that modules listed
-	# in MENUSELECT_CHANNEL are ones to disable:
-	sed -i -e '/MENUSELECT_CHANNELS=/s/chan_h323//' menuselect.makeopts
+	## some voodoo in order to get chan_h323 built, and make it in one
+	## build pass:
+	## enable chan_h323 (not enabled by default). Note that modules listed
+	## in MENUSELECT_CHANNEL are ones to disable:
+	
+	# asterisk-h323 is broken at present - don't ship
+	#sed -i -e '/MENUSELECT_CHANNELS=/s/chan_h323//' menuselect.makeopts
 	cat menuselect.makedeps
 	cat menuselect.makeopts
 
@@ -94,7 +98,9 @@
 	dh_testdir
 
 	# Add here command to compile/build the package.
-	$(FETCH_ENV) $(MAKE) $(MAKEFLAGS) || true
+	
+	# asterisk-h323 is broken at present don't ship
+	# $(FETCH_ENV) $(MAKE) $(MAKEFLAGS) || true
 
 	# Build a second time to pick up h323 :-(
 	$(FETCH_ENV) $(MAKE) $(MAKEFLAGS)
@@ -192,7 +198,6 @@
 	dh_compress -a
 	dh_fixperms -a
 	dh_installdeb -a
-	rm -f debian/asterisk/usr/lib/asterisk/modules/chan_h323.so
 	dh_makeshlibs -a 
 	dh_shlibdeps -a
 	dh_gencontrol -a


