Merge version 5.2.1-6+rpi1 and 5.2.2-1 to produce 5.2.2-1+rpi1

diff --cc debian/changelog
index 1bf012e20ea2bfee2795b8ec319acba5e55a0ed4,3c1f3abcfbce64df4def7d62e60d9f1895a87cf5..d9328df3c129a2464d1fcf9e6f09756d6b91871d
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,10 +1,23 @@@
- supermin (5.2.1-6+rpi1) bookworm-staging; urgency=medium
++supermin (5.2.2-1+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>  Thu, 09 Sep 2021 17:14:17 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 11 Mar 2022 13:11:27 +0000
++
+ supermin (5.2.2-1) unstable; urgency=medium
+ 
+   * New upstream version 5.2.2
+   * Add test-only Build-dependency for libguestfs-tools
+   * Drop patch that has been integrated upstream
+ 
+  -- Hilko Bengen <bengen@debian.org>  Sat, 05 Mar 2022 10:14:07 +0100
  
  supermin (5.2.1-6) unstable; urgency=medium
  

diff --cc debian/control
index f891647e8db947405f3d51359ea5524766b08095,d971224a2e992b6d9cf3ec7dbefa9c2e93fba9cc..6e774409bdcf9eaed2779452121dce2ce0e00cd1
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -14,8 -14,10 +14,9 @@@ Build-Depends: debhelper (>= 12)
   e2fsprogs,
   musl-tools [amd64 arm64 armel armhf i386],
   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-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>,