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

diff --cc debian/changelog
index c7c8b157dffaa7dd987318f2c9b5a757a199e44a,6e8257b1621effc4b5c6b1ae2bdfe833842afafb..47588ba0040c18e2dae395b2754bc38dd34c8231
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,18 -1,49 +1,65 @@@
- libguestfs (1:1.52.0-2+rpi1) trixie-staging; urgency=medium
++libguestfs (1:1.52.0-6.1+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.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Wed, 07 Feb 2024 20:29:27 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 14 Jun 2024 15:48:31 +0000
++
+ libguestfs (1:1.52.0-6.1) unstable; urgency=medium
+ 
+   * Non-maintainer upload.
+   * Install 99-guestfs-serial.rules into /usr/lib/udev/rules.d (Closes:
+     #1057804)
+ 
+  -- Chris Hofstaedtler <zeha@debian.org>  Thu, 30 May 2024 01:35:29 +0200
+ 
+ libguestfs (1:1.52.0-6) unstable; urgency=medium
+ 
+   * Add util-linux-extra to appliance list (Closes: #1071313)
+ 
+  -- Hilko Bengen <bengen@debian.org>  Sat, 18 May 2024 22:26:51 +0200
+ 
+ libguestfs (1:1.52.0-5) unstable; urgency=medium
+ 
+   * Write dependencies from Supermin appliance to correct substvars file,
+     take two.
+     (Closes: #1065610)
+ 
+  -- Hilko Bengen <bengen@debian.org>  Tue, 12 Mar 2024 14:01:03 +0100
+ 
+ libguestfs (1:1.52.0-4) unstable; urgency=medium
+ 
+   * Write dependencies from Supermin appliance to correct substvars file
+     (Closes: #1065610)
+ 
+  -- Hilko Bengen <bengen@debian.org>  Tue, 12 Mar 2024 09:45:13 +0100
+ 
+ libguestfs (1:1.52.0-3) unstable; urgency=medium
+ 
+   * Add rpc-related build-dependencies.
+     Thanks to Aurelien Jarno (Closes: #1065189)
+   * Switch Build-Depends to systemd-dev (Closes: #1060585)
+   * Bump supermin dependency so that virtual dependencies are resolved.
+     (Closes: #1065610)
+   * Adjust build-dependencies
+ 
+  -- Hilko Bengen <bengen@debian.org>  Tue, 12 Mar 2024 00:43:12 +0100
+ 
+ libguestfs (1:1.52.0-2.1) unstable; urgency=medium
+ 
+   * Non-maintainer upload.
+   * Rename libraries for 64-bit time_t transition.  Closes: #1062358
+ 
+  -- Benjamin Drung <bdrung@debian.org>  Wed, 28 Feb 2024 12:35:02 +0000
  
  libguestfs (1:1.52.0-2) unstable; urgency=medium
  

diff --cc debian/control
index 89708b4de8b7b36fa61cd294ea6446084189a445,09973a00984bcce31aadf84e821093be55792a82..830330ad269b73ecb18ec31d89aa8f0177813c0a
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -44,7 -44,7 +45,7 @@@ Build-Depends: dpkg-dev (>= 1.22.5), de
    libstring-shellquote-perl,
    libsys-virt-perl, libwin-hivex-perl,
    libfuse-dev, fuse,
-   libglib2.0-dev, gobject-introspection, libgirepository1.0-dev,
 -  libglib2.0-dev, gjs [!s390x !armel] <!nocheck>, gobject-introspection-bin, libgirepository1.0-dev,
++  libglib2.0-dev, gobject-introspection-bin, libgirepository1.0-dev,
    libgtk-3-dev,
    db-util,
    netpbm, icoutils,

diff --cc debian/patches/series
index b46b846efd172adaf273e85e175cbafe7a8ad038,9f3aef37df9530a9f4cf4c65463389373706ee18..d9f7569c6a1842dd88744a11dca3797cb764b2ac
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -19,4 -19,5 +19,6 @@@ Set-CPU-type-for-mipsel-mips64el.patc
  Fix-include-path-for-generating-localized-manpages.patch
  Only-set-rtc-driftfix-slew-on-x86-architectures.patch
  Add-dhcpcd-to-Debian-package-list.patch
+ Add-util-linux-extra-to-appliance-list.patch
+ udev-rules-path.patch
 +recognise-raspbian.diff

diff --cc debian/rules
Simple merge