[kernel] r16205 - in dists/sid/linux-2.6/debian: config config/amd64 config/i386 config/ia64 config/s390 templates

[Bastian Blank]

Author: waldi
Date: Sun Aug 29 12:48:21 2010
New Revision: 16205

Log:
* debian/config/defines: Define proper relations for bootloaders.
* debian/config/amd64/defines, debian/config/i386/defines,
  debian/config/ia64/defines, debian/config/s390/defines: Define list of bootloaders.
* debian/templates/control.image.type-plain.in: Remove manual bootloader list.

Modified:
   dists/sid/linux-2.6/debian/config/amd64/defines
   dists/sid/linux-2.6/debian/config/defines
   dists/sid/linux-2.6/debian/config/i386/defines
   dists/sid/linux-2.6/debian/config/ia64/defines
   dists/sid/linux-2.6/debian/config/s390/defines
   dists/sid/linux-2.6/debian/templates/control.image.type-plain.in

Modified: dists/sid/linux-2.6/debian/config/amd64/defines
==============================================================================
--- dists/sid/linux-2.6/debian/config/amd64/defines	Sun Aug 29 12:45:46 2010	(r16204)
+++ dists/sid/linux-2.6/debian/config/amd64/defines	Sun Aug 29 12:48:21 2010	(r16205)
@@ -8,9 +8,9 @@
 kernel-arch: x86
 
 [image]
+bootloaders: grub lilo
 configs:
  kernelarch-x86/config
-suggests: grub | lilo
 
 [image-dbg]
 enabled: true

Modified: dists/sid/linux-2.6/debian/config/defines
==============================================================================
--- dists/sid/linux-2.6/debian/config/defines	Sun Aug 29 12:45:46 2010	(r16204)
+++ dists/sid/linux-2.6/debian/config/defines	Sun Aug 29 12:48:21 2010	(r16205)
@@ -74,9 +74,19 @@
 initramfs-tools: update-initramfs
 
 [relations]
+# compilers
 gcc-4.3: gcc-4.3
+
+# initramfs-generators
 initramfs-fallback: linux-initramfs-tool
 initramfs-tools: initramfs-tools (>= 0.55)
+
+# bootloaders
+elilo: elilo (>= 3.12-3.1~)
+lilo: lilo (>= 22.8-8.2~)
+s390-tools: s390-tools (>= 1.8.3-2~)
+
+# misc
 util-vserver: util-vserver (>= 0.30.215)
 
 [backports]

Modified: dists/sid/linux-2.6/debian/config/i386/defines
==============================================================================
--- dists/sid/linux-2.6/debian/config/i386/defines	Sun Aug 29 12:45:46 2010	(r16204)
+++ dists/sid/linux-2.6/debian/config/i386/defines	Sun Aug 29 12:48:21 2010	(r16205)
@@ -11,9 +11,9 @@
 kernel-arch: x86
 
 [image]
+bootloaders: grub lilo
 configs:
  kernelarch-x86/config
-suggests: grub | lilo
 
 [486_description]
 hardware: old PCs

Modified: dists/sid/linux-2.6/debian/config/ia64/defines
==============================================================================
--- dists/sid/linux-2.6/debian/config/ia64/defines	Sun Aug 29 12:45:46 2010	(r16204)
+++ dists/sid/linux-2.6/debian/config/ia64/defines	Sun Aug 29 12:48:21 2010	(r16205)
@@ -7,7 +7,8 @@
 kernel-arch: ia64
 
 [image]
-suggests: elilo, fdutils
+bootloaders: elilo
+suggests: fdutils
 
 [itanium_description]
 hardware: Itanium

Modified: dists/sid/linux-2.6/debian/config/s390/defines
==============================================================================
--- dists/sid/linux-2.6/debian/config/s390/defines	Sun Aug 29 12:45:46 2010	(r16204)
+++ dists/sid/linux-2.6/debian/config/s390/defines	Sun Aug 29 12:48:21 2010	(r16205)
@@ -12,7 +12,7 @@
 part-short-tape: IPL from tape
 
 [image]
-suggests: s390-tools
+bootloaders: s390-tools
 
 [s390_description]
 hardware: IBM S/390

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	Sun Aug 29 12:45:46 2010	(r16204)
+++ dists/sid/linux-2.6/debian/templates/control.image.type-plain.in	Sun Aug 29 12:48:21 2010	(r16205)
@@ -2,7 +2,6 @@
 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@