From: Raspbian automatic forward porter <root@raspbian.org>
Date: Wed, 5 Mar 2025 02:44:34 +0000 (+0000)
Subject: Merge version 1:1.52.2-7+rpi1 and 1:1.54.1-1 to produce 1:1.54.1-1+rpi1
X-Git-Tag: archive/raspbian/1%1.54.1-1+rpi1~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a808b97da194bdc8b9659c9ab6d2bc8da9577853;p=libguestfs.git

Merge version 1:1.52.2-7+rpi1 and 1:1.54.1-1 to produce 1:1.54.1-1+rpi1
---

a808b97da194bdc8b9659c9ab6d2bc8da9577853
diff --cc debian/changelog
index 88eb5847,bedce955..a94ab117
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,21 -1,23 +1,42 @@@
- libguestfs (1:1.52.2-7+rpi1) trixie-staging; urgency=medium
++libguestfs (1:1.54.1-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.
 +
 +  [changes introduced in 1:1.52.2-7+rpi1 by Peter Michael Green]
 +  * disable some translations due to build failures.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Sat, 01 Feb 2025 16:46:24 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 05 Mar 2025 02:44:14 +0000
++
+ libguestfs (1:1.54.1-1) unstable; urgency=medium
+ 
+   * New upstream version 1.54.1
+   * Rebase patches
+ 
+  -- Hilko Bengen <bengen@debian.org>  Wed, 19 Feb 2025 09:38:24 +0100
+ 
+ libguestfs (1:1.54.0-1) unstable; urgency=medium
+ 
+   [ Carles Pina i Estany ]
+   * Update translation
+ 
+   [ Hilko Bengen ]
+   * New upstream version 1.54.0
+   * Remove direct gobject-introspection-bin dependency (Closes: #1094628)
+   * Update watch file
+   * Rebase patches
+   * Update symbols file
+ 
+  -- Hilko Bengen <bengen@debian.org>  Mon, 17 Feb 2025 00:19:58 +0100
  
  libguestfs (1:1.52.2-7) unstable; urgency=medium
  
diff --cc debian/control
index 60e09ded,db008103..0bf27cb6
--- a/debian/control
+++ b/debian/control
@@@ -47,7 -46,7 +47,7 @@@ Build-Depends: dpkg-dev (>= 1.22.5), de
    libstring-shellquote-perl,
    libsys-virt-perl, libwin-hivex-perl,
    libfuse-dev, fuse3 (>= 3.10.1-3) | fuse (<< 3),
-   libglib2.0-dev, gobject-introspection, gobject-introspection-bin, libgirepository1.0-dev,
 -  libglib2.0-dev, gjs [!s390x !armel] <!nocheck>, gobject-introspection, libgirepository1.0-dev,
++  libglib2.0-dev, gobject-introspection, libgirepository1.0-dev,
    libgtk-3-dev,
    db-util,
    netpbm, icoutils,
diff --cc m4/guestfs-appliance.m4
index 92ba48fe,f315c96d..9533de8a
--- a/m4/guestfs-appliance.m4
+++ b/m4/guestfs-appliance.m4
@@@ -130,10 -131,10 +131,10 @@@ if test "x$ENABLE_APPLIANCE" = "xyes"; 
      AC_SUBST([DISTRO])
  fi
  AM_CONDITIONAL([HAVE_RPM],
-     [AS_CASE([$DISTRO], [REDHAT | SUSE | OPENMANDRIVA | MAGEIA | OPENCLOUDOS ], [true],
+     [AS_CASE([$DISTRO], [REDHAT | SUSE | OPENMANDRIVA | MAGEIA | OPENCLOUDOS | OPENEULER ], [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],