[kernel] r10194 - in dists/trunk/linux-2.6/debian: . config/amd64 config/amd64/xen config/amd64/xen-vserver config/i386 config/i386/xen config/i386/xen-vserver config/powerpc templates

[Bastian Blank]

Author: waldi
Date: Fri Jan 25 10:30:49 2008
New Revision: 10194

Log:
Remove versions from relations fullfilled in stable.

* debian/changelog: Update.
* debian/config/amd64/defines
  - Remove grub conflict.
  - Remove e2fsprogs depends.
  - Remove versions from suggests.
* debian/config/amd64/xen/defines,
  debian/config/amd64/xen-vserver/defines,
  debian/config/i386/xen/defines,
  debian/config/i386/xen-vserver/defines,
  debian/config/powerpc/defines: Remove versions from suggests.
* debian/config/i386/defines
  - Remove grub conflict.
  - Remove versions from suggests.
* debian/templates/control.image.type-kernel-package.in,
  debian/templates/control.image.type-modulesextra.in,
  debian/templates/control.image.type-modulesinline.in,
  debian/templates/control.image.type-plain.in:
  Remove versions from depends.


Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/amd64/defines
   dists/trunk/linux-2.6/debian/config/amd64/xen-vserver/defines
   dists/trunk/linux-2.6/debian/config/amd64/xen/defines
   dists/trunk/linux-2.6/debian/config/i386/defines
   dists/trunk/linux-2.6/debian/config/i386/xen-vserver/defines
   dists/trunk/linux-2.6/debian/config/i386/xen/defines
   dists/trunk/linux-2.6/debian/config/powerpc/defines
   dists/trunk/linux-2.6/debian/templates/control.image.type-kernel-package.in
   dists/trunk/linux-2.6/debian/templates/control.image.type-modulesextra.in
   dists/trunk/linux-2.6/debian/templates/control.image.type-modulesinline.in
   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	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Fri Jan 25 10:30:49 2008
@@ -18,6 +18,7 @@
   * [powerpc/powerpc]: Enable Efika support.
   * [powerpc]: Lower mkvmlinuz to the state of a bootloader.
   * [powerpc]: Remove ppc and m68k include dirs from headers.
+  * Remove versions from relations fullfilled in stable.
 
  -- maximilian attems <maks at debian.org>  Wed, 23 Jan 2008 11:35:31 +0100
 

Modified: dists/trunk/linux-2.6/debian/config/amd64/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/amd64/defines	(original)
+++ dists/trunk/linux-2.6/debian/config/amd64/defines	Fri Jan 25 10:30:49 2008
@@ -11,9 +11,7 @@
 enabled: false
 
 [image]
-conflicts: grub (<= 0.95+cvs20040624-17)
-depends: e2fsprogs (>= 1.35-7)
-suggests: grub (>= 0.97-3) | lilo (>= 19.1)
+suggests: grub | lilo
 
 [amd64_base]
 class: AMD64

Modified: dists/trunk/linux-2.6/debian/config/amd64/xen-vserver/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/amd64/xen-vserver/defines	(original)
+++ dists/trunk/linux-2.6/debian/config/amd64/xen-vserver/defines	Fri Jan 25 10:30:49 2008
@@ -5,7 +5,7 @@
 [image]
 configs: amd64/xen/config
 initramfs-generators: initramfs-tools 
-suggests: grub (>= 0.97-16)
+suggests: grub
 type: plain-xen
 
 [xen]

Modified: dists/trunk/linux-2.6/debian/config/amd64/xen/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/amd64/xen/defines	(original)
+++ dists/trunk/linux-2.6/debian/config/amd64/xen/defines	Fri Jan 25 10:30:49 2008
@@ -4,7 +4,7 @@
 
 [image]
 initramfs-generators: initramfs-tools 
-suggests: grub (>= 0.97-16)
+suggests: grub
 type: plain-xen
 
 [xen]

Modified: dists/trunk/linux-2.6/debian/config/i386/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/i386/defines	(original)
+++ dists/trunk/linux-2.6/debian/config/i386/defines	Fri Jan 25 10:30:49 2008
@@ -11,8 +11,7 @@
 kernel-arch: x86
 
 [image]
-conflicts: grub (<= 0.95+cvs20040624-17)
-suggests: grub (>= 0.97-3) | lilo (>= 19.1)
+suggests: grub | lilo
 
 [486_base]
 class: x86

Modified: dists/trunk/linux-2.6/debian/config/i386/xen-vserver/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/i386/xen-vserver/defines	(original)
+++ dists/trunk/linux-2.6/debian/config/i386/xen-vserver/defines	Fri Jan 25 10:30:49 2008
@@ -6,7 +6,7 @@
 configs: i386/xen/config
 initramfs-generators: initramfs-tools
 recommends: libc6-xen
-suggests: grub (>= 0.97-16)
+suggests: grub
 type: plain-xen
 
 [xen]

Modified: dists/trunk/linux-2.6/debian/config/i386/xen/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/i386/xen/defines	(original)
+++ dists/trunk/linux-2.6/debian/config/i386/xen/defines	Fri Jan 25 10:30:49 2008
@@ -5,7 +5,7 @@
 [image]
 initramfs-generators: initramfs-tools
 recommends: libc6-xen
-suggests: grub (>= 0.97-16)
+suggests: grub
 type: plain-xen
 
 [xen]

Modified: dists/trunk/linux-2.6/debian/config/powerpc/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/powerpc/defines	(original)
+++ dists/trunk/linux-2.6/debian/config/powerpc/defines	Fri Jan 25 10:30:49 2008
@@ -13,7 +13,7 @@
 kernel-arch: powerpc
 
 [image]
-suggests: mkvmlinuz (>= 24)
+suggests: mkvmlinuz
 
 [apus_base]
 kernel-arch: ppc

Modified: dists/trunk/linux-2.6/debian/templates/control.image.type-kernel-package.in
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/control.image.type-kernel-package.in	(original)
+++ dists/trunk/linux-2.6/debian/templates/control.image.type-kernel-package.in	Fri Jan 25 10:30:49 2008
@@ -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.96)
+Depends: module-init-tools
 Suggests: linux-doc- at version@
 Description: Linux @upstreamversion@ image on @class@
  This package provides the binary image and pre-built loadable modules for

Modified: dists/trunk/linux-2.6/debian/templates/control.image.type-modulesextra.in
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/control.image.type-modulesextra.in	(original)
+++ dists/trunk/linux-2.6/debian/templates/control.image.type-modulesextra.in	Fri Jan 25 10:30:49 2008
@@ -13,7 +13,7 @@
 Package: linux-modules- at upstreamversion@@abiname@@localversion@
 Section: admin
 Priority: optional
-Depends: module-init-tools (>= 0.9.13)
+Depends: module-init-tools
 Description: Linux @upstreamversion@ modules on @class@
  This package provides pre-built loadable modules for
  Linux kernel @version@ on @longclass@ machines.

Modified: dists/trunk/linux-2.6/debian/templates/control.image.type-modulesinline.in
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/control.image.type-modulesinline.in	(original)
+++ dists/trunk/linux-2.6/debian/templates/control.image.type-modulesinline.in	Fri Jan 25 10:30:49 2008
@@ -2,7 +2,7 @@
 Section: admin
 Priority: optional
 Provides: linux-image, linux-image- at major@, linux-modules- at upstreamversion@@abiname@@localversion@
-Depends: module-init-tools (>= 0.9.13)
+Depends: module-init-tools
 Suggests: linux-doc- at version@
 Description: Linux @upstreamversion@ image on @class@
  This package provides the binary image and pre-built loadable modules for

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	(original)
+++ dists/trunk/linux-2.6/debian/templates/control.image.type-plain.in	Fri Jan 25 10:30:49 2008
@@ -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)
+Depends: module-init-tools
 Suggests: linux-doc- at version@
 Description: Linux @upstreamversion@ image on @class@
  This package provides the binary image and pre-built loadable modules for