From 39e45605749b9758b725226caa3c87450a043bfd Mon Sep 17 00:00:00 2001 From: maximilian attems Date: Tue, 16 Aug 2005 07:56:59 +0000 Subject: [PATCH] change fuzz factor from default 2 to 1 on patch appliance. may need a rediff of various patches, but catches from nasty surprises svn path=/trunk/kernel/source/linux-2.6/; revision=3910 --- debian/bin/apply | 2 +- debian/changelog | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/bin/apply b/debian/bin/apply index e4d8550c8..4bb7a6b4a 100755 --- a/debian/bin/apply +++ b/debian/bin/apply @@ -40,7 +40,7 @@ find_patch() { 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" diff --git a/debian/changelog b/debian/changelog index 7e833b88c..fbf551aa5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ linux-2.6 (2.6.12-5) UNRELEASED; urgency=low * Add transitional meta packages (kernel-image-2.6-*) for ia64. (dann frazier) + * Change fuzz factor to 1, stricter patch appliance. (Maximilian Attems) + -- dann frazier Mon, 15 Aug 2005 17:24:52 -0600 linux-2.6 (2.6.12-4) unstable; urgency=low