[Pkg-voip-commits] r3872 - iaxmodem/trunk/debian

[jblache at alioth.debian.org]

Author: jblache
Date: 2007-08-02 16:35:35 +0000 (Thu, 02 Aug 2007)
New Revision: 3872

Modified:
   iaxmodem/trunk/debian/changelog
   iaxmodem/trunk/debian/compat
   iaxmodem/trunk/debian/control
   iaxmodem/trunk/debian/rules
Log:
Do not ignore errors from make distclean.

Upgrade to DH_COMPAT 5.


Modified: iaxmodem/trunk/debian/changelog
===================================================================
--- iaxmodem/trunk/debian/changelog	2007-08-01 21:40:50 UTC (rev 3871)
+++ iaxmodem/trunk/debian/changelog	2007-08-02 16:35:35 UTC (rev 3872)
@@ -1,8 +1,11 @@
-iaxmodem (0.3.0~dfsg-2) UNRELEASED; urgency=low
+iaxmodem (0.3.0~dfsg-2) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * debian/rules:
+    + Do not ignore make distclean errors.
+  * debian/compat, debian/control:
+    + Upgrade to DH_COMPAT 5.
 
- -- Julien BLACHE <jblache at debian.org>  Tue, 15 May 2007 09:49:51 +0200
+ -- Julien BLACHE <jblache at debian.org>  Thu, 02 Aug 2007 18:33:04 +0200
 
 iaxmodem (0.3.0~dfsg-1) unstable; urgency=low
 

Modified: iaxmodem/trunk/debian/compat
===================================================================
--- iaxmodem/trunk/debian/compat	2007-08-01 21:40:50 UTC (rev 3871)
+++ iaxmodem/trunk/debian/compat	2007-08-02 16:35:35 UTC (rev 3872)
@@ -1 +1 @@
-4
+5

Modified: iaxmodem/trunk/debian/control
===================================================================
--- iaxmodem/trunk/debian/control	2007-08-01 21:40:50 UTC (rev 3871)
+++ iaxmodem/trunk/debian/control	2007-08-02 16:35:35 UTC (rev 3872)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
 Uploaders: Julien BLACHE <jblache at debian.org>, Kilian Krause <kilian at debian.org>
-Build-Depends: debhelper (>= 4.0.0), dpatch, libtiff4-dev, autotools-dev
+Build-Depends: debhelper (>= 5), dpatch, libtiff4-dev, autotools-dev
 Build-Conflicts: libiax-dev, libspandsp-dev
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/pkg-voip/

Modified: iaxmodem/trunk/debian/rules
===================================================================
--- iaxmodem/trunk/debian/rules	2007-08-01 21:40:50 UTC (rev 3871)
+++ iaxmodem/trunk/debian/rules	2007-08-02 16:35:35 UTC (rev 3872)
@@ -41,11 +41,11 @@
 URL := http://heanet.dl.sourceforge.net/iaxmodem/iaxmodem-$(UPVERSION).tar.gz
 
 autotools-stamp:
-	-rm -f ./lib/libiax2/config.sub ./lib/libiax2/config.guess
+	rm -f ./lib/libiax2/config.sub ./lib/libiax2/config.guess
 	ln -s /usr/share/misc/config.sub ./lib/libiax2/config.sub
 	ln -s /usr/share/misc/config.guess ./lib/libiax2/config.guess
 
-	-rm -f ./lib/spandsp/config/config.sub ./lib/spandsp/config/config.guess
+	rm -f ./lib/spandsp/config/config.sub ./lib/spandsp/config/config.guess
 	ln -s /usr/share/misc/config.sub ./lib/spandsp/config/config.sub
 	ln -s /usr/share/misc/config.guess ./lib/spandsp/config/config.guess
 
@@ -88,13 +88,14 @@
 	rm -f build-stamp configure-stamp autotools-stamp
 
 	# Add here commands to clean up after the build process.
-	-$(MAKE) -C ./lib/libiax2 distclean
-	-rm -f ./lib/libiax2/config.sub ./lib/libiax2/config.guess
-	-$(MAKE) -C ./lib/spandsp distclean
+	[ ! -f lib/libiax2/Makefile ] || $(MAKE) -C ./lib/libiax2 distclean
+	rm -f ./lib/libiax2/config.sub ./lib/libiax2/config.guess
+
+	[ ! -f lib/spandsp/Makefile ] || $(MAKE) -C ./lib/spandsp distclean
 	rm -rf ./lib/spandsp/autom4te.cache
-	-rm -f ./lib/spandsp/config/config.sub ./lib/spandsp/config/config.guess
+	rm -f ./lib/spandsp/config/config.sub ./lib/spandsp/config/config.guess
 
-	-rm -f iaxmodem iaxmodem.o
+	rm -f iaxmodem iaxmodem.o
 
 	dh_clean 
 
@@ -128,7 +129,6 @@
 	dh_strip
 	dh_compress
 	dh_fixperms
-#	dh_makeshlibs
 	dh_installdeb
 	dh_shlibdeps
 	dh_gencontrol