Merge ~juliank/grub/+git/bionic:bionic into ~ubuntu-core-dev/grub/+git/bionic:master

[Julian Andres Klode]

diff --git a/debian/changelog b/debian/changelog
index 59dd791..dd62890 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+grub2 (2.02-2ubuntu8.25) bionic; urgency=medium
+
+  [ Colin Watson ]
+  * Move kernel maintainer script snippets into grub2-common (thanks,
+    Bastian Blank; closes: #910959) (LP: #1995751)
+
+ -- Julian Andres Klode <[e-mail]>  Tue, 15 Nov 2022 12:13:43 +0100
+
 grub2 (2.02-2ubuntu8.23) bionic; urgency=medium
 
   [ Dimitri John Ledkov & Steve Langasek ]
diff --git a/debian/control b/debian/control
index e94dfc5..708ba7b 100644
--- a/debian/control
+++ b/debian/control
@@ -91,9 +91,9 @@ Priority: optional
 # of the package is not very useful in a utilities-only build.
 Architecture: any-i386 any-amd64 any-powerpc any-ppc64 any-ppc64el any-sparc any-sparc64 any-mipsel any-ia64 any-arm any-arm64
 Depends: grub-common (= ${binary:Version}), dpkg (>= 1.15.4) | install-info, ${shlibs:Depends}, ${misc:Depends}
-Replaces: grub, grub-legacy, ${legacy-doc-br}, grub-common (<< 1.99-1), grub-pc (<< 2.00-4), grub-ieee1275 (<< 2.00-4), grub-efi (<< 1.99-1), grub-coreboot (<< 2.00-4), grub-linuxbios (<< 1.99-1), grub-efi-ia32 (<< 2.00-4), grub-efi-amd64 (<< 2.00-4), grub-efi-ia64 (<< 2.00-4), grub-yeeloong (<< 2.00-4)
+Replaces: grub, grub-legacy, ${legacy-doc-br}, grub-common (<< 1.99-1), grub-pc (<< 2.02-2ubuntu8.25), grub-coreboot (<< 2.02-2ubuntu8.25), grub-efi-ia32 (<< 2.02-2ubuntu8.25), grub-efi-amd64 (<< 2.04-1ubuntu47.4), grub-efi-ia64 (<< 2.02-2ubuntu8.25), grub-efi-arm (<< 2.02-2ubuntu8.25), grub-efi-arm64 (<< 2.04-1ubuntu47.4), grub-ieee1275 (<< 2.02-2ubuntu8.25), grub-uboot (<< 2.02-2ubuntu8.25), grub-xen (<< 2.02-2ubuntu8.25), grub-yeeloong (<< 2.02-2ubuntu8.25)
 Conflicts: grub-legacy
-Breaks: grub (<< 0.97-54), ${legacy-doc-br}, shim (<< 13)
+Breaks: grub (<< 0.97-54), ${legacy-doc-br}, shim (<< 13), grub-pc (<< 2.02-2ubuntu8.25), grub-coreboot (<< 2.02-2ubuntu8.25), grub-efi-ia32 (<< 2.02-2ubuntu8.25), grub-efi-amd64 (<< 2.04-1ubuntu47.4), grub-efi-ia64 (<< 2.02-2ubuntu8.25), grub-efi-arm (<< 2.02-2ubuntu8.25), grub-efi-arm64 (<< 2.04-1ubuntu47.4), grub-ieee1275 (<< 2.02-2ubuntu8.25), grub-uboot (<< 2.02-2ubuntu8.25), grub-xen (<< 2.02-2ubuntu8.25), grub-yeeloong (<< 2.02-2ubuntu8.25)
 Multi-Arch: foreign
 Description: GRand Unified Bootloader (common files for version 2)
  This package contains common files shared by the distinct flavours of GRUB.
diff --git a/debian/grub2-common.install b/debian/grub2-common.install
index 8f617d4..74020d9 100644
--- a/debian/grub2-common.install
+++ b/debian/grub2-common.install
@@ -1,5 +1,7 @@
 ../../debian/default			usr/share/grub
 ../../debian/update-grub		usr/sbin
+../../debian/kernel/zz-update-grub	etc/kernel/postinst.d
+../../debian/kernel/zz-update-grub	etc/kernel/postrm.d
 
 usr/sbin/grub-install
 usr/sbin/grub-reboot
diff --git a/debian/install.in b/debian/install.in
index f003e41..e69de29 100644
--- a/debian/install.in
+++ b/debian/install.in
@@ -1,2 +0,0 @@
-../../debian/kernel/zz-update-grub	etc/kernel/postinst.d
-../../debian/kernel/zz-update-grub	etc/kernel/postrm.d