Artificially bump Replaces: grub-common versioning to account for

grub-reboot/grub-set-default movement in Ubuntu.
This commit is contained in:
Colin Watson 2011-05-16 17:40:37 +01:00
parent f603aa7978
commit 617663eaea
2 changed files with 12 additions and 10 deletions

2
debian/changelog vendored
View File

@ -51,6 +51,8 @@ grub2 (1.99-1) UNRELEASED; urgency=low
using the diverted grub-install.
- Add grub-mount-udeb, containing just grub-mount. This can be used by
os-prober and other parts of d-i.
- Artificially bump Replaces: grub-common versioning to account for
grub-reboot/grub-set-default movement in Ubuntu.
* Don't do a separate build pass for grub-common. It will be identical to
the build for the default platform for the CPU architecture anyway, so
reuse that.

20
debian/control vendored
View File

@ -105,7 +105,7 @@ Package: grub-pc-bin
Priority: optional
Architecture: any-i386 any-amd64
Depends: ${shlibs:Depends}, ${misc:Depends}, grub2-common (= ${binary:Version})
Replaces: grub2 (<< ${source:Version}), grub-common (<= 1.96+20080413-1), grub-pc (<< 1.99-1)
Replaces: grub2 (<< ${source:Version}), grub-common (<= 1.97~beta2-1), grub-pc (<< 1.99-1)
Suggests: desktop-base (>= 4.0.6)
Multi-Arch: foreign
Description: GRand Unified Bootloader, version 2 (PC/BIOS binaries)
@ -131,7 +131,7 @@ Package: grub-pc
Priority: optional
Architecture: any-i386 any-amd64
Depends: ${shlibs:Depends}, ${misc:Depends}, grub-pc-bin (= ${binary:Version}), ucf, freebsd-utils (>= 8.0-4) [kfreebsd-any]
Replaces: grub, grub-legacy, grub2 (<< ${source:Version}), grub-common (<= 1.96+20080413-1), grub-efi-amd64, grub-efi-ia32, grub-coreboot, grub-ieee1275
Replaces: grub, grub-legacy, grub2 (<< ${source:Version}), grub-common (<= 1.97~beta2-1), grub-efi-amd64, grub-efi-ia32, grub-coreboot, grub-ieee1275
Conflicts: grub (<< 0.97-54), grub-legacy, grub-efi-amd64, grub-efi-ia32, grub-coreboot, grub-ieee1275
Multi-Arch: foreign
Description: GRand Unified Bootloader, version 2 (PC/BIOS version)
@ -166,7 +166,7 @@ Description: GRUB bootable rescue images, version 2 (PC/BIOS version)
Package: grub-coreboot-bin
Architecture: any-i386 any-amd64
Depends: ${shlibs:Depends}, ${misc:Depends}, grub2-common (= ${binary:Version})
Replaces: grub2 (<< ${source:Version}), grub-common (<= 1.96+20080413-1), grub-linuxbios, grub-coreboot (<< 1.99-1)
Replaces: grub2 (<< ${source:Version}), grub-common (<= 1.97~beta2-1), grub-linuxbios, grub-coreboot (<< 1.99-1)
Conflicts: grub-linuxbios (<< ${source:Version})
Multi-Arch: foreign
Description: GRand Unified Bootloader, version 2 (Coreboot binaries)
@ -187,7 +187,7 @@ Description: GRand Unified Bootloader, version 2 (Coreboot binaries)
Package: grub-coreboot
Architecture: any-i386 any-amd64
Depends: ${shlibs:Depends}, ${misc:Depends}, grub-coreboot-bin (= ${binary:Version}), ucf
Replaces: grub-legacy, grub2 (<< ${source:Version}), grub-common (<= 1.96+20080413-1), grub-linuxbios, grub-efi-amd64, grub-efi-ia32, grub-pc, grub-ieee1275
Replaces: grub-legacy, grub2 (<< ${source:Version}), grub-common (<= 1.97~beta2-1), grub-linuxbios, grub-efi-amd64, grub-efi-ia32, grub-pc, grub-ieee1275
Conflicts: grub (<< 0.97-54), grub-legacy, grub-linuxbios (<< ${source:Version}), grub-efi-amd64, grub-efi-ia32, grub-pc, grub-ieee1275
Multi-Arch: foreign
Description: GRand Unified Bootloader, version 2 (Coreboot version)
@ -206,7 +206,7 @@ Description: GRand Unified Bootloader, version 2 (Coreboot version)
Package: grub-efi-ia32-bin
Architecture: any-i386 any-amd64
Depends: ${shlibs:Depends}, ${misc:Depends}, grub2-common (= ${binary:Version}), efibootmgr [i386 amd64]
Replaces: grub2 (<< ${source:Version}), grub-common (<= 1.96+20080413-1), grub-efi, grub-efi-ia32 (<< 1.99-1)
Replaces: grub2 (<< ${source:Version}), grub-common (<= 1.97~beta2-1), grub-efi, grub-efi-ia32 (<< 1.99-1)
Multi-Arch: foreign
Description: GRand Unified Bootloader, version 2 (EFI-IA32 binaries)
GRUB is a portable, powerful bootloader. This version of GRUB is based on a
@ -227,7 +227,7 @@ Description: GRand Unified Bootloader, version 2 (EFI-IA32 binaries)
Package: grub-efi-ia32
Architecture: any-i386 any-amd64
Depends: ${shlibs:Depends}, ${misc:Depends}, grub-efi-ia32-bin (= ${binary:Version}), ucf
Replaces: grub, grub-legacy, grub2 (<< ${source:Version}), grub-common (<= 1.96+20080413-1), grub-efi, grub-efi-amd64, grub-pc, grub-coreboot, grub-ieee1275
Replaces: grub, grub-legacy, grub2 (<< ${source:Version}), grub-common (<= 1.97~beta2-1), grub-efi, grub-efi-amd64, grub-pc, grub-coreboot, grub-ieee1275
Conflicts: grub (<< 0.97-54), grub-legacy, grub-efi-amd64, grub-pc, grub-coreboot, grub-ieee1275
Multi-Arch: foreign
Description: GRand Unified Bootloader, version 2 (EFI-IA32 version)
@ -247,7 +247,7 @@ Description: GRand Unified Bootloader, version 2 (EFI-IA32 version)
Package: grub-efi-amd64-bin
Architecture: i386 kopensolaris-i386 any-amd64
Depends: ${shlibs:Depends}, ${misc:Depends}, grub2-common (= ${binary:Version}), efibootmgr [i386 amd64]
Replaces: grub2 (<< ${source:Version}), grub-common (<= 1.96+20080413-1), grub-efi-amd64 (<< 1.99-1)
Replaces: grub2 (<< ${source:Version}), grub-common (<= 1.97~beta2-1), grub-efi-amd64 (<< 1.99-1)
Multi-Arch: foreign
Description: GRand Unified Bootloader, version 2 (EFI-AMD64 binaries)
GRUB is a portable, powerful bootloader. This version of GRUB is based on a
@ -268,7 +268,7 @@ Description: GRand Unified Bootloader, version 2 (EFI-AMD64 binaries)
Package: grub-efi-amd64
Architecture: i386 kopensolaris-i386 any-amd64
Depends: ${shlibs:Depends}, ${misc:Depends}, grub-efi-amd64-bin (= ${binary:Version}), ucf
Replaces: grub, grub-legacy, grub2 (<< ${source:Version}), grub-common (<= 1.96+20080413-1), grub-pc, grub-efi-ia32, grub-coreboot, grub-ieee1275
Replaces: grub, grub-legacy, grub2 (<< ${source:Version}), grub-common (<= 1.97~beta2-1), grub-pc, grub-efi-ia32, grub-coreboot, grub-ieee1275
Conflicts: grub, grub-legacy, grub-efi-ia32, grub-pc, grub-coreboot, grub-ieee1275
Multi-Arch: foreign
Description: GRand Unified Bootloader, version 2 (EFI-AMD64 version)
@ -289,7 +289,7 @@ Package: grub-ieee1275-bin
Architecture: any-i386 any-amd64 any-powerpc any-ppc64 any-sparc
Depends: ${shlibs:Depends}, ${misc:Depends}, grub2-common (= ${binary:Version}),
powerpc-ibm-utils [any-powerpc any-ppc64], powerpc-utils [any-powerpc any-ppc64], bc [any-powerpc any-ppc64]
Replaces: grub2 (<< ${source:Version}), grub-common (<= 1.96+20080413-1), grub-ieee1275 (<< 1.99-1)
Replaces: grub2 (<< ${source:Version}), grub-common (<= 1.97~beta2-1), grub-ieee1275 (<< 1.99-1)
Suggests: genisoimage [any-powerpc any-ppc64]
Multi-Arch: foreign
Description: GRand Unified Bootloader, version 2 (Open Firmware binaries)
@ -310,7 +310,7 @@ Description: GRand Unified Bootloader, version 2 (Open Firmware binaries)
Package: grub-ieee1275
Architecture: any-i386 any-amd64 any-powerpc any-ppc64 any-sparc
Depends: ${shlibs:Depends}, ${misc:Depends}, grub-ieee1275-bin (= ${binary:Version}), ucf
Replaces: grub-legacy, grub2 (<< ${source:Version}), grub-common (<= 1.96+20080413-1), grub-efi-amd64, grub-efi-ia32, grub-coreboot, grub-pc
Replaces: grub-legacy, grub2 (<< ${source:Version}), grub-common (<= 1.97~beta2-1), grub-efi-amd64, grub-efi-ia32, grub-coreboot, grub-pc
Conflicts: grub (<< 0.97-54), grub-legacy, grub-efi-amd64, grub-efi-ia32, grub-coreboot, grub-pc
Multi-Arch: foreign
Description: GRand Unified Bootloader, version 2 (Open Firmware version)