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

[Ben Hutchings]

Author: benh
Date: Sat Feb 11 20:23:34 2012
New Revision: 18685

Log:
Change linux-image dependencies to allow kmod as an alternative to module-init-tools

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/templates/control.image.type-plain.in

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Sat Feb 11 20:18:48 2012	(r18684)
+++ dists/trunk/linux-2.6/debian/changelog	Sat Feb 11 20:23:34 2012	(r18685)
@@ -10,6 +10,10 @@
   [ Arnaud Patard ]
   * Merge ixp4xx oops fix when probing mtd.
 
+  [ Ben Hutchings ]
+  * Change linux-image dependencies to allow kmod as an alternative to
+    module-init-tools
+
  -- Bastian Blank <waldi at debian.org>  Mon, 06 Feb 2012 11:22:07 +0100
 
 linux-2.6 (3.2.4-1) unstable; urgency=low

Modified: dists/trunk/linux-2.6/debian/templates/control.image.type-plain.in
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/control.image.type-plain.in	Sat Feb 11 20:18:48 2012	(r18684)
+++ dists/trunk/linux-2.6/debian/templates/control.image.type-plain.in	Sat Feb 11 20:23:34 2012	(r18685)
@@ -1,7 +1,7 @@
 Package: linux-image- at abiname@@localversion@
 Provides: linux-image, linux-modules- at abiname@@localversion@
 Pre-Depends: debconf | debconf-2.0
-Depends: module-init-tools, linux-base (>= 3~), ${shlibs:Depends}, ${misc:Depends}
+Depends: kmod | module-init-tools, linux-base (>= 3~), ${shlibs:Depends}, ${misc:Depends}
 Recommends: firmware-linux-free (>= 3~)
 Suggests: linux-doc- at version@
 Description: Linux @upstreamversion@ for @class@