Make grub-efi-ia32, grub-efi-amd64, and grub-efi-ia64 conflict with elilo.

This commit is contained in:
Colin Watson 2013-12-11 10:57:26 +00:00
parent a62e136fc4
commit 873e038a9e
2 changed files with 5 additions and 2 deletions

2
debian/changelog vendored
View File

@ -5,6 +5,8 @@ grub2 (2.00+20131208-2) UNRELEASED; urgency=low
* Build grub-common, grub2-common, grub-themes-starfield, and grub-mount
on ARM and ARM64 architectures.
* Install grub-mkrescue in grub-common on all architectures.
* Make grub-efi-ia32, grub-efi-amd64, and grub-efi-ia64 conflict with
elilo.
-- Colin Watson <cjwatson@debian.org> Tue, 10 Dec 2013 17:39:47 +0000

5
debian/control vendored
View File

@ -267,7 +267,7 @@ Package: grub-efi-ia32
Architecture: any-i386 any-amd64
Depends: ${shlibs:Depends}, ${misc:Depends}, grub2-common (= ${binary:Version}), grub-efi-ia32-bin (= ${binary:Version}), ucf
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, grub-xen
Conflicts: grub (<< 0.97-54), grub-legacy, grub-efi-amd64, grub-pc, grub-coreboot, grub-ieee1275, grub-xen, elilo
Multi-Arch: foreign
Description: GRand Unified Bootloader, version 2 (EFI-IA32 version)
GRUB is a portable, powerful bootloader. This version of GRUB is based on a
@ -317,7 +317,7 @@ Package: grub-efi-amd64
Architecture: i386 kopensolaris-i386 any-amd64
Depends: ${shlibs:Depends}, ${misc:Depends}, grub2-common (= ${binary:Version}), grub-efi-amd64-bin (= ${binary:Version}), ucf
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, grub-xen
Conflicts: grub, grub-legacy, grub-efi-ia32, grub-pc, grub-coreboot, grub-ieee1275, grub-xen, elilo
Multi-Arch: foreign
Description: GRand Unified Bootloader, version 2 (EFI-AMD64 version)
GRUB is a portable, powerful bootloader. This version of GRUB is based on a
@ -364,6 +364,7 @@ Description: GRand Unified Bootloader, version 2 (IA64 debug files)
Package: grub-efi-ia64
Architecture: any-ia64
Depends: ${shlibs:Depends}, ${misc:Depends}, grub2-common (= ${binary:Version}), grub-efi-ia64-bin (= ${binary:Version}), ucf
Conflicts: elilo
Multi-Arch: foreign
Description: GRand Unified Bootloader, version 2 (IA64 version)
GRUB is a portable, powerful bootloader. This version of GRUB is based on a