r4728 - in dists/sid/linux-2.6/debian: . templates

[Norbert Tretkowski]

Author: nobse
Date: 2005-11-04 09:46:21 +0000 (Fri, 04 Nov 2005)
New Revision: 4728

Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/templates/control.image.in
Log:
Conflict with initramfs-tools on alpha until the klibc problem is fixed.


Modified: dists/sid/linux-2.6/debian/changelog
===================================================================
--- dists/sid/linux-2.6/debian/changelog	2005-11-04 04:24:17 UTC (rev 4727)
+++ dists/sid/linux-2.6/debian/changelog	2005-11-04 09:46:21 UTC (rev 4728)
@@ -2,6 +2,7 @@
 
   [ Norbert Tretkowski ]
   * [alpha] Switch to gcc 4.0.
+  * [alpha] Conflict with initramfs-tools, klibc is broken on alpha.
 
   [ Sven Luther ]
   * Set default TCP congestion algorithm to NewReno + BIC (Closes: #337089)
@@ -26,7 +27,7 @@
   * net-ipconntrack-nat-fix.patch - fix compilation of
     ip_conntrack_helper_pptp.c when NAT is disabled. (Closes: #336431)
 
- -- dann frazier <dannf at debian.org>  Thu,  3 Nov 2005 21:20:29 -0700
+ -- Norbert Tretkowski <nobse at debian.org>  Fri,  4 Nov 2005 10:45:06 +0100
 
 linux-2.6 (2.6.14-2) unstable; urgency=low
 

Modified: dists/sid/linux-2.6/debian/templates/control.image.in
===================================================================
--- dists/sid/linux-2.6/debian/templates/control.image.in	2005-11-04 04:24:17 UTC (rev 4727)
+++ dists/sid/linux-2.6/debian/templates/control.image.in	2005-11-04 09:46:21 UTC (rev 4728)
@@ -2,8 +2,8 @@
 Section: base
 Priority: optional
 Provides: linux-image, linux-image- at major@
-Depends: yaird | initramfs-tools | linux-initramfs-tool, module-init-tools (>= 0.9.13)
-Conflicts: hotplug (<< 0.0.20040105-1)
+Depends: yaird | initramfs-tools [!alpha] | linux-initramfs-tool, module-init-tools (>= 0.9.13)
+Conflicts: hotplug (<< 0.0.20040105-1), initramfs-tools [alpha]
 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