* debian/changelog: Update.

* debian/templates/control.image.in: Remove pre-sarge conflict with hotplug.

svn path=/dists/trunk/linux-2.6/; revision=5332
This commit is contained in:
Bastian Blank 2006-01-06 23:42:10 +00:00
parent b37871ac10
commit 17c0dfc386
2 changed files with 4 additions and 2 deletions

5
debian/changelog vendored
View File

@ -19,7 +19,10 @@ linux-2.6 (2.6.15-2) UNRELEASED; urgency=low
[ Norbert Tretkowski ]
* Backport the generic irq framework for alpha. (closes: #339080)
-- Norbert Tretkowski <nobse@debian.org> Fri, 6 Jan 2006 23:25:46 +0100
[ Bastian Blank ]
* Remove pre-sarge conflict with hotplug.
-- Bastian Blank <waldi@debian.org> Sat, 7 Jan 2006 00:40:30 +0000
linux-2.6 (2.6.15-1) unstable; urgency=low

View File

@ -3,7 +3,6 @@ Section: base
Priority: optional
Provides: linux-image, linux-image-@major@
Depends: initramfs-tools | yaird | linux-initramfs-tool, module-init-tools (>= 0.9.13)
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