[kernel] r5680 - in dists/sid/linux-2.6/debian: . arch/powerpc

[Bastian Blank]

Author: waldi
Date: Wed Feb  1 09:50:32 2006
New Revision: 5680

Modified:
   dists/sid/linux-2.6/debian/arch/powerpc/defines
   dists/sid/linux-2.6/debian/changelog
Log:
* debian/changelog: Update.
* debian/arch/powerpc/defines: Fix depends settings, they are not additive.



Modified: dists/sid/linux-2.6/debian/arch/powerpc/defines
==============================================================================
--- dists/sid/linux-2.6/debian/arch/powerpc/defines	(original)
+++ dists/sid/linux-2.6/debian/arch/powerpc/defines	Wed Feb  1 09:50:32 2006
@@ -11,16 +11,16 @@
 kpkg-subarch: ppc
 
 [apus]
-depends: mkvmlinuz (>= 18)
+depends: initramfs-tools | yaird | linux-initramfs-tool, mkvmlinuz (>= 18)
 
 [powerpc]
-depends: mkvmlinuz (>= 18)
+depends: initramfs-tools | yaird | linux-initramfs-tool, mkvmlinuz (>= 18)
 
 [powerpc-smp]
-depends: mkvmlinuz (>= 18)
+depends: initramfs-tools | yaird | linux-initramfs-tool, mkvmlinuz (>= 18)
 
 [powerpc-miboot]
-depends: mkvmlinuz (>= 18)
+depends: initramfs-tools | yaird | linux-initramfs-tool, mkvmlinuz (>= 18)
 
 [powerpc64]
 kpkg-subarch: powerpc64

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Wed Feb  1 09:50:32 2006
@@ -61,7 +61,10 @@
   * [powerpc] Default to initramfs-tools as initramfs generator, as klibc
     build is fixed now.
 
- -- maximilian attems <maks at sternwelten.at>  Tue, 31 Jan 2006 11:17:19 +0100
+  [ Bastian Blank ]
+  * [powerpc] Fix dependencies of image packages. 
+
+ -- Bastian Blank <waldi at debian.org>  Wed,  1 Feb 2006 09:49:27 +0000
 
 linux-2.6 (2.6.15-3) unstable; urgency=low