r2544 - trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian

Sven Luther luther@costa.debian.org
Thu, 24 Feb 2005 08:08:43 +0100


Author: luther
Date: 2005-02-24 08:08:42 +0100 (Thu, 24 Feb 2005)
New Revision: 2544

Modified:
   trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/control
   trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/control-dummy.m4
   trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/control-image.m4
   trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/control.stub
   trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/rules
Log:
Preparing new 2.6.8 upload for d-i rc3.
Some cosmetic changes in debian/rules.
Now include the kernel-source changelog in kernel-image.
Added dependency on mkvmlinuz, to make sure everyone has it installed, and
thus runs that postinst script on kernel-image install.
Dropped Jens from uploaders, since he don't seem active in powerpc kernels
anymore.


Modified: trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/control
===================================================================
--- trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/control	2005-02-24 07:03:13 UTC (rev 2543)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/control	2005-02-24 07:08:42 UTC (rev 2544)
@@ -1,9 +1,9 @@
 Source: kernel-patch-powerpc-2.6.8
 Section: devel
 Priority: optional
-Build-Depends: debhelper (>=4), bzip2, kernel-package, kernel-tree-2.6.8 (>= 2.6.8-11), m4
+Build-Depends: debhelper (>=4), bzip2, kernel-package, kernel-tree-2.6.8, m4
 Maintainer: Debian Kernel Team <debian-kernel@lists.debian.org>
-Uploaders: Jens Schmalzing <jensen@debian.org>, Sven Luther <luther@debian.org>
+Uploaders: Sven Luther <luther@debian.org>
 Standards-Version: 3.6.1
 
 Package: kernel-headers-2.6.8
@@ -23,7 +23,7 @@
 Package: kernel-image-2.6.8-power3
 Section: base
 Architecture: powerpc
-Depends: initrd-tools (>= 0.1.65), module-init-tools
+Depends: initrd-tools (>= 0.1.65), module-init-tools, mkvmlinuz
 Recommends: hotplug
 Provides: kernel-image, kernel-image-2.6
 Description: Linux kernel image for 2.6.8-power3
@@ -43,7 +43,7 @@
 Package: kernel-image-2.6.8-power3-smp
 Section: base
 Architecture: powerpc
-Depends: initrd-tools (>= 0.1.65), module-init-tools
+Depends: initrd-tools (>= 0.1.65), module-init-tools, mkvmlinuz
 Recommends: hotplug
 Provides: kernel-image, kernel-image-2.6
 Description: Linux kernel image for 2.6.8-power3-smp
@@ -63,7 +63,7 @@
 Package: kernel-image-2.6.8-power4
 Section: base
 Architecture: powerpc
-Depends: initrd-tools (>= 0.1.65), module-init-tools
+Depends: initrd-tools (>= 0.1.65), module-init-tools, mkvmlinuz
 Recommends: hotplug
 Provides: kernel-image, kernel-image-2.6
 Description: Linux kernel image for 2.6.8-power4
@@ -83,7 +83,7 @@
 Package: kernel-image-2.6.8-power4-smp
 Section: base
 Architecture: powerpc
-Depends: initrd-tools (>= 0.1.65), module-init-tools
+Depends: initrd-tools (>= 0.1.65), module-init-tools, mkvmlinuz
 Recommends: hotplug
 Provides: kernel-image, kernel-image-2.6
 Description: Linux kernel image for 2.6.8-power4-smp
@@ -105,7 +105,7 @@
 Package: kernel-image-2.6.8-powerpc
 Section: base
 Architecture: powerpc
-Depends: initrd-tools (>= 0.1.65), module-init-tools
+Depends: initrd-tools (>= 0.1.65), module-init-tools, mkvmlinuz
 Recommends: hotplug
 Provides: kernel-image, kernel-image-2.6
 Description: Linux kernel image for 2.6.8-powerpc
@@ -125,7 +125,7 @@
 Package: kernel-image-2.6.8-powerpc-smp
 Section: base
 Architecture: powerpc
-Depends: initrd-tools (>= 0.1.65), module-init-tools
+Depends: initrd-tools (>= 0.1.65), module-init-tools, mkvmlinuz
 Recommends: hotplug
 Provides: kernel-image, kernel-image-2.6
 Description: Linux kernel image for 2.6.8-powerpc-smp

Modified: trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/control-dummy.m4
===================================================================
--- trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/control-dummy.m4	2005-02-24 07:03:13 UTC (rev 2543)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/control-dummy.m4	2005-02-24 07:08:42 UTC (rev 2544)
@@ -2,14 +2,14 @@
 Section: devel
 Priority: optional
 Maintainer: Jens Schmalzing <jensen@debian.org>
-Uploaders: Jens Schmalzing <jensen@debian.org>, Sven Luther <luther@debian.org>
+Uploaders: Sven Luther <luther@debian.org>
 Standards-Version: 3.6.1
 
 Package: kernel-image-M4KERNEL-M4FLAVOUR
 Architecture: powerpc
 Section: base
 Provides: kernel-image, kernel-image-2.6
-Depends: initrd-tools, coreutils | fileutils (>=4.0)
+Depends: initrd-tools, coreutils | fileutils (>=4.0), mkvmlinuz
 Description: intermediate Linux kernel binary image for M4KERNEL-M4FLAVOUR
  .
  This package contains the Linux kernel for version M4KERNEL-M4FLAVOUR,

Modified: trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/control-image.m4
===================================================================
--- trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/control-image.m4	2005-02-24 07:03:13 UTC (rev 2543)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/control-image.m4	2005-02-24 07:08:42 UTC (rev 2544)
@@ -10,7 +10,7 @@
 Package: kernel-image-M4KERNEL-M4FLAVOUR
 Section: base
 Architecture: powerpc
-Depends: initrd-tools (>= 0.1.65), module-init-tools
+Depends: initrd-tools (>= 0.1.65), module-init-tools, mkvmlinuz
 Recommends: hotplug
 Provides: kernel-image, kernel-image-2.6
 Description: Linux kernel image for M4KERNEL-M4FLAVOUR

Modified: trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/control.stub
===================================================================
--- trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/control.stub	2005-02-24 07:03:13 UTC (rev 2543)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/control.stub	2005-02-24 07:08:42 UTC (rev 2544)
@@ -3,7 +3,7 @@
 Priority: optional
 Build-Depends: debhelper (>=4), bzip2, kernel-package, kernel-tree-M4KERNEL, m4
 Maintainer: Debian Kernel Team <debian-kernel@lists.debian.org>
-Uploaders: Jens Schmalzing <jensen@debian.org>, Sven Luther <luther@debian.org>
+Uploaders: Sven Luther <luther@debian.org>
 Standards-Version: 3.6.1
 
 Package: kernel-headers-M4KERNEL

Modified: trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/rules
===================================================================
--- trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/rules	2005-02-24 07:03:13 UTC (rev 2543)
+++ trunk/kernel/powerpc/kernel-patch-powerpc-2.6.8-2.6.8/debian/rules	2005-02-24 07:08:42 UTC (rev 2544)
@@ -217,16 +217,16 @@
 # remove the coff image
 	rm -f $(KIMAGE)/boot/vmlinux.coff-$(kernel)-$(flavour)
 
-# add a README file
-	$(INSTALL_DATA) debian/README.kernel-image $(KIMAGEDOC)/NEWS.Debian
-
 # copy build infrastructure for kernel modules
 	cd $(KFLAVOUR); find scripts -type f ! -name '*.o' | cpio -pd $(KSRC)
 	cat debian/build-files | ( cd $(KFLAVOUR); cpio -pd $(KSRC) )
 
-# add a README file
+# add some README files and the kernel-source changelog
+	$(INSTALL_DATA) debian/README.kernel-image $(KIMAGEDOC)/NEWS.Debian
 	mkdir -p $(KBUILDDOC)
 	$(INSTALL_DATA) debian/README.kernel-build $(KBUILDDOC)/README.Debian
+	$(INSTALL_DATA) /usr/share/doc/kernel-source-$(kernel)/changelog.Debian.gz \
+		$(KBUILDDOC)/changelog-kernel-source.Debian.gz
 
 	touch $@