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

[Joshua Kwan]

Author: joshk
Date: 2004-09-04 16:40:00 -0600 (Sat, 04 Sep 2004)
New Revision: 1550

Modified:
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/021_ide_module_fix.diff
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/rules
Log:
more convenience stuff


Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/021_ide_module_fix.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/021_ide_module_fix.diff	2004-09-04 21:58:51 UTC (rev 1549)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/021_ide_module_fix.diff	2004-09-04 22:40:00 UTC (rev 1550)
@@ -1,3 +1,9 @@
+# origin: Debian (herbert)
+# cset: n/a
+# inclusion: not suitable for mainline
+# description: superseded by 080-083
+# revision date: 2004-09-04
+
 --- linux-2.4.27/drivers/ide/Config.in	2004-08-08 01:26:04.000000000 +0200
 +++ linux-2.4.27+debian/drivers/ide/Config.in	2004-08-12 00:35:30.519655788 +0200
 @@ -27,13 +27,13 @@

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-09-04 21:58:51 UTC (rev 1549)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/rules	2004-09-04 22:40:00 UTC (rev 1550)
@@ -21,17 +21,21 @@
 unpatch:
 	override_version=$(release) home=debian/patches sh debian/apply $(upstream)
 
-orig:
-ifneq (,$(wildcard ../orig/kernel-source-$(upstream)-$(upstream)/))
-	rsync -av --delete --exclude .svn --exclude debian ../orig/kernel-source-$(upstream)-$(upstream)/ .
-else
+../orig/kernel-source-$(upstream)-$(upstream):
 ifneq (,$(wildcard ../kernel-source-$(upstream)_$(upstream).orig.tar.gz))
 	mkdir -p ../orig
 	tar -C ../orig -xzf ../kernel-source-$(upstream)_$(upstream).orig.tar.gz
 	rsync -av --delete --exclude .svn --exclude debian ../orig/kernel-source-$(upstream)-$(upstream)/ .
+else
+$(error "Can't find orig tarball.")
 endif
-endif
-	
+
+orig: ../orig/kernel-source-$(upstream)-$(upstream)
+	rsync -av --delete --exclude .svn --exclude debian ../orig/kernel-source-$(upstream)-$(upstream)/ .
+
+diff: ../orig/kernel-source-$(upstream)-$(upstream)
+	(cd .. && diff --exclude debian --exclude .svn -ur orig/kernel-source-$(upstream)-$(upstream) kernel-source-$(upstream)-$(upstream))
+
 debian/kernel-tree-$(upstream).substvars: debian/patches debian/make-substvars
 	sh debian/make-substvars $(upstream) > $@