r1057 - trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian

Joshua Kwan joshk@haydn.debian.org
Fri, 13 Aug 2004 00:02:27 -0600


Author: joshk
Date: 2004-08-13 00:02:08 -0600 (Fri, 13 Aug 2004)
New Revision: 1057

Modified:
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/apply
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/rules
Log:
apply ignores dot-everything; add convenience patch and unpatch targets


Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/apply
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/apply	2004-08-13 05:43:57 UTC (rev 1056)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/apply	2004-08-13 06:02:08 UTC (rev 1057)
@@ -150,7 +150,7 @@
 		exit 0
 	fi
 
-	for sver in $(find $home/series/ -type f| sort -r); do
+	for sver in $(ls -d $home/series/* | sort -r); do
 		base=$(basename "$sver")
 		srev=${base#*-}
 		if [ -n "$srev" ]; then
@@ -178,7 +178,7 @@
 	echo "Nothing to do, exiting."
 	exit 0
 elif [ $target_rev -lt $current_rev ]; then
-	for sver in $(find $home/series/ -type f | sort -r); do
+	for sver in $(ls -d $home/series/* | sort -r); do
 		base=$(basename "$sver")
 		srev=${base#*-}
 		if [ -n "$srev" ]; then

Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/rules
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/rules	2004-08-13 05:43:57 UTC (rev 1056)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/rules	2004-08-13 06:02:08 UTC (rev 1057)
@@ -13,7 +13,14 @@
 release := $(shell dpkg-parsechangelog | awk '/^Version: / { print $$2 }')
 upstream := $(shell echo "$(release)" | sed 's/:\?\([0-9\.]\+\)-[0-9]*/\1/')
 patch_home := debian/kernel-patch-debian-$(upstream)/usr/src/kernel-patches/all/$(upstream)
-	
+
+# Little things that help you...
+patch:
+	override_version=$(release) home=debian/patches sh debian/apply
+
+unpatch:
+	override_version=$(release) home=debian/patches sh debian/apply $(upstream)
+
 debian/kernel-tree-$(upstream).substvars: debian/patches debian/make-substvars
 	sh debian/make-substvars $(upstream) > $@