[kernel] r5022 - in dists: sid/linux-2.6/debian sid/linux-2.6/debian/arch/alpha trunk/linux-2.6/debian trunk/linux-2.6/debian/arch/alpha

[Norbert Tretkowski]

Author: nobse
Date: Fri Dec 16 21:12:45 2005
New Revision: 5022

Modified:
   dists/sid/linux-2.6/debian/arch/alpha/defines
   dists/sid/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/arch/alpha/defines
   dists/trunk/linux-2.6/debian/changelog
Log:
Removed conflict with initramfs-tools on alpha.


Modified: dists/sid/linux-2.6/debian/arch/alpha/defines
==============================================================================
--- dists/sid/linux-2.6/debian/arch/alpha/defines	(original)
+++ dists/sid/linux-2.6/debian/arch/alpha/defines	Fri Dec 16 21:12:45 2005
@@ -1,7 +1,6 @@
 [base]
 flavours: alpha-generic alpha-smp
 suggests: aboot, fdutils
-conflicts: initramfs-tools
 
 kernel-arch: alpha
 kernel-header-dirs: alpha

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Fri Dec 16 21:12:45 2005
@@ -1,4 +1,4 @@
-linux-2.6 (2.6.14-6) unstable; urgency=low
+linux-2.6 (2.6.14-6) UNRELEASED; urgency=low
 
   [ maximilian attems ]
   * Drop modular-ide.patch, nacked by ide upstream.  Prevents udev to load
@@ -29,7 +29,11 @@
     - NETLINK: Fix processing of fib_lookup netlink messages
     - ACPI: fix HP nx8220 boot hang regression
 
- -- maximilian attems <maks at sternwelten.at>  Thu, 15 Dec 2005 19:35:47 +0100
+  [ Norbert Tretkowski ]
+    * [alpha] Removed conflict with initramfs-tools, thanks vorlon for finding
+      the klibc bug!
+
+ -- Norbert Tretkowski <nobse at debian.org>  Fri, 16 Dec 2005 22:10:28 +0100
 
 linux-2.6 (2.6.14-5) unstable; urgency=low
 

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	Fri Dec 16 21:12:45 2005
@@ -1,7 +1,6 @@
 [base]
 flavours: alpha-generic alpha-smp
 suggests: aboot, fdutils
-conflicts: initramfs-tools
 
 kernel-arch: alpha
 kernel-header-dirs: alpha

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Fri Dec 16 21:12:45 2005
@@ -7,7 +7,11 @@
   * Drop modular-ide.patch, nacked by ide upstream.  Prevents udev to load
     ide-generic and those successfull boots with initramfs-tools.
 
- -- maximilian attems <max at sputnik.stro.at>  Mon, 12 Dec 2005 13:00:49 +0100
+  [ Norbert Tretkowski ]
+  * [alpha] Removed conflict with initramfs-tools, thanks vorlon for finding
+    the klibc bug!
+
+ -- Norbert Tretkowski <nobse at debian.org>  Fri, 16 Dec 2005 22:09:40 +0100
 
 linux-2.6 (2.6.14+2.6.15-rc5-0experimental.1) experimental; urgency=low