[kernel] r6100 - in dists/trunk/linux-2.6/debian: . arch arch/arm arch/armeb

[Bastian Blank]

Author: waldi
Date: Wed Mar  8 09:08:50 2006
New Revision: 6100

Modified:
   dists/trunk/linux-2.6/debian/arch/arm/defines
   dists/trunk/linux-2.6/debian/arch/armeb/defines
   dists/trunk/linux-2.6/debian/arch/defines
   dists/trunk/linux-2.6/debian/changelog
Log:
Revert r6099. Untested modification.


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	Wed Mar  8 09:08:50 2006
@@ -9,6 +9,7 @@
 kernel-header-dirs: arm
 
 [image]
+initramfs-generators: yaird initramfs-tools
 suggests: fdutils
 
 [footbridge]

Modified: dists/trunk/linux-2.6/debian/arch/armeb/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/armeb/defines	(original)
+++ dists/trunk/linux-2.6/debian/arch/armeb/defines	Wed Mar  8 09:08:50 2006
@@ -4,6 +4,9 @@
 kernel-arch: arm
 kernel-header-dirs: arm
 
+[image]
+initramfs-generators: yaird initramfs-tools
+
 [nslu2]
 class: NSLU2
 longclass: Linksys NSLU2 (Network Storage Link for USB 2.0 Disk Drives)

Modified: dists/trunk/linux-2.6/debian/arch/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/defines	(original)
+++ dists/trunk/linux-2.6/debian/arch/defines	Wed Mar  8 09:08:50 2006
@@ -18,11 +18,11 @@
  sparc
 
 [image]
-initramfs-generators: initramfs-tools (>= 0.53) yaird
+initramfs-generators: initramfs-tools yaird
 type: kernel-package
 
 [image-initramfs-generators]
-initramfs-tools: mkinitramfs-kpkg
+initramfs-tools: mkinitramfs
 yaird: mkinitrd.yaird
 
 [relations-image-initramfs-generators]

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Wed Mar  8 09:08:50 2006
@@ -26,13 +26,7 @@
     thanks Justin Pryzby.  Closes: #343424.
   * [arm] Enable nfs and nfsd modules.
 
-  [ maximilian attems ]
-  * Add an versioned dep on initramfs-tools >= 0.53. It knows about latest klibc
-    and has the new kernel-package wrapper mkinitramfs-kpkg.
-  * Switch arm, armeb default to initramfs-tools as all other archs with klibc.
-  * image-initramfs-generators is mkinitramfs-kpkg for initramfs-tools.
-
- -- maximilian attems <maks at sternwelten.at>  Wed,  8 Mar 2006 09:48:26 +0100
+ -- Bastian Blank <waldi at debian.org>  Mon, 06 Mar 2006 10:40:01 +0100
 
 linux-2.6 (2.6.15+2.6.16-rc4-0experimental.1) experimental; urgency=low