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

[Julien Blache]

Author: jblache
Date: 2006-06-12 15:50:10 +0000 (Mon, 12 Jun 2006)
New Revision: 1838

Added:
   iaxmodem/trunk/debian/patches/11_build_configure-stamp.dpatch
Modified:
   iaxmodem/trunk/debian/changelog
   iaxmodem/trunk/debian/patches/00list
Log:
Do not let the build script build the libraries if configure-stamp exists. debian/rules takes care of this.


Modified: iaxmodem/trunk/debian/changelog
===================================================================
--- iaxmodem/trunk/debian/changelog	2006-06-12 15:40:26 UTC (rev 1837)
+++ iaxmodem/trunk/debian/changelog	2006-06-12 15:50:10 UTC (rev 1838)
@@ -3,8 +3,11 @@
   * New upstream release.
   * debian/patches/11_iax2_CORE-2006-0327.dpatch:
     + Removed; merged upstream.
+  * debian/patches/11_build_configure-stamp.dpatch:
+    + Added; do not build libraries if configure-stamp exists (debian/rules
+      takes care of that).
 
- -- Julien BLACHE <jblache at debian.org>  Mon, 12 Jun 2006 17:39:20 +0200
+ -- Julien BLACHE <jblache at debian.org>  Mon, 12 Jun 2006 17:49:03 +0200
 
 iaxmodem (0.1.8.dfsg-2) unstable; urgency=low
 

Modified: iaxmodem/trunk/debian/patches/00list
===================================================================
--- iaxmodem/trunk/debian/patches/00list	2006-06-12 15:40:26 UTC (rev 1837)
+++ iaxmodem/trunk/debian/patches/00list	2006-06-12 15:50:10 UTC (rev 1838)
@@ -1,2 +1,3 @@
 10_replacement_spandsp_mmx_h
+11_build_configure-stamp
 

Added: iaxmodem/trunk/debian/patches/11_build_configure-stamp.dpatch
===================================================================
--- iaxmodem/trunk/debian/patches/11_build_configure-stamp.dpatch	2006-06-12 15:40:26 UTC (rev 1837)
+++ iaxmodem/trunk/debian/patches/11_build_configure-stamp.dpatch	2006-06-12 15:50:10 UTC (rev 1838)
@@ -0,0 +1,33 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 11_build_configure-stamp.dpatch by  <jblache at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad iaxmodem-0.1.9.dfsg~/build iaxmodem-0.1.9.dfsg/build
+--- iaxmodem-0.1.9.dfsg~/build	2006-06-12 17:03:49.000000000 +0200
++++ iaxmodem-0.1.9.dfsg/build	2006-06-12 17:46:50.883762607 +0200
+@@ -12,13 +12,15 @@
+ fi
+ 
+ if [ "$1" = "static" ]; then
+-    cd lib/libiax2 && \
+-    ./configure && \
+-    make && \
+-    cd ../spandsp && \
+-    ./configure && \
+-    make && \
+-    cd ../.. && \
++    if [ ! -e configure-stamp ]; then
++	cd lib/libiax2 && \
++	    ./configure && \
++	    make && \
++	    cd ../spandsp && \
++	    ./configure && \
++	    make && \
++	    cd ../.. || exit 1
++    fi
+     gcc -Wall -O2 -g -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


Property changes on: iaxmodem/trunk/debian/patches/11_build_configure-stamp.dpatch
___________________________________________________________________
Name: svn:executable
   + *