r1103 - trunk/kernel-2.4/sparc/kernel-image-sparc-2.4/debian

[Joshua Kwan]

Author: joshk
Date: 2004-08-14 13:59:22 -0600 (Sat, 14 Aug 2004)
New Revision: 1103

Removed:
   trunk/kernel-2.4/sparc/kernel-image-sparc-2.4/debian/patches/
Modified:
   trunk/kernel-2.4/sparc/kernel-image-sparc-2.4/debian/changelog
   trunk/kernel-2.4/sparc/kernel-image-sparc-2.4/debian/rules
Log:
remove patches

Modified: trunk/kernel-2.4/sparc/kernel-image-sparc-2.4/debian/changelog
===================================================================
--- trunk/kernel-2.4/sparc/kernel-image-sparc-2.4/debian/changelog	2004-08-14 19:57:49 UTC (rev 1102)
+++ trunk/kernel-2.4/sparc/kernel-image-sparc-2.4/debian/changelog	2004-08-14 19:59:22 UTC (rev 1103)
@@ -1,7 +1,7 @@
 kernel-image-sparc-2.4 (1:2.4.27-1) UNRELEASED; urgency=low
 
   * Joshua Kwan
-    - Switch to an initrd-using scheme, and a better 
+    - Switch to an initrd-using scheme, and a better
       versioning scheme.
     - Bump to 2.4.27.
     - Drop patches-obsolete, they're REALLY obsolete now.
@@ -13,8 +13,9 @@
       + (ADDED) 05_GPL_and_SYMBOLS.dpatch: Some files not marked GPL
         actually are. Mark them. Also remove obsolete EXPORT_NO_SYMBOLS
         stuff.
+    - All patches were merged with kernel-source-2.4.27. 
 
- -- Joshua Kwan <joshk@triplehelix.org>  Thu, 15 Jul 2004 09:48:15 -0700
+ -- Joshua Kwan <joshk@triplehelix.org>  Sat, 14 Aug 2004 12:58:50 -0700
 
 kernel-image-sparc-2.4 (39) unstable; urgency=low
 

Modified: trunk/kernel-2.4/sparc/kernel-image-sparc-2.4/debian/rules
===================================================================
--- trunk/kernel-2.4/sparc/kernel-image-sparc-2.4/debian/rules	2004-08-14 19:57:49 UTC (rev 1102)
+++ trunk/kernel-2.4/sparc/kernel-image-sparc-2.4/debian/rules	2004-08-14 19:59:22 UTC (rev 1103)
@@ -30,7 +30,7 @@
 endif
 
 ifneq ($(DEB_HOST_ARCH),$(KPKG_ARCH))
-ifneq (,$(filter-out debian/control clean stamps/build-dummy-%-stamp stamps/patch-stamp stamps/unpack-stamp patch unpatch,$(MAKECMDGOALS)))
+ifneq (,$(filter-out debian/control clean stamps/build-dummy-%-stamp stamps/unpack-stamp,$(MAKECMDGOALS)))
 $(error Use dpkg-buildpackage -asparc! ($(DEB_HOST_ARCH) != $(KPKG_ARCH)))
 endif
 endif
@@ -48,17 +48,6 @@
 	tar --bzip2 -xf /usr/src/$(kdir).tar.bz2
 	touch $@
 
-patch: stamps/patch-stamp
-stamps/patch-stamp: stamps/unpack-stamp 
-	dpatch -d $(kdir) apply-all
-	dpatch cat-all >  $@
-
-unpatch:
-ifneq (,$(wildcard stamps/patch-stamp))
-	dpatch -d $(kdir) deapply-all
-endif
-	rm -f stamps/patch-stamp
-
 debian/control: debian/control.in debian/rules
 	sed -e 's/=V/$(VERSION)/g' -e 's/=A/$(abi)/g' debian/control.in > debian/control
 
@@ -74,7 +63,7 @@
 	dh_gencontrol -pkernel-image-$*
 	dh_builddeb -pkernel-image-$*
 
-stamps/build-%-stamp: config/% stamps/patch-stamp
+stamps/build-%-stamp: config/%
 	rm -f $@
 
 	mkdir -p $(kdir)/debian
@@ -97,12 +86,12 @@
 	echo "CONFIG_NR_CPUS=$(SMP_CPU_COUNT)" >> $@
 
 clean: debian/control
-	rm -rf $(kdir) debian/patched
+	rm -rf $(kdir)
 	rm -f *.deb debian/files stamps/* config/*-smp
 	dh_clean
 
 install: stamps/install-stamp
-stamps/install-stamp: build stamps/patch-stamp debian/control
+stamps/install-stamp: build debian/control
 	touch $@
 
 binary-indep: build install
@@ -112,7 +101,7 @@
 binary-arch: $(all_dummies) build install
 
 build: debian/control stamps/build-stamp
-stamps/build-stamp: stamps/patch-stamp $(all_subarches) 
+stamps/build-stamp: $(all_subarches) 
 	touch $@
 
 binary: binary-indep binary-arch