r3910 - in trunk/kernel/source/linux-2.6/debian: . bin

[maximilian attems]

Author: maks-guest
Date: 2005-08-16 07:56:59 +0000 (Tue, 16 Aug 2005)
New Revision: 3910

Modified:
   trunk/kernel/source/linux-2.6/debian/bin/apply
   trunk/kernel/source/linux-2.6/debian/changelog
Log:
change fuzz factor from default 2 to 1 on patch appliance.
may need a rediff of various patches,
but catches from nasty surprises


Modified: trunk/kernel/source/linux-2.6/debian/bin/apply
===================================================================
--- trunk/kernel/source/linux-2.6/debian/bin/apply	2005-08-16 06:23:45 UTC (rev 3909)
+++ trunk/kernel/source/linux-2.6/debian/bin/apply	2005-08-16 07:56:59 UTC (rev 3910)
@@ -40,7 +40,7 @@
 apply_patch() {
 	patch=$(find_patch $home/$1)
 	base=$1
-	if uncompress_patch "$patch" | patch -p1 -f -s -t --no-backup-if-mismatch; then
+	if uncompress_patch "$patch" | patch -p1 --fuzz=1 -f -s -t --no-backup-if-mismatch; then
 		printf "%-${length}s\tOK (+)\n" "$base"
 	else
 		printf "%-${length}s\tFAIL (+)\n" "$base"

Modified: trunk/kernel/source/linux-2.6/debian/changelog
===================================================================
--- trunk/kernel/source/linux-2.6/debian/changelog	2005-08-16 06:23:45 UTC (rev 3909)
+++ trunk/kernel/source/linux-2.6/debian/changelog	2005-08-16 07:56:59 UTC (rev 3910)
@@ -8,6 +8,8 @@
   * Add transitional meta packages (kernel-image-2.6-*) for ia64.
     (dann frazier)
 
+  * Change fuzz factor to 1, stricter patch appliance. (Maximilian Attems)
+
  -- dann frazier <dannf at debian.org>  Mon, 15 Aug 2005 17:24:52 -0600
 
 linux-2.6 (2.6.12-4) unstable; urgency=low