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

[kilian at alioth.debian.org]

Author: kilian
Date: 2007-08-18 18:30:22 +0000 (Sat, 18 Aug 2007)
New Revision: 4056

Modified:
   asterisk/trunk/debian/changelog
   asterisk/trunk/debian/rules
Log:
re-add debian/rules parts for h323, too.


Modified: asterisk/trunk/debian/changelog
===================================================================
--- asterisk/trunk/debian/changelog	2007-08-18 16:12:29 UTC (rev 4055)
+++ asterisk/trunk/debian/changelog	2007-08-18 18:30:22 UTC (rev 4056)
@@ -8,14 +8,13 @@
     non-usable gtk console. If anybody needs it, please file a bug report.)
 
   [ Mark Purcell ]
-  * Reinstate asterisk-h323 package & deps
   * Remove debian/patches/dbug433884.dpatch
     - asterisk-h323: Asterisk crashes on startup with H323 package
-    installed. (Closes: #435146)
+      installed. (Closes: #435146)
 
   * TODO: FL: Merge bristuff/ quilt from branches/experimental
 
- -- Mark Purcell <msp at debian.org>  Sat, 18 Aug 2007 17:11:09 +0100
+ -- Kilian Krause <kilian at debian.org>  Sat, 18 Aug 2007 20:29:21 +0200
 
 asterisk (1:1.4.10~dfsg-1) unstable; urgency=low
 

Modified: asterisk/trunk/debian/rules
===================================================================
--- asterisk/trunk/debian/rules	2007-08-18 16:12:29 UTC (rev 4055)
+++ asterisk/trunk/debian/rules	2007-08-18 18:30:22 UTC (rev 4056)
@@ -71,10 +71,9 @@
 		--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/ \
+                --infodir=\$${prefix}/share/info \
+		--with-pwlib=/usr/share/pwlib/include/ \
+		--with-h323=/usr/share/openh323/ 
 
 
 menuselect.makeopts: config.status
@@ -86,8 +85,7 @@
 	## 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
+	sed -i -e '/MENUSELECT_CHANNELS=/s/chan_h323//' menuselect.makeopts
 	cat menuselect.makedeps
 	cat menuselect.makeopts
 
@@ -99,8 +97,7 @@
 
 	# Add here command to compile/build the package.
 	
-	# asterisk-h323 is broken at present don't ship
-	# $(FETCH_ENV) $(MAKE) $(MAKEFLAGS) || true
+	$(FETCH_ENV) $(MAKE) $(MAKEFLAGS) || true
 
 	# Build a second time to pick up h323 :-(
 	$(FETCH_ENV) $(MAKE) $(MAKEFLAGS)