[Pkg-voip-commits] r4291 - in zaptel/trunk/debian: . patches

[kilian at alioth.debian.org]

Author: kilian
Date: 2007-08-26 10:00:38 +0000 (Sun, 26 Aug 2007)
New Revision: 4291

Added:
   zaptel/trunk/debian/patches/Makefile_fix_clean.dpatch
Modified:
   zaptel/trunk/debian/changelog
   zaptel/trunk/debian/patches/00list
Log:
* Don't ignore make clean error. Fix with patch to feed upstream.

Modified: zaptel/trunk/debian/changelog
===================================================================
--- zaptel/trunk/debian/changelog	2007-08-26 09:44:47 UTC (rev 4290)
+++ zaptel/trunk/debian/changelog	2007-08-26 10:00:38 UTC (rev 4291)
@@ -6,7 +6,7 @@
   * Add dpkg-dev (>= 1.13.19) to Build-Depends for binary:Version
   * Correct the zaptel.init to point to correct path of fxotune
    (Closes: #439310)
-  * Don't ignore make clean error.
+  * Don't ignore make clean error. Fix with patch to feed upstream.
 
   [ Tzafrir Cohen ]
   * Pass extra modules / subdirs to modules make.

Modified: zaptel/trunk/debian/patches/00list
===================================================================
--- zaptel/trunk/debian/patches/00list	2007-08-26 09:44:47 UTC (rev 4290)
+++ zaptel/trunk/debian/patches/00list	2007-08-26 10:00:38 UTC (rev 4291)
@@ -4,3 +4,4 @@
 zaphfc-florz
 zaptel_perl
 xpp_m_subdirs
+Makefile_fix_clean.dpatch

Added: zaptel/trunk/debian/patches/Makefile_fix_clean.dpatch
===================================================================
--- zaptel/trunk/debian/patches/Makefile_fix_clean.dpatch	                        (rev 0)
+++ zaptel/trunk/debian/patches/Makefile_fix_clean.dpatch	2007-08-26 10:00:38 UTC (rev 4291)
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## Makefile_fix_clean.dpatch by Kilian Krause <kilian at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Don't try to run clean on empty dir
+
+ at DPATCH@
+diff -urNad zaptel-1.4.5.1~dfsg~/Makefile zaptel-1.4.5.1~dfsg/Makefile
+--- zaptel-1.4.5.1~dfsg~/Makefile	2007-08-21 20:11:37.000000000 +0200
++++ zaptel-1.4.5.1~dfsg/Makefile	2007-08-26 11:56:49.000000000 +0200
+@@ -601,7 +601,9 @@
+ 	rm -f *.o ztcfg tzdriver sethdlc sethdlc-new
+ 	rm -f $(LTZ_SO) $(LTZ_A) *.lo
+ ifeq ($(BUILDVER),linux26)
++ifdef KSRC
+ 	$(MAKE) -C $(KSRC) SUBDIRS=$(PWD) clean
++endif
+ 	$(MAKE) -C xpp/utils clean
+ else
+ 	$(MAKE) -C wct4xxp clean


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