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

[msp at alioth.debian.org]

Author: msp
Date: 2007-07-21 09:37:20 +0000 (Sat, 21 Jul 2007)
New Revision: 3785

Added:
   asterisk/trunk/debian/patches/dbug433884.dpatch
Modified:
   asterisk/trunk/debian/changelog
   asterisk/trunk/debian/patches/00list
Log:
* Add patch from Faidon debian/patches/dbug433884.dpatch:
  - Should not depend on libopenH323, libpt, libSDL, libssl, libldap,
  ... (Closes: #433884)

Modified: asterisk/trunk/debian/changelog
===================================================================
--- asterisk/trunk/debian/changelog	2007-07-21 09:35:43 UTC (rev 3784)
+++ asterisk/trunk/debian/changelog	2007-07-21 09:37:20 UTC (rev 3785)
@@ -1,8 +1,11 @@
 asterisk (1:1.4.8~dfsg-2) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
+  * Add patch from Faidon debian/patches/dbug433884.dpatch:
+    - Should not depend on libopenH323, libpt, libSDL, libssl, libldap,
+    ... (Closes: #433884)
 
- -- Mark Purcell <msp at debian.org>  Wed, 18 Jul 2007 22:18:39 +0100
+ -- Mark Purcell <msp at debian.org>  Sat, 21 Jul 2007 10:36:34 +0100
 
 asterisk (1:1.4.8~dfsg-1) unstable; urgency=high
 

Modified: asterisk/trunk/debian/patches/00list
===================================================================
--- asterisk/trunk/debian/patches/00list	2007-07-21 09:35:43 UTC (rev 3784)
+++ asterisk/trunk/debian/patches/00list	2007-07-21 09:37:20 UTC (rev 3785)
@@ -1,2 +1,3 @@
 astvarrundir.dpatch
 pubkey_jnctn
+dbug433884.dpatch

Added: asterisk/trunk/debian/patches/dbug433884.dpatch
===================================================================
--- asterisk/trunk/debian/patches/dbug433884.dpatch	                        (rev 0)
+++ asterisk/trunk/debian/patches/dbug433884.dpatch	2007-07-21 09:37:20 UTC (rev 3785)
@@ -0,0 +1,33 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## dbug433884.dpatch by  Faidon Liambotis <paravoid at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: http://bugs.debian.org/433884
+
+ at DPATCH@
+diff -urNad asterisk-1.4.8~dfsg~/main/Makefile asterisk-1.4.8~dfsg/main/Makefile
+--- asterisk-1.4.8~dfsg~/main/Makefile	2007-07-03 21:17:31.000000000 +0100
++++ asterisk-1.4.8~dfsg/main/Makefile	2007-07-21 10:20:51.000000000 +0100
+@@ -120,13 +120,6 @@
+ AST_EMBED_LIBS:=$(foreach dep,$(EMBED_LIBS),$(value $(dep)))
+ OBJS:=$(sort $(OBJS))
+ 
+-ifneq ($(wildcard ../channels/h323/Makefile.ast),)
+-  include ../channels/h323/Makefile.ast
+-else
+-  H323LDFLAGS=
+-  H323LDLIBS=
+-endif
+-
+ asterisk: $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS)
+ 	@$(ASTTOPDIR)/build_tools/make_build_h > $(ASTTOPDIR)/include/asterisk/build.h.tmp
+ 	@if cmp -s $(ASTTOPDIR)/include/asterisk/build.h.tmp $(ASTTOPDIR)/include/asterisk/build.h ; then echo ; else \
+@@ -135,7 +128,7 @@
+ 	@rm -f $(ASTTOPDIR)/include/asterisk/build.h.tmp
+ 	@$(CC) -c -o buildinfo.o $(ASTCFLAGS) buildinfo.c
+ 	$(ECHO_PREFIX) echo "   [LD] $^ -> $@"
+-	$(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS)
++	$(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS)
+ 	@$(ASTTOPDIR)/build_tools/strip_nonapi $@
+ 
+ clean::


Property changes on: asterisk/trunk/debian/patches/dbug433884.dpatch
___________________________________________________________________
Name: svn:executable
   + *