diffstat of debian/ for grub2_2.02+dfsg1-11 grub2_2.02+dfsg1-11kali1 changelog | 44 ++++++++++++++++++++++++++++++++++++++++++++ control | 6 +++--- 2 files changed, 47 insertions(+), 3 deletions(-) diff -Nru grub2-2.02+dfsg1/debian/changelog grub2-2.02+dfsg1/debian/changelog --- grub2-2.02+dfsg1/debian/changelog 2019-02-10 18:53:41.000000000 +0000 +++ grub2-2.02+dfsg1/debian/changelog 2019-02-27 14:19:16.000000000 +0000 @@ -1,3 +1,11 @@ +grub2 (2.02+dfsg1-11kali1) kali-dev; urgency=medium + + * Sync with Debian. Remaining changes: + - Add Conflicts relation between grub-efi-$arch-bin and + grub-efi-$arch-signed + + -- Sophie Brun Wed, 27 Feb 2019 15:19:16 +0100 + grub2 (2.02+dfsg1-11) unstable; urgency=medium [ Colin Watson ] @@ -30,6 +38,14 @@ -- Colin Watson Sun, 10 Feb 2019 18:53:41 +0000 +grub2 (2.02+dfsg1-10kali1) kali-dev; urgency=medium + + * Sync with Debian. Remaining changes: + - Add Conflicts relation between grub-efi-$arch-bin and + grub-efi-$arch-signed + + -- Sophie Brun Mon, 21 Jan 2019 13:06:02 +0100 + grub2 (2.02+dfsg1-10) unstable; urgency=medium * Apply patch from Heinrich Schuchardt (mentioned in #916695 though @@ -47,6 +63,14 @@ -- Colin Watson Fri, 11 Jan 2019 15:24:20 +0000 +grub2 (2.02+dfsg1-9kali1) kali-dev; urgency=medium + + * Sync with Debian. Remaining changes: + - Add Conflicts relation between grub-efi-$arch-bin and + grub-efi-$arch-signed + + -- Sophie Brun Thu, 10 Jan 2019 09:35:23 +0100 + grub2 (2.02+dfsg1-9) unstable; urgency=medium [ Colin Watson ] @@ -69,6 +93,14 @@ -- Colin Watson Fri, 07 Dec 2018 10:38:37 +0000 +grub2 (2.02+dfsg1-8kali1) kali-dev; urgency=medium + + * Sync with Debian. Remaining changes: + - Add Conflicts relation between grub-efi-$arch-bin and + grub-efi-$arch-signed + + -- Sophie Brun Tue, 06 Nov 2018 15:03:50 +0100 + grub2 (2.02+dfsg1-8) unstable; urgency=medium * Revise grub--bin and grub- package descriptions to @@ -106,6 +138,18 @@ -- Colin Watson Sat, 27 Oct 2018 13:06:32 +0100 +grub2 (2.02+dfsg1-6kali1) kali-dev; urgency=medium + + * Fork from Debian so that our grub consistenly uses the /EFI/kali path in + the EFI partition. + * Add Conflicts relation between grub-efi-$arch-bin and + grub-efi-$arch-signed. Kali is not able to build the *-signed packages yet + and we want to get rid of the packages coming from Debian since we have + now forked grub and our EFI images will thus point to /EFI/kali and not + /EFI/debian. Fixes: https://bugs.kali.org/view.php?id=4956 + + -- Raphaël Hertzog Fri, 07 Sep 2018 15:58:16 +0200 + grub2 (2.02+dfsg1-6) unstable; urgency=medium * Only build *-signed packages on their native architecture for now, since diff -Nru grub2-2.02+dfsg1/debian/control grub2-2.02+dfsg1/debian/control --- grub2-2.02+dfsg1/debian/control 2019-02-10 11:31:06.000000000 +0000 +++ grub2-2.02+dfsg1/debian/control 2019-02-27 14:19:16.000000000 +0000 @@ -245,7 +245,7 @@ Package: grub-efi-ia32-bin Architecture: any-i386 any-amd64 Depends: ${shlibs:Depends}, ${misc:Depends}, grub-common (= ${binary:Version}), efibootmgr [linux-any] -Recommends: grub-efi-ia32-signed, +Conflicts: grub-efi-ia32-signed, Replaces: grub2 (<< ${source:Version}), grub-common (<= 1.97~beta2-1), grub-efi, grub-efi-ia32 (<< 1.99-1) Multi-Arch: foreign XB-Efi-Vendor: ${efi:Vendor} @@ -306,7 +306,7 @@ Package: grub-efi-amd64-bin Architecture: i386 kopensolaris-i386 any-amd64 Depends: ${shlibs:Depends}, ${misc:Depends}, grub-common (= ${binary:Version}), efibootmgr [linux-any] -Recommends: grub-efi-amd64-signed, +Conflicts: grub-efi-amd64-signed, Replaces: grub2 (<< ${source:Version}), grub-common (<= 1.97~beta2-1), grub-efi-amd64 (<< 1.99-1) Multi-Arch: foreign XB-Efi-Vendor: ${efi:Vendor} @@ -466,7 +466,7 @@ Package: grub-efi-arm64-bin Architecture: any-arm64 Depends: ${shlibs:Depends}, ${misc:Depends}, grub-common (= ${binary:Version}), efibootmgr [linux-any] -Recommends: grub-efi-arm64-signed, +Conflicts: grub-efi-arm64-signed, Multi-Arch: foreign XB-Efi-Vendor: ${efi:Vendor} Description: GRand Unified Bootloader, version 2 (ARM64 UEFI modules)