Merge version 1:1.48.4-1+rpi1 and 1:1.48.4-2 to produce 1:1.48.4-2+rpi1

diff --cc debian/changelog
index 1b4537d59b4f0706c798fd524a4a2ba86143e84d,59d937253cc0bb58004a1c4edde628f61521ea6d..6ab8ae94c2254cc8693c9b09c930b477df2028d2
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,9 +1,22 @@@
- libguestfs (1:1.48.4-1+rpi1) bookworm-staging; urgency=medium
++libguestfs (1:1.48.4-2+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 1:1.42.0-11+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 12 Nov 2020 16:03:00 +0000]
 +  * Add raspbian to the list of distros with dpkg.
 +  * Disable dh_missing
 +  * Partiall fix clean target.
 +
 +  [changes introduced in 1:1.46.2-11+rpi1 by Peter Michael Green]
 +  * Remove testsuite-specific build-dependencies.
 +  * Disable testsuite.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Wed, 13 Jul 2022 16:38:42 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 07 Aug 2022 03:20:02 +0000
++
+ libguestfs (1:1.48.4-2) unstable; urgency=medium
+ 
+   * Remove bsdmainutils build-dependency (Closes: #964533, again)
+   * Adjust lintian-overrides to changed lintian output format
+ 
+  -- Hilko Bengen <bengen@debian.org>  Sun, 31 Jul 2022 19:16:25 +0200
  
  libguestfs (1:1.48.4-1) unstable; urgency=medium
  

diff --cc debian/control
Simple merge