From: Raspbian automatic forward porter <root@raspbian.org>
Date: Thu, 18 Jan 2024 18:13:33 +0000 (+0000)
Subject: Merge version 5.2.2-1+rpi1 and 5.2.2-3 to produce 5.2.2-3+rpi1
X-Git-Tag: raspbian/5.2.2-3+rpi1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=341b44cbef257b461514b38c7821e0abb440173f;p=supermin.git

Merge version 5.2.2-1+rpi1 and 5.2.2-3 to produce 5.2.2-3+rpi1
---

4016df72758075b67dba5266501ec2bf39e11c5f
diff --cc debian/changelog
index d9328df,a333638..d4c1007
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,20 +1,33 @@@
- supermin (5.2.2-1+rpi1) bookworm-staging; urgency=medium
++supermin (5.2.2-3+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 5.1.11-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Fri, 28 Nov 2014 05:45:23 +0000]
 +  * Build-depend on raspbian kernel rather than debian armmp kernel.
 +
 +  [changes brought forward from 5.1.20-1+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Tue, 03 Dec 2019 01:42:22 +0000]
 +  * Drop linux-image-rpi build-dependency, we currently don't have kernels
 +    in raspbian bullseye.
 +  * Disable testsuite.
 +  * Fix clean target.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 11 Mar 2022 13:11:27 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 18 Jan 2024 18:13:32 +0000
++
+ supermin (5.2.2-3) unstable; urgency=medium
+ 
+   * Don't use broken musl-gcc on mips64el (see #1050429)
+   * Fix libext2fs-dev build-depends
+ 
+  -- Hilko Bengen <bengen@debian.org>  Mon, 08 Jan 2024 10:42:33 +0100
+ 
+ supermin (5.2.2-2) unstable; urgency=medium
+ 
+   * Add -rpi kernel fr armel
+   * Add loong64-specific dependencies.
+     Thanks to Dandan Zhang (Closes: #1060136)
+   * Use musl-gcc on more architectures
+   * Ensure that package can be rebuilt from source after successful build
+     (Closes: #1048907)
+ 
+  -- Hilko Bengen <bengen@debian.org>  Sun, 07 Jan 2024 23:25:08 +0100
  
  supermin (5.2.2-1) unstable; urgency=medium
  
diff --cc debian/control
index 6e77440,5508d03..08f95e3
--- a/debian/control
+++ b/debian/control
@@@ -16,7 -16,8 +16,7 @@@ Build-Depends: debhelper (>= 12)
   augeas-tools, libhivex-bin,
   libguestfs-tools <!nocheck>,
   linux-image-alpha-generic [alpha] <!nocheck>,
-  linux-image-marvell [armel] <!nocheck> | linux-image-versatile [armel] <!nocheck>,
+  linux-image-rpi [armel] <!nocheck> | linux-image-marvell [armel] <!nocheck>,
 - linux-image-armmp [armhf] <!nocheck>,
   linux-image-arm64 [arm64] <!nocheck>,
   linux-image-4kc-malta [mips mipsel] <!nocheck> | linux-image-5kc-malta [mips mipsel] <!nocheck>,
   linux-image-5kc-malta [mips64 mips64el] <!nocheck>,