[Pkg-voip-commits] r2653 - in iaxmodem/trunk/debian: . patches

[Julien Blache]

Author: jblache
Date: 2006-10-28 10:47:23 +0200 (Sat, 28 Oct 2006)
New Revision: 2653

Modified:
   iaxmodem/trunk/debian/changelog
   iaxmodem/trunk/debian/patches/11_build_configure-stamp.dpatch
Log:
Patch update.


Modified: iaxmodem/trunk/debian/changelog
===================================================================
--- iaxmodem/trunk/debian/changelog	2006-10-28 08:34:40 UTC (rev 2652)
+++ iaxmodem/trunk/debian/changelog	2006-10-28 08:47:23 UTC (rev 2653)
@@ -4,8 +4,10 @@
   * debian/rules:
     + Use new ~dfsg versionning scheme.
     + Do not remove config.* in get-orig-source.
+  * debian/patches/11_build_configure-stamp.dpatch:
+    + Updated.
 
- -- Julien BLACHE <jblache at debian.org>  Sat, 28 Oct 2006 10:34:08 +0200
+ -- Julien BLACHE <jblache at debian.org>  Sat, 28 Oct 2006 10:46:56 +0200
 
 iaxmodem (0.1.14.dfsg-1) unstable; urgency=low
 

Modified: iaxmodem/trunk/debian/patches/11_build_configure-stamp.dpatch
===================================================================
--- iaxmodem/trunk/debian/patches/11_build_configure-stamp.dpatch	2006-10-28 08:34:40 UTC (rev 2652)
+++ iaxmodem/trunk/debian/patches/11_build_configure-stamp.dpatch	2006-10-28 08:47:23 UTC (rev 2653)
@@ -6,11 +6,11 @@
 ## DP: debian/rules takes care of that.
 
 @DPATCH@
-diff -urNad iaxmodem-0.1.10.dfsg~/build iaxmodem-0.1.10.dfsg/build
---- iaxmodem-0.1.10.dfsg~/build	2006-07-08 12:08:58.000000000 +0200
-+++ iaxmodem-0.1.10.dfsg/build	2006-07-08 12:13:30.026277394 +0200
-@@ -14,14 +14,16 @@
- fi
+diff -urNad iaxmodem-0.1.15~dfsg~/build iaxmodem-0.1.15~dfsg/build
+--- iaxmodem-0.1.15~dfsg~/build	2006-09-15 17:29:39.000000000 +0200
++++ iaxmodem-0.1.15~dfsg/build	2006-10-28 10:42:50.793312075 +0200
+@@ -16,15 +16,17 @@
+ }
  
  if [ "$1" = "static" ]; then
 -    cd lib/libiax2 && \
@@ -20,7 +20,6 @@
 -    ./configure --disable-shared && \
 -    make && \
 -    cd ../.. && \
--    gcc -Wall -g -DMODEMVER=\"$MODEMVER\" -DDSPVER=\"$DSPVER\" -DIAXVER=\"$IAXVER\" -DSTATICLIBS -D_GNU_SOURCE \
 +    if [ ! -e configure-stamp ]; then
 +	cd lib/libiax2 && \
 +	    ./configure --disable-shared && \
@@ -28,8 +27,10 @@
 +	    cd ../spandsp && \
 +	    ./configure --disable-shared && \
 +	    make && \
-+	    cd ../..
++	    cd ../.. || exit 1
 +    fi
+     getVersions && \
+-    gcc -Wall -g -DMODEMVER=\"$MODEMVER\" -DDSPVER=\"$DSPVER\" -DIAXVER=\"$IAXVER\" -DSTATICLIBS -D_GNU_SOURCE \
 +    gcc -Wall -g -O2 -DMODEMVER=\"$MODEMVER\" -DDSPVER=\"$DSPVER\" -DIAXVER=\"$IAXVER\" -DSTATICLIBS -D_GNU_SOURCE \
  	-std=c99 -Ilib/libiax2/src -Ilib/spandsp/src -c -o iaxmodem.o iaxmodem.c && \
      gcc -lm -lutil -ltiff -o iaxmodem iaxmodem.o lib/spandsp/src/.libs/libspandsp.a lib/libiax2/src/.libs/libiax.a