* debian/templates/control.image.in: Remove conflicts against the initrd tools.

* debian/templates/control.source.in: Build-Depend against new kernel-package.

svn path=/dists/trunk/linux-2.6/; revision=4618
This commit is contained in:
Bastian Blank 2005-10-23 17:16:13 +00:00
parent 8d0068bdc9
commit 8ae421c519
2 changed files with 2 additions and 2 deletions

View File

@ -3,7 +3,7 @@ Section: base
Priority: optional
Provides: linux-image, linux-image-@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-@version@ | linux-source-@version@
Description: Linux kernel @version@ image on @class@ machines
This package provides the binary image and pre-built loadable modules for

View File

@ -4,5 +4,5 @@ Priority: optional
Maintainer: Debian Kernel Team <debian-kernel@lists.debian.org>
Uploaders: Andres Salomon <dilinger@debian.org>, Bastian Blank <waldi@debian.org>, Simon Horman <horms@debian.org>, Sven Luther <luther@debian.org>, Jonas Smedegaard <dr@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)