[kernel] r9501 - in dists/sid/linux-2.6/debian: . arch/alpha templates

[Steve Langasek]

Author: vorlon
Date: Wed Sep 12 09:08:11 2007
New Revision: 9501

Log:
Pull in fixes from 2.6.18.dfsg.1-13 that were dropped from unstable in 2.6.20
due to improper merge from trunk



Modified:
   dists/sid/linux-2.6/debian/arch/alpha/config
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/templates/control.image.type-kernel-package.in

Modified: dists/sid/linux-2.6/debian/arch/alpha/config
==============================================================================
--- dists/sid/linux-2.6/debian/arch/alpha/config	(original)
+++ dists/sid/linux-2.6/debian/arch/alpha/config	Wed Sep 12 09:08:11 2007
@@ -1382,5 +1382,5 @@
 CONFIG_ISTALLION=m
 CONFIG_I2C_ELEKTOR=m
 CONFIG_BACKLIGHT_CLASS_DEVICE=m
-CONFIG_MATHEMU=m
+CONFIG_MATHEMU=y
 # CONFIG_AUDIT is not set

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Wed Sep 12 09:08:11 2007
@@ -31,6 +31,13 @@
   * [mips] Add a fix so qemu NE2000 will work again.
   * [mipsel/r5k-cobalt] Enable MTD.
 
+  [ Steve Langasek ]
+  * Set CONFIG_MATHEMU=y on alpha, which is required for proper fp math on
+    at least ev4-ev56 systems.  Closes: #411813.
+  * linux-image packages need to depend on a newer version of coreutils,
+    because of the use of readlink -q -m inherited from kernel-package.
+    Closes: #413311.
+
   [ Bastian Blank ]
   * Fix tainted check in bug scripts.
 

Modified: dists/sid/linux-2.6/debian/templates/control.image.type-kernel-package.in
==============================================================================
--- dists/sid/linux-2.6/debian/templates/control.image.type-kernel-package.in	(original)
+++ dists/sid/linux-2.6/debian/templates/control.image.type-kernel-package.in	Wed Sep 12 09:08:11 2007
@@ -3,7 +3,7 @@
 Priority: optional
 Provides: linux-image, linux-image- at major@, linux-modules- at upstreamversion@@abiname@@localversion@
 Pre-Depends: debconf (>= 0.2.17) | debconf-2.0
-Depends: module-init-tools (>= 0.9.13), coreutils (>= 5.2.1)
+Depends: module-init-tools (>= 0.9.13), coreutils (>= 5.96)
 Suggests: linux-doc- at version@
 Description: Linux @upstreamversion@ image on @class@
  This package provides the binary image and pre-built loadable modules for