diff --git a/debian/changelog b/debian/changelog index 56817c8c8..b35d68073 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ grub2 (1.99~20101122-2) UNRELEASED; urgency=low * Build-depend on qemu-img and parted on non-Hurd architectures. * qemu_img_exists.patch: Skip partmap test if qemu-img doesn't exist (as is the case on the Hurd). + * Make grub-efi-ia32 and grub-efi-amd64 depend on efibootmgr so that + grub-install works properly. -- Colin Watson Mon, 22 Nov 2010 15:44:40 +0000 diff --git a/debian/control b/debian/control index 951394da6..2c5658a03 100644 --- a/debian/control +++ b/debian/control @@ -136,10 +136,10 @@ Description: GRand Unified Bootloader, version 2 (Coreboot version) Package: grub-efi-ia32 Architecture: any-i386 any-amd64 -Depends: ${shlibs:Depends}, grub-common (= ${binary:Version}), ${misc:Depends}, ucf +Depends: ${shlibs:Depends}, grub-common (= ${binary:Version}), ${misc:Depends}, ucf, efibootmgr Replaces: grub, grub-legacy, grub2 (<< ${source:Version}), grub-common (<= 1.96+20080413-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 -Suggests: os-prober, efibootmgr +Suggests: os-prober Description: GRand Unified Bootloader, version 2 (EFI-IA32 version) GRUB is a portable, powerful bootloader. This version of GRUB is based on a cleaner design than its predecessors, and provides the following new features: @@ -156,10 +156,10 @@ Description: GRand Unified Bootloader, version 2 (EFI-IA32 version) Package: grub-efi-amd64 Architecture: any-i386 any-amd64 -Depends: ${shlibs:Depends}, grub-common (= ${binary:Version}), ${misc:Depends}, ucf +Depends: ${shlibs:Depends}, grub-common (= ${binary:Version}), ${misc:Depends}, ucf, efibootmgr Replaces: grub, grub-legacy, grub2 (<< ${source:Version}), grub-common (<= 1.96+20080413-1), grub-pc, grub-efi-ia32, grub-coreboot, grub-ieee1275 Conflicts: grub, grub-legacy, grub-efi-ia32, grub-pc, grub-coreboot, grub-ieee1275 -Suggests: os-prober, efibootmgr +Suggests: os-prober Description: GRand Unified Bootloader, version 2 (EFI-AMD64 version) GRUB is a portable, powerful bootloader. This version of GRUB is based on a cleaner design than its predecessors, and provides the following new features: