[kernel] r4780 - in dists/trunk/linux-2.6/debian: arch/alpha templates

[Sven Luther]

Author: luther
Date: Thu Nov 10 08:09:14 2005
New Revision: 4780

Modified:
   dists/trunk/linux-2.6/debian/arch/alpha/defines
   dists/trunk/linux-2.6/debian/templates/control.image.in
Log:
Fixed alpha initramfs-tools exclusion using a conflict.


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	Thu Nov 10 08:09:14 2005
@@ -1,7 +1,7 @@
 [base]
 flavours: alpha-generic alpha-smp
 suggests: aboot, fdutils
-excludes: initramfs-tools
+conflicts: initramfs-tools
 
 kernel-arch: alpha
 kernel-header-dirs: alpha

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	Thu Nov 10 08:09:14 2005
@@ -2,8 +2,8 @@
 Section: base
 Priority: optional
 Provides: linux-image, linux-image- at major@
-Depends: yaird | initramfs-tools [!alpha] | linux-initramfs-tool, module-init-tools (>= 0.9.13)
-Conflicts: hotplug (<< 0.0.20040105-1), initramfs-tools [alpha]
+Depends: yaird | initramfs-tools | linux-initramfs-tool, module-init-tools (>= 0.9.13)
+Conflicts: hotplug (<< 0.0.20040105-1), initramfs-tools
 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