r1135 - in trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian: . patches/series

[Joshua Kwan]

Author: joshk
Date: 2004-08-15 19:04:10 -0600 (Sun, 15 Aug 2004)
New Revision: 1135

Added:
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-2
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/changelog
Log:
Bah. Remove .patch-stamps support from debian/apply as it prevents the user from being able to unapply kernel-patch-debian-2.4.27 on an unpacked kernel-source.tar.bz2

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-16 01:03:14 UTC (rev 1134)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/apply	2004-08-16 01:04:10 UTC (rev 1135)
@@ -3,8 +3,6 @@
 
 set -e
 
-stampdir=".patch-stamps"
-
 die() {
 	echo "E: $@" >&2
 	exit 1
@@ -40,33 +38,22 @@
 apply_patch() {
 	patch=$(find_patch $home/$1)
 	base=$1
-	if [ -e "$stampdir/$base" ]; then
-		printf "%-32s\tUNCHANGED (+)\n" "$base"
+	if uncompress_patch "$patch" | patch -p1 -s -t; then
+		printf "%-32s\tOK (+)\n" "$base"
 	else
-		if uncompress_patch "$patch" | patch -p1 -s -t; then
-			printf "%-32s\tOK (+)\n" "$base"
-			mkdir -p $stampdir
-			touch $stampdir/$base
-		else
-			printf "%-32s\tFAIL (+)\n" "$base"
-			exit 1
-		fi
+		printf "%-32s\tFAIL (+)\n" "$base"
+		exit 1
 	fi
 }
 
 deapply_patch() {
 	patch=$(find_patch $home/$1)
 	base=$1
-	if [ -e "$stampdir/$base" ]; then
-		if uncompress_patch "$patch" | patch -p1 -s -t -R; then
-			printf "%-32s\tOK (-)\n" "$base"
-			rm -f $stampdir/$base
-		else
-			printf "%-32s\tFAIL (-)\n" "$base"
-			exit 1
-		fi
+	if uncompress_patch "$patch" | patch -p1 -s -t -R; then
+		printf "%-32s\tOK (-)\n" "$base"
 	else
-		printf "%-32s\tUNCHANGED (-)\n" "$base"
+		printf "%-32s\tFAIL (-)\n" "$base"
+		exit 1
 	fi
 }
 
@@ -161,7 +148,6 @@
 			die "Series doesn't have a revision!"
 		fi
 	done
-	rmdir --ignore-fail-on-non-empty $stampdir
 elif [ "$current_rev" = "$upstream" ] || [ $target_rev -gt $current_rev ]; then
 	for sver in $home/series/*; do
 		base=$(basename "$sver")
@@ -190,7 +176,6 @@
 			die "Series doesn't have a revision!"
 		fi
 	done
-	rmdir --ignore-fail-on-non-empty $stampdir
 fi
 
 echo $target > version.Debian

Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog	2004-08-16 01:03:14 UTC (rev 1134)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog	2004-08-16 01:04:10 UTC (rev 1135)
@@ -1,3 +1,11 @@
+kernel-source-2.4.27 (2.4.27-2) unstable; urgency=low
+
+  * Bah. Remove .patch-stamps support from debian/apply as it prevents the
+    user from being able to unapply kernel-patch-debian-2.4.27 on an
+    unpacked kernel-source.tar.bz2.
+
+ -- Joshua Kwan <joshk@triplehelix.org>  Sun, 15 Aug 2004 18:00:31 -0700
+
 kernel-source-2.4.27 (2.4.27-1) unstable; urgency=low
 
   * New upstream release.

Added: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-2
===================================================================