r4474 - in dists/trunk: linux-2.6/debian/templates linux-2.6-2.6.14-rc4/debian/templates

[Sven Luther]

Author: luther
Date: 2005-10-16 09:58:51 +0000 (Sun, 16 Oct 2005)
New Revision: 4474

Modified:
   dists/trunk/linux-2.6-2.6.14-rc4/debian/templates/control.image.in
   dists/trunk/linux-2.6/debian/templates/control.image.in
Log:
Added conflict for non-fixed versions of the ramdisk generating tools.


Modified: dists/trunk/linux-2.6/debian/templates/control.image.in
===================================================================
--- dists/trunk/linux-2.6/debian/templates/control.image.in	2005-10-16 09:51:26 UTC (rev 4473)
+++ dists/trunk/linux-2.6/debian/templates/control.image.in	2005-10-16 09:58:51 UTC (rev 4474)
@@ -3,7 +3,7 @@
 Priority: optional
 Provides: linux-image, linux-image- at major@
 Depends: initramfs-tools | yaird | linux-ramdisk-tool, module-init-tools (>= 0.9.13)
-Conflicts: hotplug (<< 0.0.20040105-1)
+Conflicts: hotplug (<< 0.0.20040105-1), initramfs-tools (<< 0.31), yaird (<< 0.0.11-5), initrd-tools (<< 0.1.83)
 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

Modified: dists/trunk/linux-2.6-2.6.14-rc4/debian/templates/control.image.in
===================================================================
--- dists/trunk/linux-2.6-2.6.14-rc4/debian/templates/control.image.in	2005-10-16 09:51:26 UTC (rev 4473)
+++ dists/trunk/linux-2.6-2.6.14-rc4/debian/templates/control.image.in	2005-10-16 09:58:51 UTC (rev 4474)
@@ -3,7 +3,7 @@
 Priority: optional
 Provides: linux-image, linux-image- at major@
 Depends: initramfs-tools | yaird | linux-ramdisk-tool, module-init-tools (>= 0.9.13)
-Conflicts: hotplug (<< 0.0.20040105-1)
+Conflicts: hotplug (<< 0.0.20040105-1), initramfs-tools (<< 0.31), yaird (<< 0.0.11-5), initrd-tools (<< 0.1.83)
 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