r1590 - trunk/kernel/s390/2.6.8/debian

[Bastian Blank]

Author: waldi
Date: 2004-09-15 08:42:39 -0600 (Wed, 15 Sep 2004)
New Revision: 1590

Modified:
   trunk/kernel/s390/2.6.8/debian/changelog
   trunk/kernel/s390/2.6.8/debian/rules
Log:
* debian/changelog: Update.
* debian/rules: Ask patch to suppress backup.


Modified: trunk/kernel/s390/2.6.8/debian/changelog
===================================================================
--- trunk/kernel/s390/2.6.8/debian/changelog	2004-09-15 14:04:49 UTC (rev 1589)
+++ trunk/kernel/s390/2.6.8/debian/changelog	2004-09-15 14:42:39 UTC (rev 1590)
@@ -1,3 +1,10 @@
+kernel-image-2.6.8-s390 (2.6.8-3) UNRELEASED; urgency=low
+
+  * debian/rules
+    - Ask patch to suppress backup.
+
+ -- Bastian Blank <waldi@debian.org>  Wed, 15 Sep 2004 16:41:31 +0200
+
 kernel-image-2.6.8-s390 (2.6.8-2) unstable; urgency=medium
 
   * Use kernel-tree-2.6.8-6.

Modified: trunk/kernel/s390/2.6.8/debian/rules
===================================================================
--- trunk/kernel/s390/2.6.8/debian/rules	2004-09-15 14:04:49 UTC (rev 1589)
+++ trunk/kernel/s390/2.6.8/debian/rules	2004-09-15 14:42:39 UTC (rev 1590)
@@ -36,7 +36,7 @@
 	@cd patch;                                      \
 	  for patch in $(wildcard diffs/*.diff); do     \
 	  echo "Applying patch $$patch ...";            \
-	  patch -p0 < ../$$patch || exit 1;        \
+	  patch --no-backup-if-mismatch -p0 < ../$$patch || exit 1;        \
 	done
 
 	-diff -urN patch.orig patch > linux-$(version)-s390.debian.diff