r938 - trunk/kernel/powerpc/kernel-patch-powerpc-2.6.7-2.6.7/debian

[Jens Schmalzing]

Author: jensen
Date: 2004-07-27 09:39:28 -0600 (Tue, 27 Jul 2004)
New Revision: 938

Modified:
   trunk/kernel/powerpc/kernel-patch-powerpc-2.6.7-2.6.7/debian/changelog
   trunk/kernel/powerpc/kernel-patch-powerpc-2.6.7-2.6.7/debian/control
   trunk/kernel/powerpc/kernel-patch-powerpc-2.6.7-2.6.7/debian/control.stub
   trunk/kernel/powerpc/kernel-patch-powerpc-2.6.7-2.6.7/debian/rules
Log:
Backed out the so-called logic in debian/rules, added minor fixes.

Modified: trunk/kernel/powerpc/kernel-patch-powerpc-2.6.7-2.6.7/debian/changelog
===================================================================
--- trunk/kernel/powerpc/kernel-patch-powerpc-2.6.7-2.6.7/debian/changelog	2004-07-27 14:20:41 UTC (rev 937)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.7-2.6.7/debian/changelog	2004-07-27 15:39:28 UTC (rev 938)
@@ -8,14 +8,10 @@
 
   * Built the voodoo framebuffer driver into the kernel again (Sven Luther).
 
-  * Added logic to build on an exact kernel-source package version, in order
-    to not break building when patches are added/removed/modified from the
-    kernel-source package (Sven Luther).
-
   * Added G4 errata patch to fix stability problem with some G4 processors
     (Sven Luther).
 
- -- Sven Luther <luther@debian.org>  Tue, 27 Jul 2004 10:30:22 +0200
+ -- Jens Schmalzing <jensen@debian.org>  Tue, 27 Jul 2004 17:10:28 +0200
 
 kernel-patch-powerpc-2.6.7 (2.6.7-3) unstable; urgency=high
 

Modified: trunk/kernel/powerpc/kernel-patch-powerpc-2.6.7-2.6.7/debian/control
===================================================================
--- trunk/kernel/powerpc/kernel-patch-powerpc-2.6.7-2.6.7/debian/control	2004-07-27 14:20:41 UTC (rev 937)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.7-2.6.7/debian/control	2004-07-27 15:39:28 UTC (rev 938)
@@ -3,7 +3,7 @@
 Priority: optional
 Build-Depends: debhelper (>=4), bzip2, kernel-package, kernel-tree-2.6.7, m4
 Maintainer: Debian Kernel Team <debian-kernel@lists.debian.org>
-Uploaders: Jens Schmalzing <jensen@debian.org>, Sven Luther <luther@debian.org>
+Uploaders: Jens Schmalzing <jensen@debian.org>
 Standards-Version: 3.6.1
 
 Package: kernel-patch-powerpc-2.6.7
@@ -43,7 +43,6 @@
 Section: base
 Architecture: powerpc
 Depends: initrd-tools (>= 0.1.65), module-init-tools
-Conflicts: mkvmlinuz (<= 6)
 Recommends: hotplug
 Provides: kernel-image, kernel-image-2.6
 Description: Linux kernel image for 2.6.7-power3
@@ -73,7 +72,6 @@
 Section: base
 Architecture: powerpc
 Depends: initrd-tools (>= 0.1.65), module-init-tools
-Conflicts: mkvmlinuz (<= 6)
 Recommends: hotplug
 Provides: kernel-image, kernel-image-2.6
 Description: Linux kernel image for 2.6.7-power3-smp
@@ -103,7 +101,6 @@
 Section: base
 Architecture: powerpc
 Depends: initrd-tools (>= 0.1.65), module-init-tools
-Conflicts: mkvmlinuz (<= 6)
 Recommends: hotplug
 Provides: kernel-image, kernel-image-2.6
 Description: Linux kernel image for 2.6.7-power4
@@ -133,7 +130,6 @@
 Section: base
 Architecture: powerpc
 Depends: initrd-tools (>= 0.1.65), module-init-tools
-Conflicts: mkvmlinuz (<= 6)
 Recommends: hotplug
 Provides: kernel-image, kernel-image-2.6
 Description: Linux kernel image for 2.6.7-power4-smp
@@ -165,7 +161,6 @@
 Section: base
 Architecture: powerpc
 Depends: initrd-tools (>= 0.1.65), module-init-tools
-Conflicts: mkvmlinuz (<= 6)
 Recommends: hotplug
 Provides: kernel-image, kernel-image-2.6
 Description: Linux kernel image for 2.6.7-powerpc
@@ -195,7 +190,6 @@
 Section: base
 Architecture: powerpc
 Depends: initrd-tools (>= 0.1.65), module-init-tools
-Conflicts: mkvmlinuz (<= 6)
 Recommends: hotplug
 Provides: kernel-image, kernel-image-2.6
 Description: Linux kernel image for 2.6.7-powerpc-smp

Modified: trunk/kernel/powerpc/kernel-patch-powerpc-2.6.7-2.6.7/debian/control.stub
===================================================================
--- trunk/kernel/powerpc/kernel-patch-powerpc-2.6.7-2.6.7/debian/control.stub	2004-07-27 14:20:41 UTC (rev 937)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.7-2.6.7/debian/control.stub	2004-07-27 15:39:28 UTC (rev 938)
@@ -2,8 +2,8 @@
 Section: devel
 Priority: optional
 Build-Depends: debhelper (>=4), bzip2, kernel-package, kernel-tree-M4KERNEL, m4
-Maintainer: Jens Schmalzing <jensen@debian.org>
-Uploaders: Jens Schmalzing <jensen@debian.org>, Sven Luther <luther@debian.org>
+Maintainer: Debian Kernel Team <debian-kernel@lists.debian.org>
+Uploaders: Jens Schmalzing <jensen@debian.org>
 Standards-Version: 3.6.1
 
 Package: kernel-patch-powerpc-M4KERNEL

Modified: trunk/kernel/powerpc/kernel-patch-powerpc-2.6.7-2.6.7/debian/rules
===================================================================
--- trunk/kernel/powerpc/kernel-patch-powerpc-2.6.7-2.6.7/debian/rules	2004-07-27 14:20:41 UTC (rev 937)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.7-2.6.7/debian/rules	2004-07-27 15:39:28 UTC (rev 938)
@@ -18,9 +18,6 @@
 debian	:= $(shell head -1 debian/changelog | sed 's/^.*(.*-\(.*\)).*$$/\1/')
 version	:= $(shell head -1 debian/changelog | sed 's/^.*(\(.*\)).*$$/\1/')
 
-# which kernel-source version to use
-sourceversion := 3
-
 # how to call ourselves recursively
 RECURSION = $(MAKE) -f debian/rules
 
@@ -85,7 +82,7 @@
 
 	test -d $(dir $(KSOURCE)) || mkdir -p $(dir $(KSOURCE))
 	tar jxCf $(dir $(KSOURCE)) /usr/src/kernel-source-$(kernel).tar.bz2
-	cd $(KSOURCE); /usr/src/kernel-patches/all/$(kernel)/apply/debian $(kernel)-$(sourceversion)
+	cd $(KSOURCE); /usr/src/kernel-patches/all/$(kernel)/apply/debian
 	for file in $(shell debian/list patches); do patch -d $(KSOURCE) -p1 < patches/$$file; done
 
 	-$(MAKE) -s -C config default > $(KSOURCE)/.config