diff --git a/debian/changelog b/debian/changelog index 21ab9e8d4..ead85b04e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,7 @@ linux-2.6 (2.6.24-1~experimental.1) UNRELEASED; urgency=low * [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 Wed, 23 Jan 2008 11:35:31 +0100 diff --git a/debian/config/amd64/defines b/debian/config/amd64/defines index efa20f6b1..f7bc0d831 100644 --- a/debian/config/amd64/defines +++ b/debian/config/amd64/defines @@ -11,9 +11,7 @@ kernel-arch: x86 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 diff --git a/debian/config/amd64/xen-vserver/defines b/debian/config/amd64/xen-vserver/defines index 44d88d09f..8cdb23998 100644 --- a/debian/config/amd64/xen-vserver/defines +++ b/debian/config/amd64/xen-vserver/defines @@ -5,7 +5,7 @@ flavours: [image] configs: amd64/xen/config initramfs-generators: initramfs-tools -suggests: grub (>= 0.97-16) +suggests: grub type: plain-xen [xen] diff --git a/debian/config/amd64/xen/defines b/debian/config/amd64/xen/defines index c741703f8..fa71b589f 100644 --- a/debian/config/amd64/xen/defines +++ b/debian/config/amd64/xen/defines @@ -4,7 +4,7 @@ flavours: [image] initramfs-generators: initramfs-tools -suggests: grub (>= 0.97-16) +suggests: grub type: plain-xen [xen] diff --git a/debian/config/i386/defines b/debian/config/i386/defines index 0089fbdce..9a9de070a 100644 --- a/debian/config/i386/defines +++ b/debian/config/i386/defines @@ -11,8 +11,7 @@ flavours: 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 diff --git a/debian/config/i386/xen-vserver/defines b/debian/config/i386/xen-vserver/defines index 3069de3c8..7fcb2ad89 100644 --- a/debian/config/i386/xen-vserver/defines +++ b/debian/config/i386/xen-vserver/defines @@ -6,7 +6,7 @@ flavours: configs: i386/xen/config initramfs-generators: initramfs-tools recommends: libc6-xen -suggests: grub (>= 0.97-16) +suggests: grub type: plain-xen [xen] diff --git a/debian/config/i386/xen/defines b/debian/config/i386/xen/defines index 6ba58a580..e5f0e1a31 100644 --- a/debian/config/i386/xen/defines +++ b/debian/config/i386/xen/defines @@ -5,7 +5,7 @@ flavours: [image] initramfs-generators: initramfs-tools recommends: libc6-xen -suggests: grub (>= 0.97-16) +suggests: grub type: plain-xen [xen] diff --git a/debian/config/powerpc/defines b/debian/config/powerpc/defines index 81fd265ab..6df6b8b72 100644 --- a/debian/config/powerpc/defines +++ b/debian/config/powerpc/defines @@ -13,7 +13,7 @@ kernel-header-dirs: powerpc kernel-arch: powerpc [image] -suggests: mkvmlinuz (>= 24) +suggests: mkvmlinuz [apus_base] kernel-arch: ppc diff --git a/debian/templates/control.image.type-kernel-package.in b/debian/templates/control.image.type-kernel-package.in index a5314f957..31e8cb53d 100644 --- a/debian/templates/control.image.type-kernel-package.in +++ b/debian/templates/control.image.type-kernel-package.in @@ -3,7 +3,7 @@ Section: admin Priority: optional Provides: linux-image, linux-image-@major@, linux-modules-@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-@version@ Description: Linux @upstreamversion@ image on @class@ This package provides the binary image and pre-built loadable modules for diff --git a/debian/templates/control.image.type-modulesextra.in b/debian/templates/control.image.type-modulesextra.in index a6e726b83..dd53b94be 100644 --- a/debian/templates/control.image.type-modulesextra.in +++ b/debian/templates/control.image.type-modulesextra.in @@ -13,7 +13,7 @@ Description: Linux @upstreamversion@ image on @class@ Package: linux-modules-@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. diff --git a/debian/templates/control.image.type-modulesinline.in b/debian/templates/control.image.type-modulesinline.in index baef285ab..6572235d8 100644 --- a/debian/templates/control.image.type-modulesinline.in +++ b/debian/templates/control.image.type-modulesinline.in @@ -2,7 +2,7 @@ Package: linux-image-@upstreamversion@@abiname@@localversion@ Section: admin Priority: optional Provides: linux-image, linux-image-@major@, linux-modules-@upstreamversion@@abiname@@localversion@ -Depends: module-init-tools (>= 0.9.13) +Depends: module-init-tools Suggests: linux-doc-@version@ Description: Linux @upstreamversion@ image on @class@ This package provides the binary image and pre-built loadable modules for diff --git a/debian/templates/control.image.type-plain.in b/debian/templates/control.image.type-plain.in index 082ae753e..31e8cb53d 100644 --- a/debian/templates/control.image.type-plain.in +++ b/debian/templates/control.image.type-plain.in @@ -3,7 +3,7 @@ Section: admin Priority: optional Provides: linux-image, linux-image-@major@, linux-modules-@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-@version@ Description: Linux @upstreamversion@ image on @class@ This package provides the binary image and pre-built loadable modules for