r4618 - dists/trunk/linux-2.6/debian/templates

[Bastian Blank]

Author: waldi
Date: 2005-10-23 17:16:13 +0000 (Sun, 23 Oct 2005)
New Revision: 4618

Modified:
   dists/trunk/linux-2.6/debian/templates/control.image.in
   dists/trunk/linux-2.6/debian/templates/control.source.in
Log:
* debian/templates/control.image.in: Remove conflicts against the initrd tools.
* debian/templates/control.source.in: Build-Depend against new kernel-package.


Modified: dists/trunk/linux-2.6/debian/templates/control.image.in
===================================================================
--- dists/trunk/linux-2.6/debian/templates/control.image.in	2005-10-23 17:13:42 UTC (rev 4617)
+++ dists/trunk/linux-2.6/debian/templates/control.image.in	2005-10-23 17:16:13 UTC (rev 4618)
@@ -3,7 +3,7 @@
 Priority: optional
 Provides: linux-image, linux-image- at major@
 Depends: yaird | initramfs-tools | linux-ramdisk-tool, module-init-tools (>= 0.9.13)
-Conflicts: hotplug (<< 0.0.20040105-1), initramfs-tools (<< 0.32), yaird (<< 0.0.11-5), initrd-tools (<< 0.1.83)
+Conflicts: hotplug (<< 0.0.20040105-1)
 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/debian/templates/control.source.in
===================================================================
--- dists/trunk/linux-2.6/debian/templates/control.source.in	2005-10-23 17:13:42 UTC (rev 4617)
+++ dists/trunk/linux-2.6/debian/templates/control.source.in	2005-10-23 17:16:13 UTC (rev 4618)
@@ -4,5 +4,5 @@
 Maintainer: Debian Kernel Team <debian-kernel at lists.debian.org>
 Uploaders: Andres Salomon <dilinger at debian.org>, Bastian Blank <waldi at debian.org>, Simon Horman <horms at debian.org>, Sven Luther <luther at debian.org>, Jonas Smedegaard <dr at jones.dk>
 Standards-Version: 3.6.1.0
-Build-Depends: gcc (>= 4:4.0) [!arm !sparc !alpha !m68k], gcc-3.3 [arm sparc alpha m68k], binutils-hppa64 [hppa], gcc-4.0-hppa64 [hppa], debhelper (>= 4.1.0), module-init-tools, dpkg-dev (>= 1.10.23), debianutils (>= 1.6), bzip2, sparc-utils [sparc], kernel-package (>= 9.008.1)
+Build-Depends: gcc (>= 4:4.0) [!arm !sparc !alpha !m68k], gcc-3.3 [arm sparc alpha m68k], binutils-hppa64 [hppa], gcc-4.0-hppa64 [hppa], debhelper (>= 4.1.0), module-init-tools, dpkg-dev (>= 1.10.23), debianutils (>= 1.6), bzip2, sparc-utils [sparc], kernel-package (>= 9.008.2)
 Build-Depends-Indep: docbook-utils, gs, transfig, xmlto, dh-kpatches (>= 0.99.3)