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

[Kilian Krause]

Author: kilian
Date: 2006-12-28 14:57:43 +0100 (Thu, 28 Dec 2006)
New Revision: 2877

Added:
   asterisk/trunk/debian/patches/Makefile_clean.dpatch
Modified:
   asterisk/trunk/debian/changelog
   asterisk/trunk/debian/patches/00list
Log:
* Fix upstream clean target. (Closes: #393659)
  Someone(TM) should feed this upstream and teach them why ||exit 1 is bad.


Modified: asterisk/trunk/debian/changelog
===================================================================
--- asterisk/trunk/debian/changelog	2006-12-28 13:52:11 UTC (rev 2876)
+++ asterisk/trunk/debian/changelog	2006-12-28 13:57:43 UTC (rev 2877)
@@ -7,8 +7,9 @@
   * Update bristuff patch to apply cleanly with 1.2.14 until new upstream
     version is out.
   * Remove hardcoded gcc (Closes: #316802)
+  * Fix upstream clean target. (Closes: #393659)
 
- -- Kilian Krause <kilian at debian.org>  Thu, 28 Dec 2006 13:40:07 +0100
+ -- Kilian Krause <kilian at debian.org>  Thu, 28 Dec 2006 14:49:33 +0100
 
 asterisk (1:1.2.13~dfsg-2) unstable; urgency=low
 

Modified: asterisk/trunk/debian/patches/00list
===================================================================
--- asterisk/trunk/debian/patches/00list	2006-12-28 13:52:11 UTC (rev 2876)
+++ asterisk/trunk/debian/patches/00list	2006-12-28 13:57:43 UTC (rev 2877)
@@ -20,3 +20,4 @@
 cdr_sqlite3_custom
 less_docs
 Makefile_hostcc
+Makefile_clean

Added: asterisk/trunk/debian/patches/Makefile_clean.dpatch
===================================================================
--- asterisk/trunk/debian/patches/Makefile_clean.dpatch	2006-12-28 13:52:11 UTC (rev 2876)
+++ asterisk/trunk/debian/patches/Makefile_clean.dpatch	2006-12-28 13:57:43 UTC (rev 2877)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## Makefile_clean.dpatch by Kilian Krause <kilian at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Unsuccessful cleanup is not an error. Fixes #393659.
+
+ at DPATCH@
+diff -urNad asterisk-1.2.14~dfsg~/Makefile asterisk-1.2.14~dfsg/Makefile
+--- asterisk-1.2.14~dfsg~/Makefile	2006-12-11 22:55:43.000000000 +0100
++++ asterisk-1.2.14~dfsg/Makefile	2006-12-28 14:48:42.000000000 +0100
+@@ -539,7 +539,7 @@
+ 	for x in $(SUBDIRS); do $(MAKE) -C $$x || exit 1 ; done
+ 
+ clean:
+-	for x in $(SUBDIRS); do $(MAKE) -C $$x clean || exit 1 ; done
++	for x in $(SUBDIRS); do $(MAKE) -C $$x clean || true ; done
+ 	rm -f *.o *.so asterisk .depend
+ 	rm -f defaults.h
+ 	rm -f include/asterisk/build.h


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