From: Raspbian automatic forward porter <root@raspbian.org>
Date: Fri, 1 Aug 2025 21:11:36 +0000 (+0100)
Subject: Merge version 2.12-8+rpi1 and 2.12-9 to produce 2.12-9+rpi1
X-Git-Tag: archive/raspbian/2.12-9+rpi1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3a02729f989a406fdac9e85226a34dc4fdb92e9c;p=grub2.git

Merge version 2.12-8+rpi1 and 2.12-9 to produce 2.12-9+rpi1
---

d61c44b5024349d2c62f7173169d45dfcdeb7a72
diff --cc debian/changelog
index 5b2505b,375edda..fef8746
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,9 +1,18 @@@
- grub2 (2.12-8+rpi1) trixie-staging; urgency=medium
++grub2 (2.12-9+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 2.12-5+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 28 Jul 2024 22:42:11 +0000]
 +  * Treat system as Debian, since we don't have any specific config for
 +    raspbian.
 +  * Fix clean target.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sat, 05 Jul 2025 01:32:54 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 01 Aug 2025 21:11:36 +0000
++
+ grub2 (2.12-9) unstable; urgency=medium
+ 
+   * Apply patch by Ben Hutchings to not strip .exec or .image files
+     (Closes: #1072167)
+ 
+  -- Felix Zielcke <fzielcke@z-51.de>  Thu, 03 Jul 2025 18:35:51 +0200
  
  grub2 (2.12-8) unstable; urgency=medium