[Pkg-voip-commits] r3566 - in asterisk/trunk/debian: . patches

[msp at alioth.debian.org]

Author: msp
Date: 2007-05-17 06:28:33 +0000 (Thu, 17 May 2007)
New Revision: 3566

Removed:
   asterisk/trunk/debian/patches/h323_no_exit.dpatch
Modified:
   asterisk/trunk/debian/changelog
   asterisk/trunk/debian/rules
Log:
* Upstream calls make twice to build h323, copy in debian/rules
  - Asterisks chan_h323 doesn't work because of an undefined symbol
  (Closes: #421552)

Modified: asterisk/trunk/debian/changelog
===================================================================
--- asterisk/trunk/debian/changelog	2007-05-17 06:03:30 UTC (rev 3565)
+++ asterisk/trunk/debian/changelog	2007-05-17 06:28:33 UTC (rev 3566)
@@ -2,8 +2,11 @@
 
   * NOT RELEASED YET
   * Missing debian/changelog entries
+  * Upstream calls make twice to build h323, copy in debian/rules
+    - Asterisks chan_h323 doesn't work because of an undefined symbol
+    (Closes: #421552)
 
- -- Mark Purcell <msp at debian.org>  Thu, 17 May 2007 07:03:16 +0100
+ -- Mark Purcell <msp at debian.org>  Thu, 17 May 2007 07:28:20 +0100
 
 asterisk (1:1.4.4~dfsg-1) unstable; urgency=low
 

Deleted: asterisk/trunk/debian/patches/h323_no_exit.dpatch
===================================================================
--- asterisk/trunk/debian/patches/h323_no_exit.dpatch	2007-05-17 06:03:30 UTC (rev 3565)
+++ asterisk/trunk/debian/patches/h323_no_exit.dpatch	2007-05-17 06:28:33 UTC (rev 3566)
@@ -1,57 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## h323_no_exit.dpatch by Tzafrir Cohen <tzafrir.cohen at xorcom.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Prevent the need to run 'make' twice to build h323.
-
- at DPATCH@
-diff -urNad asterisk-1.4.1~dfsg~/channels/Makefile asterisk-1.4.1~dfsg/channels/Makefile
---- asterisk-1.4.1~dfsg~/channels/Makefile	2007-03-17 23:50:15.000000000 +0200
-+++ asterisk-1.4.1~dfsg/channels/Makefile	2007-03-17 23:51:50.000000000 +0200
-@@ -36,10 +36,6 @@
-   H323LIB=-lh323_NetBSD_x86_r
- endif
- 
--ifeq ($(wildcard h323/libchanh323.a),)
--  CC_MODS:=$(filter-out chan_h323,$(CC_MODS))
--endif
--
- ifndef OPENH323DIR
-   OPENH323DIR=$(HOME)/openh323
- endif
-@@ -62,23 +58,10 @@
- clean::
- 	rm -f busy.h ringtone.h gentone
- 	$(MAKE) -C misdn clean
--
--ifneq ($(wildcard h323/Makefile.ast),)
--  include h323/Makefile.ast
--H323LDFLAGS+=-Wl,--version-script=h323/noexport.map
--clean::
- 	$(MAKE) -C h323 clean
--else
--h323/libchanh323.a h323/Makefile.ast:
--	$(CMD_PREFIX) $(MAKE) -C h323
--	$(CMD_PREFIX) rm -f ../main/asterisk
--	$(CMD_PREFIX) echo "***************************************************************"
--	$(CMD_PREFIX) echo
--	$(CMD_PREFIX) echo "********** Re-run 'make' to pick up H.323 parameters **********"
--	$(CMD_PREFIX) echo
--	$(CMD_PREFIX) echo "***************************************************************"
--	$(CMD_PREFIX) exit 1
--endif
-+
-+h323/libchanh323.a:
-+	$(CMD_PREFIX) $(MAKE) -C $(@D) $(@F)
- 
- gentone: gentone.c
- 	$(ECHO_PREFIX) echo "   [LD] $^ -> $@"
-@@ -98,7 +81,7 @@
- chan_alsa.o: busy.h ringtone.h
- 
- ifeq ($(OSARCH),linux-gnu)
--chan_h323.so: chan_h323.o h323/libchanh323.a h323/Makefile.ast
-+chan_h323.so: chan_h323.o h323/libchanh323.a
- 	$(ECHO_PREFIX) echo "   [LD] $^ -> $@"
- 	$(CMD_PREFIX) $(CXX) $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) $(H323LDFLAGS) -o $@ $< h323/libchanh323.a $(H323LDLIBS)
- else

Modified: asterisk/trunk/debian/rules
===================================================================
--- asterisk/trunk/debian/rules	2007-05-17 06:03:30 UTC (rev 3565)
+++ asterisk/trunk/debian/rules	2007-05-17 06:28:33 UTC (rev 3566)
@@ -95,8 +95,12 @@
 	dh_testdir
 
 	# Add here command to compile/build the package.
+	$(FETCH_ENV) $(MAKE) $(MAKEFLAGS) || true
+
+	# Build a second time to pick up h323 :-(
 	$(FETCH_ENV) $(MAKE) $(MAKEFLAGS)
 
+
 	touch $@
 
 build-indep: build-indep-stamp