From 17c0dfc386670409932d1e3e560478df3698780e Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Fri, 6 Jan 2006 23:42:10 +0000 Subject: [PATCH] * debian/changelog: Update. * debian/templates/control.image.in: Remove pre-sarge conflict with hotplug. svn path=/dists/trunk/linux-2.6/; revision=5332 --- debian/changelog | 5 ++++- debian/templates/control.image.in | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5b300458a..addb674e7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 Fri, 6 Jan 2006 23:25:46 +0100 + [ Bastian Blank ] + * Remove pre-sarge conflict with hotplug. + + -- Bastian Blank Sat, 7 Jan 2006 00:40:30 +0000 linux-2.6 (2.6.15-1) unstable; urgency=low diff --git a/debian/templates/control.image.in b/debian/templates/control.image.in index d6d811c12..154fc8a95 100644 --- a/debian/templates/control.image.in +++ b/debian/templates/control.image.in @@ -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