[kernel] r16175 - in dists/sid/linux-2.6/debian: . templates

[Ben Hutchings]

Author: benh
Date: Tue Aug 24 04:49:35 2010
New Revision: 16175

Log:
Add 'breaks' relation from image packages  to boot loader packages that do not install required hooks (Closes: #593683)

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

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Mon Aug 23 00:11:55 2010	(r16174)
+++ dists/sid/linux-2.6/debian/changelog	Tue Aug 24 04:49:35 2010	(r16175)
@@ -12,6 +12,8 @@
   * Add stable 2.6.32.20:
     - Fix regressions introduced by original fix for CVE-2010-2240
   * Add drm and other relevant changes from stable 2.6.34.4
+  * Add 'breaks' relation from image packages to boot loader packages that
+    do not install required hooks (Closes: #593683)
 
   [ Bastian Blank ]
   * Update Xen patch.

Modified: dists/sid/linux-2.6/debian/templates/control.image.type-plain.in
==============================================================================
--- dists/sid/linux-2.6/debian/templates/control.image.type-plain.in	Mon Aug 23 00:11:55 2010	(r16174)
+++ dists/sid/linux-2.6/debian/templates/control.image.type-plain.in	Tue Aug 24 04:49:35 2010	(r16175)
@@ -2,6 +2,7 @@
 Provides: linux-image, linux-image- at major@, linux-modules- at upstreamversion@@abiname@@localversion@
 Pre-Depends: debconf | debconf-2.0
 Depends: module-init-tools, linux-base (>= ${source:Version}), ${shlibs:Depends}
+Breaks: lilo (<< 22.8-8.2~) [amd64, i386], elilo (<< 3.12-3.1~) [ia64], s390-tools (<< 1.8.3-2~) [s390]
 Recommends: firmware-linux-free (>= @source_upstream@)
 Suggests: linux-doc- at version@
 Description: Linux @upstreamversion@ for @class@