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

[Joshua Kwan]

Author: joshk
Date: 2004-08-16 11:06:02 -0600 (Mon, 16 Aug 2004)
New Revision: 1155

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
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/rules
Log:
fix'n'upload

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 16:50:33 UTC (rev 1154)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/apply	2004-08-16 17:06:02 UTC (rev 1155)
@@ -38,7 +38,7 @@
 apply_patch() {
 	patch=$(find_patch $home/$1)
 	base=$1
-	if uncompress_patch "$patch" | patch -p1 -s -t; then
+	if uncompress_patch "$patch" | patch -p1 -s -t --no-backup-if-mismatch; then
 		printf "%-32s\tOK (+)\n" "$base"
 	else
 		printf "%-32s\tFAIL (+)\n" "$base"
@@ -49,7 +49,7 @@
 deapply_patch() {
 	patch=$(find_patch $home/$1)
 	base=$1
-	if uncompress_patch "$patch" | patch -p1 -s -t -R; then
+	if uncompress_patch "$patch" | patch -p1 -s -t -R --no-backup-if-mismatch; then
 		printf "%-32s\tOK (-)\n" "$base"
 	else
 		printf "%-32s\tFAIL (-)\n" "$base"

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 16:50:33 UTC (rev 1154)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog	2004-08-16 17:06:02 UTC (rev 1155)
@@ -1,10 +1,14 @@
-kernel-source-2.4.27 (2.4.27-2) unstable; urgency=low
+kernel-source-2.4.27 (2.4.27-2) unstable; urgency=high
 
+  * Urgency high to enter sarge. NEW processing was quick, thanks Randall!
   * 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.
+  * debian/patches/series/2.4.27-2: file with only a newline in it (so
+    it doesn't get reaped by make-kpkg clean for being size 0.)
+  * Use --no-backup-if-mismatch in debian/apply.
 
- -- Joshua Kwan <joshk@triplehelix.org>  Sun, 15 Aug 2004 18:00:31 -0700
+ -- Joshua Kwan <joshk@triplehelix.org>  Mon, 16 Aug 2004 09:24:56 -0700
 
 kernel-source-2.4.27 (2.4.27-1) unstable; urgency=low
 

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-16 16:50:33 UTC (rev 1154)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/rules	2004-08-16 17:06:02 UTC (rev 1155)
@@ -30,7 +30,7 @@
 	rm -f install-stamp
 
 ifneq (,$(wildcard .patch-stamps))
-	home=$(patch_home)/debian sh $(patch_home)/unpatch/debian
+	override_version=$(release) home=debian/patches sh debian/apply $(upstream)
 endif
 
 	make-kpkg clean