[kernel] r5332 - in dists/trunk/linux-2.6/debian: . templates

[Bastian Blank]

Author: waldi
Date: Fri Jan  6 23:42:10 2006
New Revision: 5332

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/templates/control.image.in
Log:
* debian/changelog: Update.
* debian/templates/control.image.in: Remove pre-sarge conflict with hotplug.


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

Modified: dists/trunk/linux-2.6/debian/templates/control.image.in
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/control.image.in	(original)
+++ dists/trunk/linux-2.6/debian/templates/control.image.in	Fri Jan  6 23:42:10 2006
@@ -3,7 +3,6 @@
 Priority: optional
 Provides: linux-image, linux-image- at major@
 Depends: initramfs-tools | yaird | linux-initramfs-tool, module-init-tools (>= 0.9.13)
-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