From 665d3a8871aa65ef329b96e8c95db9e7f8af404f Mon Sep 17 00:00:00 2001 From: Norbert Tretkowski Date: Fri, 16 Dec 2005 21:12:45 +0000 Subject: [PATCH] Removed conflict with initramfs-tools on alpha. svn path=/dists/trunk/linux-2.6/; revision=5022 --- debian/arch/alpha/defines | 1 - debian/changelog | 6 +++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/arch/alpha/defines b/debian/arch/alpha/defines index 343bd7e53..ac26d40df 100644 --- a/debian/arch/alpha/defines +++ b/debian/arch/alpha/defines @@ -1,7 +1,6 @@ [base] flavours: alpha-generic alpha-smp suggests: aboot, fdutils -conflicts: initramfs-tools kernel-arch: alpha kernel-header-dirs: alpha diff --git a/debian/changelog b/debian/changelog index e3112eb73..51ee767e5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,7 +7,11 @@ linux-2.6 (2.6.14+2.6.15-rc5-0experimental.2) UNRELEASED; urgency=low * Drop modular-ide.patch, nacked by ide upstream. Prevents udev to load ide-generic and those successfull boots with initramfs-tools. - -- maximilian attems 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 Fri, 16 Dec 2005 22:09:40 +0100 linux-2.6 (2.6.14+2.6.15-rc5-0experimental.1) experimental; urgency=low