Merge version 5.2.1-5+rpi1 and 5.2.1-6 to produce 5.2.1-6+rpi1

diff --cc debian/changelog
index 095561e4d383632ec68c2b6bfc9070df0d561b9c,a8afe043173d6866f9284caa9c18cde285195136..1bf012e20ea2bfee2795b8ec319acba5e55a0ed4
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,11 +1,24 @@@
- supermin (5.2.1-5+rpi1) bookworm-staging; urgency=medium
++supermin (5.2.1-6+rpi1) bookworm-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>  Sun, 29 Aug 2021 20:59:16 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 09 Sep 2021 17:14:17 +0000
++
+ supermin (5.2.1-6) unstable; urgency=medium
+ 
+   * Add kernel build-depends/recommends for x32
+     - (This might fix the FTBFS on x32, not that it matters at this
+       point.)
+   * Require kernel-image-* only for builds including tests.
+ 
+  -- Hilko Bengen <bengen@debian.org>  Thu, 02 Sep 2021 21:53:27 +0200
  
  supermin (5.2.1-5) unstable; urgency=medium
  

diff --cc debian/control
index 88a53ceac5dbe41770b2b9dbebf0c0a6b14abdf5,befd7aebb1f6edc6bb88c0d4516ef6060e58441f..f891647e8db947405f3d51359ea5524766b08095
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -14,21 -14,22 +14,21 @@@ Build-Depends: debhelper (>= 12)
   e2fsprogs,
   musl-tools [amd64 arm64 armel armhf i386],
   augeas-tools, libhivex-bin,
-  linux-image-alpha-generic [alpha],
-  linux-image-marvell [armel] | linux-image-versatile [armel],
-  linux-image-arm64 [arm64],
-  linux-image-4kc-malta [mips mipsel] | linux-image-5kc-malta [mips mipsel],
-  linux-image-5kc-malta [mips64 mips64el],
-  linux-image-s390x [s390x],
-  linux-image-parisc [hppa],
-  linux-image-powerpc [powerpc],
-  linux-image-powerpc64 [ppc64],
-  linux-image-powerpc64le [ppc64el],
-  linux-image-sparc64 [sparc sparc64],
-  linux-image-amd64 [amd64],
-  linux-image-686-pae [i386] | linux-image-586 [i386] | linux-image-486 [i386],
-  linux-image-riscv64 [riscv64],
-  linux-image-itanium [ia64] | linux-image-mckinley [ia64],
+  linux-image-alpha-generic [alpha] <!nocheck>,
+  linux-image-marvell [armel] <!nocheck> | linux-image-versatile [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>,
+  linux-image-s390x [s390x] <!nocheck>,
+  linux-image-parisc [hppa] <!nocheck>,
+  linux-image-powerpc [powerpc] <!nocheck>,
+  linux-image-powerpc64 [ppc64] <!nocheck>,
+  linux-image-powerpc64le [ppc64el] <!nocheck>,
+  linux-image-sparc64 [sparc sparc64] <!nocheck>,
+  linux-image-amd64 [amd64 x32] <!nocheck>,
+  linux-image-686-pae [i386] <!nocheck> | linux-image-586 [i386] <!nocheck> | linux-image-486 [i386] <!nocheck>,
+  linux-image-riscv64 [riscv64] <!nocheck>,
+  linux-image-itanium [ia64] <!nocheck> | linux-image-mckinley [ia64] <!nocheck>,
  Standards-Version: 4.3.0
  Homepage: http://people.redhat.com/~rjones/supermin/
  Vcs-Git: https://salsa.debian.org/libvirt-team/supermin.git