Merge version 1:1.50.1-4+rpi1 and 1:1.52.0-2 to produce 1:1.52.0-2+rpi1

diff --cc debian/changelog
index 6bcca0594382f1319fe3b11c154bad37a0dedf1a,5588e0fc0d673715997e26dc9ed5ea759691a135..c7c8b157dffaa7dd987318f2c9b5a757a199e44a
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,18 -1,23 +1,39 @@@
- libguestfs (1:1.50.1-4+rpi1) trixie-staging; urgency=medium
++libguestfs (1:1.52.0-2+rpi1) trixie-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.
 +
 +  [changes introduced in 1:1.50.1-4+rpi1 by Peter Michael Green]
 +  * Add build-conflicts on rustc.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Fri, 17 Nov 2023 00:30:45 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 07 Feb 2024 20:29:27 +0000
++
+ libguestfs (1:1.52.0-2) unstable; urgency=medium
+ 
+   * Add explicit qemu-utils dependency to libguestfs0, fixing dependent
+     packages
+ 
+  -- Hilko Bengen <bengen@debian.org>  Mon, 08 Jan 2024 00:01:44 +0100
+ 
+ libguestfs (1:1.52.0-1) unstable; urgency=medium
+ 
+   * Add patch to only pass -rtc driftfix=slew on x86 architectures
+   * Fix MIPS CPU patch
+   * Add Romanian Debconf translation, thanks to Remus-Gabriel Chelu
+     (Closes: #1059591)
+   * New upstream version 1.52.0
+   * Rebase patches
+   * Use dhcpcd (dhcpcd-base) as default DHCP client (Closes: #1041066)
+   * Ensure that package can be rebuilt from source after successful build
+     (Closes: #1045306)
+ 
+  -- Hilko Bengen <bengen@debian.org>  Sun, 07 Jan 2024 17:52:14 +0100
  
  libguestfs (1:1.50.1-4) unstable; urgency=medium
  

diff --cc debian/control
Simple merge

diff --cc debian/patches/series
index 9a2b09dc4c1375a160de74c6c2c5bacd7e3a6787,788550039f3dbb82e9f61dcd5b37fbbcba2351fb..b46b846efd172adaf273e85e175cbafe7a8ad038
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -15,6 -15,7 +15,8 @@@ Make-sure-that-generated-ocaml-link.sh-
  Fix-out-of-tree-build-for-po.patch
  Update-packagelist-as-haxdump-has-been-moved-to-bsdextrau.patch
  Fix-golang-bindtest-and-check-mli.sh-for-out-of-tree-buil.patch
- Don-t-set-CPU-type-on-mips.patch
- Fix-include-path-for-guestfish.1.patch
+ Set-CPU-type-for-mipsel-mips64el.patch
+ Fix-include-path-for-generating-localized-manpages.patch
+ Only-set-rtc-driftfix-slew-on-x86-architectures.patch
+ Add-dhcpcd-to-Debian-package-list.patch
 +recognise-raspbian.diff

diff --cc m4/guestfs-appliance.m4
index a28f80ef04faa2b395f7dad5d3797f4c0fdb5ecb,f52bf034a0afd0f98714cabc1c99c7ae6423b407..92ba48fe23c567168c540880a2f3b2225b06318e
--- 1/m4/guestfs-appliance.m4
--- 2/m4/guestfs-appliance.m4
+++ b/m4/guestfs-appliance.m4
@@@ -129,10 -130,10 +130,10 @@@ if test "x$ENABLE_APPLIANCE" = "xyes"; 
      AC_SUBST([DISTRO])
  fi
  AM_CONDITIONAL([HAVE_RPM],
-     [AS_CASE([$DISTRO], [REDHAT | SUSE | OPENMANDRIVA | MAGEIA ], [true],
+     [AS_CASE([$DISTRO], [REDHAT | SUSE | OPENMANDRIVA | MAGEIA | OPENCLOUDOS ], [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 | ARTIX], [true],