Merge version 1:1.48.1-1+rpi1 and 1:1.48.2-1 to produce 1:1.48.2-1+rpi1

diff --cc debian/changelog
index e00940000d3b99015342f260a063f73921bc956e,a69252cd3dbb7c3686283b5daa37bd0fa8607a75..5b57ee3efc22179002848c3918d00492a026357b
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,8 +1,21 @@@
- libguestfs (1:1.48.1-1+rpi1) bookworm-staging; urgency=medium
++libguestfs (1:1.48.2-1+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>  Sun, 24 Apr 2022 01:08:52 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 19 May 2022 09:47:19 +0000
++
+ libguestfs (1:1.48.2-1) unstable; urgency=medium
+ 
+   * New upstream version 1.48.2
+ 
+  -- Hilko Bengen <bengen@debian.org>  Mon, 16 May 2022 15:15:28 +0200
  
  libguestfs (1:1.48.1-1) unstable; urgency=medium
  

diff --cc m4/guestfs-appliance.m4
index 0bbdd7b9eacf3f380a69df5d5d6d6c10146e8a41,dd0edbf710fdd97083f3619576484cf145102498..aebe11d7b4086b68ffe8f898f201bf43a100e975
--- 1/m4/guestfs-appliance.m4
--- 2/m4/guestfs-appliance.m4
+++ b/m4/guestfs-appliance.m4
@@@ -120,10 -120,10 +120,10 @@@ AM_CONDITIONAL([HAVE_RPM]
      [AS_CASE([$DISTRO], [REDHAT | SUSE | OPENMANDRIVA | MAGEIA ], [true],
                          [*], [false])])
  AM_CONDITIONAL([HAVE_DPKG],
 -    [AS_CASE([$DISTRO], [DEBIAN | UBUNTU ], [true],
 +    [AS_CASE([$DISTRO], [DEBIAN | UBUNTU | RASPBIAN ], [true],
                          [*], [false])])
  AM_CONDITIONAL([HAVE_PACMAN],
-     [AS_CASE([$DISTRO], [ARCHLINUX | FRUGALWARE ], [true],
+     [AS_CASE([$DISTRO], [ARCHLINUX | FRUGALWARE | ARTIX], [true],
                          [*], [false])])
  AC_SUBST([DISTRO])