From 873e038a9ee20f8fa27124798fb08c8b098960c5 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Wed, 11 Dec 2013 10:57:26 +0000 Subject: [PATCH] Make grub-efi-ia32, grub-efi-amd64, and grub-efi-ia64 conflict with elilo. --- debian/changelog | 2 ++ debian/control | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3c0b45b0d..5e070236a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 Tue, 10 Dec 2013 17:39:47 +0000 diff --git a/debian/control b/debian/control index 164fa7252..cd8398e7a 100644 --- a/debian/control +++ b/debian/control @@ -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