r3713 - in trunk/kernel/source/linux-2.6/debian: . templates

[Sven Luther]

Author: luther
Date: 2005-08-07 11:51:50 +0000 (Sun, 07 Aug 2005)
New Revision: 3713

Modified:
   trunk/kernel/source/linux-2.6/debian/changelog
   trunk/kernel/source/linux-2.6/debian/templates/control.image.in
Log:
Readded dependency of linux-image on mkvmlinuz for powerpc. Doesn't take ppc64
kernels in account, but as we don't have those yet ...


Modified: trunk/kernel/source/linux-2.6/debian/changelog
===================================================================
--- trunk/kernel/source/linux-2.6/debian/changelog	2005-08-07 11:44:21 UTC (rev 3712)
+++ trunk/kernel/source/linux-2.6/debian/changelog	2005-08-07 11:51:50 UTC (rev 3713)
@@ -46,8 +46,9 @@
 
   * [powerpc] Fixed minor problems with the powerpc image :
     - mkvmlinuz support was missing, should be fixed building with
-    kernel-package 9.005. (Closes: #321625)
+      kernel-package 9.005. (Closes: #321625)
     - typo made the ams-ppc and asm-ppc64 headers not being included.
+    - re-added dependency on mkvmlinuz for powerpc.
 
  -- Sven Luther <luther at debian.org>  Sun,  7 Aug 2005 09:12:51 +0200
  

Modified: trunk/kernel/source/linux-2.6/debian/templates/control.image.in
===================================================================
--- trunk/kernel/source/linux-2.6/debian/templates/control.image.in	2005-08-07 11:44:21 UTC (rev 3712)
+++ trunk/kernel/source/linux-2.6/debian/templates/control.image.in	2005-08-07 11:51:50 UTC (rev 3713)
@@ -3,7 +3,7 @@
 Section: base
 Priority: optional
 Provides: linux-image, linux-image- at major@
-Depends: initrd-tools (>= 0.1.78), coreutils | fileutils (>= 4.0), module-init-tools (>= 0.9.13)
+Depends: initrd-tools (>= 0.1.78), coreutils | fileutils (>= 4.0), module-init-tools (>= 0.9.13), mkvmlinuz (>= 13) [powerpc]
 Conflicts: hotplug (<< 0.0.20040105-1)
 Suggests: linux-doc- at version@ | linux-source- at version@
 Description: Linux kernel @version@ image on @class@ machines