[kernel] r5383 - in dists/trunk/linux-2.6/debian: . arch/alpha arch/amd64 arch/arm arch/hppa arch/i386 arch/ia64 arch/m68k arch/powerpc arch/s390 arch/sparc templates

[maximilian attems]

Author: maks-guest
Date: Mon Jan  9 22:24:36 2006
New Revision: 5383

Modified:
   dists/trunk/linux-2.6/debian/arch/alpha/defines
   dists/trunk/linux-2.6/debian/arch/amd64/defines
   dists/trunk/linux-2.6/debian/arch/arm/defines
   dists/trunk/linux-2.6/debian/arch/hppa/defines
   dists/trunk/linux-2.6/debian/arch/i386/defines
   dists/trunk/linux-2.6/debian/arch/ia64/defines
   dists/trunk/linux-2.6/debian/arch/m68k/defines
   dists/trunk/linux-2.6/debian/arch/powerpc/defines
   dists/trunk/linux-2.6/debian/arch/s390/defines
   dists/trunk/linux-2.6/debian/arch/sparc/defines
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/templates/control.image.in
Log:
amd64, i386, hppa and sparc go for i-t


Modified: dists/trunk/linux-2.6/debian/arch/alpha/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/alpha/defines	(original)
+++ dists/trunk/linux-2.6/debian/arch/alpha/defines	Mon Jan  9 22:24:36 2006
@@ -1,4 +1,5 @@
 [base]
+depends: initramfs-tools | yaird | linux-initramfs-tool
 flavours: alpha-generic alpha-smp
 suggests: aboot, fdutils
 

Modified: dists/trunk/linux-2.6/debian/arch/amd64/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/amd64/defines	(original)
+++ dists/trunk/linux-2.6/debian/arch/amd64/defines	Mon Jan  9 22:24:36 2006
@@ -1,5 +1,5 @@
 [base]
-depends: e2fsprogs (>= 1.35-7)
+depends: initramfs-tools | yaird | linux-initramfs-tool, e2fsprogs (>= 1.35-7)
 flavours:
  amd64-generic
  amd64-k8

Modified: dists/trunk/linux-2.6/debian/arch/arm/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/arm/defines	(original)
+++ dists/trunk/linux-2.6/debian/arch/arm/defines	Mon Jan  9 22:24:36 2006
@@ -1,4 +1,5 @@
 [base]
+depends: yaird | initramfs-tools | linux-initramfs-tool
 flavours:
  footbridge
  ixp4xx

Modified: dists/trunk/linux-2.6/debian/arch/hppa/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/hppa/defines	(original)
+++ dists/trunk/linux-2.6/debian/arch/hppa/defines	Mon Jan  9 22:24:36 2006
@@ -1,4 +1,5 @@
 [base]
+depends: initramfs-tools | yaird | linux-initramfs-tool
 flavours:
  parisc
  parisc-smp

Modified: dists/trunk/linux-2.6/debian/arch/i386/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/i386/defines	(original)
+++ dists/trunk/linux-2.6/debian/arch/i386/defines	Mon Jan  9 22:24:36 2006
@@ -1,4 +1,5 @@
 [base]
+depends: initramfs-tools | yaird | linux-initramfs-tool
 flavours:
  486
  686

Modified: dists/trunk/linux-2.6/debian/arch/ia64/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/ia64/defines	(original)
+++ dists/trunk/linux-2.6/debian/arch/ia64/defines	Mon Jan  9 22:24:36 2006
@@ -1,4 +1,5 @@
 [base]
+depends: yaird | initramfs-tools | linux-initramfs-tool
 flavours:
  itanium
  itanium-smp

Modified: dists/trunk/linux-2.6/debian/arch/m68k/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/defines	(original)
+++ dists/trunk/linux-2.6/debian/arch/m68k/defines	Mon Jan  9 22:24:36 2006
@@ -1,4 +1,5 @@
 [base]
+depends: yaird | initramfs-tools | linux-initramfs-tool
 compiler: gcc-3.3
 flavours:
  amiga

Modified: dists/trunk/linux-2.6/debian/arch/powerpc/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/powerpc/defines	(original)
+++ dists/trunk/linux-2.6/debian/arch/powerpc/defines	Mon Jan  9 22:24:36 2006
@@ -1,4 +1,5 @@
 [base]
+depends: yaird | initramfs-tools | linux-initramfs-tool
 flavours:
  apus
  powerpc

Modified: dists/trunk/linux-2.6/debian/arch/s390/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/s390/defines	(original)
+++ dists/trunk/linux-2.6/debian/arch/s390/defines	Mon Jan  9 22:24:36 2006
@@ -1,5 +1,6 @@
 [base]
 desc: This kernel has support to IPL (boot) from a VM reader or DASD device.
+depends: yaird | initramfs-tools | linux-initramfs-tool
 flavours: s390 s390x
 suggests: s390-tools
 kernel-arch: s390

Modified: dists/trunk/linux-2.6/debian/arch/sparc/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/sparc/defines	(original)
+++ dists/trunk/linux-2.6/debian/arch/sparc/defines	Mon Jan  9 22:24:36 2006
@@ -1,4 +1,5 @@
 [base]
+depends: initramfs-tools | yaird | linux-initramfs-tool
 flavours:
  sparc64
  sparc64-smp

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Mon Jan  9 22:24:36 2006
@@ -1,7 +1,8 @@
 linux-2.6 (2.6.15-2) UNRELEASED; urgency=low
 
   [ maximilian attems ]
-  * Default to initramfs-tools as initramfs generator.
+  * Default to initramfs-tools as initramfs generator for amd64, hppa, i386
+    and sparc. More archs will be added once klibc matures.
     (Closes: #346141, #343147, #341524, #346305)
   * Backport alsa patch for opl3 - Fix the unreleased resources.
     (Closes: #346273)
@@ -23,7 +24,8 @@
   [ Bastian Blank ]
   * Remove pre-sarge conflict with hotplug.
 
- -- maximilian attems <maks at sternwelten.at>  Sat,  7 Jan 2006 19:25:19 +0100
+
+ -- maximilian attems <maks at sternwelten.at>  Mon,  9 Jan 2006 23:21:22 +0100
 
 linux-2.6 (2.6.15-1) unstable; urgency=low
 

Modified: dists/trunk/linux-2.6/debian/templates/control.image.in
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/control.image.in	(original)
+++ dists/trunk/linux-2.6/debian/templates/control.image.in	Mon Jan  9 22:24:36 2006
@@ -2,7 +2,7 @@
 Section: base
 Priority: optional
 Provides: linux-image, linux-image- at major@
-Depends: initramfs-tools | yaird | linux-initramfs-tool, module-init-tools (>= 0.9.13)
+Depends: module-init-tools (>= 0.9.13)
 Suggests: linux-doc- at version@ | linux-source- at version@
 Description: Linux kernel @version@ image on @class@ machines
  This package provides the binary image and pre-built loadable modules for