From: Raspbian automatic forward porter <root@raspbian.org>
Date: Wed, 7 Feb 2024 20:29:28 +0000 (+0000)
Subject: Merge version 1:1.50.1-4+rpi1 and 1:1.52.0-2 to produce 1:1.52.0-2+rpi1
X-Git-Tag: archive/raspbian/1%1.52.0-2+rpi1~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=96831a252107f8907f445a62d2b40eb640244cd2;p=libguestfs.git

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

96831a252107f8907f445a62d2b40eb640244cd2
diff --cc debian/changelog
index 6bcca059,5588e0fc..c7c8b157
--- a/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/patches/series
index 9a2b09dc,78855003..b46b846e
--- a/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 a28f80ef,f52bf034..92ba48fe
--- a/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],