[Pkg-voip-commits] r9342 - in /asterisk/trunk/debian: asterisk-h323.install changelog control patches/series rules

[tzafrir at alioth.debian.org]

Author: tzafrir
Date: Sat Oct 22 10:33:27 2011
New Revision: 9342

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=9342
Log:
Disable chan_h323: broken with curren h323plus, and not loved by upstream.

Removed:
    asterisk/trunk/debian/asterisk-h323.install
Modified:
    asterisk/trunk/debian/changelog
    asterisk/trunk/debian/control
    asterisk/trunk/debian/patches/series
    asterisk/trunk/debian/rules

Modified: asterisk/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/changelog?rev=9342&op=diff
==============================================================================
--- asterisk/trunk/debian/changelog (original)
+++ asterisk/trunk/debian/changelog Sat Oct 22 10:33:27 2011
@@ -2,6 +2,7 @@
 
   [ Tzafrir Cohen ]
   * NOT RELEASED YET
+  * Disable chan_h323: broken with curren h323plus, and not loved by upstream.
   * Patch fix_configure_armhf: properly detect armhf.
   * Patch chan_iax2-detach-thread-on-non-stop-exit: Hopefully plugs a
     memory leak. EXPERIMENTAL. DO NOT UPLOAD WITH THIS FOR NOW.
@@ -13,7 +14,7 @@
   * Ensure sub-packages with asterisk modules are the same version as the
     binary.
 
- -- Tzafrir Cohen <tzafrir at debian.org>  Sat, 22 Oct 2011 11:25:18 +0200
+ -- Tzafrir Cohen <tzafrir at debian.org>  Sat, 22 Oct 2011 12:32:05 +0200
 
 asterisk (1:1.8.4.4~dfsg-2) unstable; urgency=low
 

Modified: asterisk/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/control?rev=9342&op=diff
==============================================================================
--- asterisk/trunk/debian/control (original)
+++ asterisk/trunk/debian/control Sat Oct 22 10:33:27 2011
@@ -28,7 +28,6 @@
  libcurl4-openssl-dev | libcurl-dev,
  libxml2-dev,
  libpopt-dev,
- libopenh323-dev (>= 1.17.4) [linux-any],
  libiksemel-dev,
  libradiusclient-ng-dev,
  freetds-dev,
@@ -100,13 +99,7 @@
 Description: H.323 protocol support for the Asterisk PBX
  Asterisk is an Open Source PBX and telephony toolkit.
  .
- This channel driver (chan_h323) provides support for the H.323 protocol
- for Asterisk. This is an implementation originally contributed by NuFone and
- nowdays maintained and distributed by Digium, Inc. Hence, it is considered 
- the official H.323 chanel driver.
- .
- There is another H.323 channel implementations for Asterisk: chan_ooh323,
- distributed by Debian as asterisk-ooh323c.
+ This is a dummy package. Use asterisk-ooh323 instead.
  .
  For more information about the Asterisk PBX, have a look at the Asterisk
  package.
@@ -188,9 +181,6 @@
  This channel driver (chan_ooh323c) provides support for the H.323 protocol
  for Asterisk. This is an independent implementation that does not depend
  on OpenH323, but may be less functional than the original chan_h323.
- .
- This is one of many H.323 channel implementations for Asterisk with other
- being chan_h323, distributed by Debian as asterisk-h323.
  .
  For more information about the Asterisk PBX, have a look at the Asterisk
  package.

Modified: asterisk/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/series?rev=9342&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/series (original)
+++ asterisk/trunk/debian/patches/series Sat Oct 22 10:33:27 2011
@@ -7,9 +7,9 @@
 make-clean-fixes
 safe_asterisk-config
 safe_asterisk-nobg
-
-h323-no-deps-on-asterisk
-h323-workaround-openh323-segfault
+#
+#h323-no-deps-on-asterisk
+#h323-workaround-openh323-segfault
 
 astgenkey-security
 
@@ -17,7 +17,7 @@
 
 # bugfixes on top of everything
 sound_files
-h323-extra-target
+#h323-extra-target
 mpglib
 enable_addons
 gmime-2.4

Modified: asterisk/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/rules?rev=9342&op=diff
==============================================================================
--- asterisk/trunk/debian/rules (original)
+++ asterisk/trunk/debian/rules Sat Oct 22 10:33:27 2011
@@ -73,11 +73,10 @@
 		--infodir=\$${prefix}/share/info	\
 		--with-gsm				\
 		--with-imap=system			\
+		--without-pwlib				\
 		${ENABLE_DEBUG}
 
 #		--with-cap \
-#		--with-pwlib=/usr/share/pwlib/include/ \
-#		--with-h323=/usr/share/openh323/ 
 
 build: build-arch build-indep
 
@@ -89,9 +88,6 @@
 		menuselect/menuselect --enable DONT_OPTIMIZE menuselect.makeopts ; \
 		menuselect/menuselect --enable DEBUG_THREADS menuselect.makeopts ; \
 	fi
-ifeq (linux,$(BUILD_OS))
-	$(FETCH_ENV) $(MAKE) $(BUILDFLAGS) h323-mak
-endif
 	$(FETCH_ENV) $(MAKE) $(BUILDFLAGS)
 	touch $@
 
@@ -130,7 +126,7 @@
 		 voicemail voicemail-odbcstorage voicemail-imapstorage \
 		 ooh323 mysql mp3
 ifeq (linux,$(BUILD_OS))
-SUBPACKS_EXTRA += dahdi h323 mobile
+SUBPACKS_EXTRA += dahdi mobile
 endif
 SUBPACKS_EXTRA_DIRS = $(SUBPACKS_EXTRA:%=$(CURDIR)/debian/asterisk-%)
 SUBPACKS_EXTRA_DIRS_MOD = $(SUBPACKS_EXTRA_DIRS:%=%/usr/lib/asterisk/modules)