From: Raspbian automatic forward porter <root@raspbian.org>
Date: Sat, 2 Nov 2024 18:11:35 +0000 (+0000)
Subject: Merge version 1:1.52.2-3+rpi1 and 1:1.52.2-4 to produce 1:1.52.2-4+rpi1
X-Git-Tag: archive/raspbian/1%1.52.2-4+rpi1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=dc1bd9f5e511dfed2e34fadf9db4161e8c347429;p=libguestfs.git

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

4fb1ddeb02cae8ddc6d57bf7f1c789a0b459f895
diff --cc debian/changelog
index 2a433bde,aea814ff..c8f994ad
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,18 -1,8 +1,24 @@@
- libguestfs (1:1.52.2-3+rpi1) trixie-staging; urgency=medium
++libguestfs (1:1.52.2-4+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, 21 Aug 2024 01:41:47 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 02 Nov 2024 18:11:34 +0000
++
+ libguestfs (1:1.52.2-4) unstable; urgency=medium
+ 
+   * Update fuse build dependency to allow for fuse3 (Closes: #1084437)
+ 
+  -- Hilko Bengen <bengen@debian.org>  Mon, 07 Oct 2024 15:21:04 +0200
  
  libguestfs (1:1.52.2-3) unstable; urgency=medium
  
diff --cc debian/control
index 585b1144,cbca50b6..3e1aae2f
--- a/debian/control
+++ b/debian/control
@@@ -44,8 -43,8 +44,8 @@@ Build-Depends: dpkg-dev (>= 1.22.5), de
    libtest-pod-coverage-perl, libextutils-command-perl, libintl-perl, libtest-pod-perl,
    libstring-shellquote-perl,
    libsys-virt-perl, libwin-hivex-perl,
-   libfuse-dev, fuse,
+   libfuse-dev, fuse3 (>= 3.10.1-3) | fuse (<< 3),
 -  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,