[kernel] r19232 - in dists/squeeze-backports/linux/debian: . bin

[Ben Hutchings]

Author: benh
Date: Fri Jun 29 03:00:43 2012
New Revision: 19232

Log:
Use QUILT_PATCH_OPTS instead of missing quilt patch --fuzz option

quilt didn't know this option in squeeze.

Modified:
   dists/squeeze-backports/linux/debian/bin/test-patches
   dists/squeeze-backports/linux/debian/changelog
   dists/squeeze-backports/linux/debian/rules
   dists/squeeze-backports/linux/debian/rules.real

Modified: dists/squeeze-backports/linux/debian/bin/test-patches
==============================================================================
--- dists/squeeze-backports/linux/debian/bin/test-patches	Fri Jun 29 01:12:51 2012	(r19231)
+++ dists/squeeze-backports/linux/debian/bin/test-patches	Fri Jun 29 03:00:43 2012	(r19232)
@@ -89,7 +89,7 @@
     patch_abs="$(readlink -f "$patch")"
     (cd "debian/build/source_${featureset}" && \
      quilt import -P "test/$(basename "$patch")" "$patch_abs" && \
-     quilt push --fuzz=0)
+     QUILT_PATCH_OPTS='--fuzz=0' quilt push)
 done
 
 # Build selected binaries

Modified: dists/squeeze-backports/linux/debian/changelog
==============================================================================
--- dists/squeeze-backports/linux/debian/changelog	Fri Jun 29 01:12:51 2012	(r19231)
+++ dists/squeeze-backports/linux/debian/changelog	Fri Jun 29 03:00:43 2012	(r19232)
@@ -7,8 +7,9 @@
     - Monkey-patch Python collections module to add OrderedDict if necessary
     - [armel] Disable CRYPTO_FIPS, VGA_ARB, FTRACE on iop32x and ixp4xx to
       reduce kernel size (as suggested by Arnaud Patard)
+    - Use QUILT_PATCH_OPTS instead of missing quilt patch --fuzz option
 
- -- Ben Hutchings <ben at decadent.org.uk>  Fri, 29 Jun 2012 02:10:36 +0100
+ -- Ben Hutchings <ben at decadent.org.uk>  Fri, 29 Jun 2012 03:14:54 +0100
 
 linux (3.2.20-1) unstable; urgency=low
 

Modified: dists/squeeze-backports/linux/debian/rules
==============================================================================
--- dists/squeeze-backports/linux/debian/rules	Fri Jun 29 01:12:51 2012	(r19231)
+++ dists/squeeze-backports/linux/debian/rules	Fri Jun 29 03:00:43 2012	(r19232)
@@ -44,7 +44,7 @@
 
 orig: $(DIR_ORIG)
 	rsync --delete --exclude /debian --exclude .svk --exclude .svn --link-dest=$(DIR_ORIG)/ -a $(DIR_ORIG)/ .
-	QUILT_PATCHES='$(CURDIR)/debian/patches' quilt push --quiltrc - -a -q --fuzz=0
+	QUILT_PATCHES='$(CURDIR)/debian/patches' QUILT_PATCH_OPTS='--fuzz=0' quilt push --quiltrc - -a -q
 
 $(DIR_ORIG):
 ifeq ($(TAR_ORIG),)

Modified: dists/squeeze-backports/linux/debian/rules.real
==============================================================================
--- dists/squeeze-backports/linux/debian/rules.real	Fri Jun 29 01:12:51 2012	(r19231)
+++ dists/squeeze-backports/linux/debian/rules.real	Fri Jun 29 03:00:43 2012	(r19232)
@@ -84,7 +84,7 @@
 	(rm -f $@; exit 1)
 
 define patch_cmd
-cd '$(DIR)' && QUILT_PATCHES='$(CURDIR)/debian/patches' QUILT_SERIES=series-$(1) quilt push --quiltrc - -a -q --fuzz=0
+cd '$(DIR)' && QUILT_PATCHES='$(CURDIR)/debian/patches' QUILT_SERIES=series-$(1) QUILT_PATCH_OPTS='--fuzz=0' quilt push --quiltrc - -a -q
 endef
 
 $(STAMPS_DIR)/source: