Merge version 1:1.52.2-1+rpi1 and 1:1.52.2-3 to produce 1:1.52.2-3+rpi1

diff --cc debian/changelog
index 8fa36f5c1ee507a7013d1d9e1959149680d72f9c,5d5bb36527f55875357a9f78ec547d00e1ae2ff3..2a433bdef934765cf79b4b4449bcf9066824e6ed
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,18 -1,17 +1,33 @@@
- libguestfs (1:1.52.2-1+rpi1) trixie-staging; urgency=medium
++libguestfs (1:1.52.2-3+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>  Mon, 29 Jul 2024 00:14:27 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 21 Aug 2024 01:41:47 +0000
++
+ libguestfs (1:1.52.2-3) unstable; urgency=medium
+ 
+   * Add patch to link daemon with -latomic.
+     Thanks to Stéphane Glondu (Closes: 1078470)
+   * Add missing build-dependency
+ 
+  -- Hilko Bengen <bengen@debian.org>  Mon, 12 Aug 2024 12:29:50 +0200
+ 
+ libguestfs (1:1.52.2-2) unstable; urgency=medium
+ 
+   [ Stéphane Glondu ]
+   * Do not hardcode /usr/lib/ocaml (Closes: #1077899)
+ 
+  -- Hilko Bengen <bengen@debian.org>  Fri, 09 Aug 2024 00:07:36 +0200
  
  libguestfs (1:1.52.2-1) unstable; urgency=medium
  

diff --cc debian/control
index 830330ad269b73ecb18ec31d89aa8f0177813c0a,050d42e6b0fc3d39f006bec0c56411f776bc658e..585b1144429bf723bbc560370df49ac0827cda17
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -45,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-bin, libgirepository1.0-dev,
 -  libglib2.0-dev, gjs [!s390x !armel] <!nocheck>, gobject-introspection, gobject-introspection-bin, libgirepository1.0-dev,
++  libglib2.0-dev, gobject-introspection, gobject-introspection-bin, libgirepository1.0-dev,
    libgtk-3-dev,
    db-util,
    netpbm, icoutils,

diff --cc debian/patches/series
index d9f7569c6a1842dd88744a11dca3797cb764b2ac,95b7f74112f51201032aca1716104fcfbe018802..b78f576feba9daf898935a28e7012855dabac80c
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -21,4 -21,4 +21,5 @@@ Only-set-rtc-driftfix-slew-on-x86-archi
  Add-dhcpcd-to-Debian-package-list.patch
  Add-util-linux-extra-to-appliance-list.patch
  udev-rules-path.patch
+ link-with--latomic-when-linking-with--lc.patch
 +recognise-raspbian.diff