diff -Nru grub2-2.02/debian/changelog grub2-2.02/debian/changelog
--- grub2-2.02/debian/changelog	2021-02-24 19:47:47.000000000 +0000
+++ grub2-2.02/debian/changelog	2023-02-01 17:49:01.000000000 +0000
@@ -1,3 +1,18 @@
+grub2 (2.02-2ubuntu8.26) bionic; urgency=medium
+
+  * Have grub-common depend on efibootmgr on amd64, arm64, i386 (LP: #1936857)
+  * grub-check-signatures: Support gzip compressed kernels (LP: #1954683)
+
+ -- Julian Andres Klode <juliank@ubuntu.com>  Wed, 01 Feb 2023 18:49:01 +0100
+
+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 <juliank@ubuntu.com>  Tue, 15 Nov 2022 12:13:43 +0100
+
 grub2 (2.02-2ubuntu8.23) bionic; urgency=medium
 
   [ Dimitri John Ledkov & Steve Langasek ]
diff -Nru grub2-2.02/debian/control grub2-2.02/debian/control
--- grub2-2.02/debian/control	2021-02-24 19:47:47.000000000 +0000
+++ grub2-2.02/debian/control	2023-02-01 17:49:01.000000000 +0000
@@ -72,7 +72,7 @@
 Package: grub-common
 Priority: optional
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, gettext-base, ${lsb-base-depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, gettext-base, ${lsb-base-depends}, efibootmgr [amd64 arm64 i386]
 Replaces: grub-pc (<< 2.00-4), grub-ieee1275 (<< 2.00-4), grub-efi (<< 1.99-1), grub-coreboot (<< 2.00-4), grub-linuxbios (<< 1.96+20080831-1), grub-efi-ia32 (<< 2.00-4), grub-efi-amd64 (<< 2.00-4), grub-efi-ia64 (<< 2.00-4), grub-yeeloong (<< 2.00-4)
 Recommends: os-prober (>= 1.33)
 Suggests: multiboot-doc, grub-emu [any-i386 any-amd64 any-powerpc], xorriso (>= 0.5.6.pl00), desktop-base (>= 4.0.6), console-setup
@@ -91,9 +91,9 @@
 # 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 -Nru grub2-2.02/debian/grub2-common.install grub2-2.02/debian/grub2-common.install
--- grub2-2.02/debian/grub2-common.install	2021-02-24 19:47:47.000000000 +0000
+++ grub2-2.02/debian/grub2-common.install	2023-02-01 17:49:01.000000000 +0000
@@ -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 -Nru grub2-2.02/debian/grub-check-signatures grub2-2.02/debian/grub-check-signatures
--- grub2-2.02/debian/grub-check-signatures	2021-02-23 16:23:39.000000000 +0000
+++ grub2-2.02/debian/grub-check-signatures	2023-02-01 17:49:01.000000000 +0000
@@ -54,8 +54,13 @@
 
 # Check if a given kernel image is signed
 is_signed() {
+	kernel=$1
 	tmp=$(mktemp)
-	sbattach --detach $tmp $1 >/dev/null 2>/dev/null 	# that's ugly...
+	kernel_tmp=$(mktemp)
+	if zcat $kernel > $kernel_tmp 2>/dev/null; then
+		kernel=$kernel_tmp
+	fi
+	sbattach --detach $tmp $kernel >/dev/null 2>/dev/null 	# that's ugly...
 	test "$(wc -c < $tmp)" -ge 16	# Just _some_ minimum size
 	result=$?
 	if [ $result -eq 0 ]; then
@@ -64,9 +69,10 @@
 	rm $tmp
 	if [ $result -eq 0 ]; then
 		for crtfile in $tmpdir/*.crt; do
-			sbverify --cert $crtfile $1 >/dev/null 2>/dev/null
+			sbverify --cert $crtfile $kernel >/dev/null 2>/dev/null
 			result=$?
 			if [ $result -eq 0 ]; then
+				rm "$kernel_tmp"
 				return $result;
 			fi
 		done
@@ -75,6 +81,7 @@
 	else
 		echo "$1 is unsigned." >&2
 	fi
+	rm "$kernel_tmp"
 	return $result
 }
 
diff -Nru grub2-2.02/debian/install.in grub2-2.02/debian/install.in
--- grub2-2.02/debian/install.in	2021-02-24 19:47:47.000000000 +0000
+++ grub2-2.02/debian/install.in	2023-02-01 17:49:01.000000000 +0000
@@ -1,2 +0,0 @@
-../../debian/kernel/zz-update-grub	etc/kernel/postinst.d
-../../debian/kernel/zz-update-grub	etc/kernel/postrm.d