diff -Nru libguestfs-1.44.0/debian/changelog libguestfs-1.44.0/debian/changelog --- libguestfs-1.44.0/debian/changelog 2021-01-10 12:25:43.000000000 +0000 +++ libguestfs-1.44.0/debian/changelog 2021-01-15 10:09:13.000000000 +0000 @@ -1,3 +1,12 @@ +libguestfs (1:1.44.0-1+rpi1) bullseye-staging; urgency=medium + + [changes brought forward from 1:1.42.0-11+rpi1 by Peter Michael Green 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. + + -- Peter Michael Green Fri, 15 Jan 2021 10:09:13 +0000 + libguestfs (1:1.44.0-1) unstable; urgency=medium * New upstream version 1.44.0 diff -Nru libguestfs-1.44.0/debian/patches/auto-1:1.44.0-1+rpi1-4b5577a431c96e44282e63413b3555bcef626c3a-1610706180 libguestfs-1.44.0/debian/patches/auto-1:1.44.0-1+rpi1-4b5577a431c96e44282e63413b3555bcef626c3a-1610706180 --- libguestfs-1.44.0/debian/patches/auto-1:1.44.0-1+rpi1-4b5577a431c96e44282e63413b3555bcef626c3a-1610706180 1970-01-01 00:00:00.000000000 +0000 +++ libguestfs-1.44.0/debian/patches/auto-1:1.44.0-1+rpi1-4b5577a431c96e44282e63413b3555bcef626c3a-1610706180 2021-01-15 10:09:13.000000000 +0000 @@ -0,0 +1,40 @@ +From: Peter Michael Green +Subject: Automatically generated patch (1:1.44.0-1+rpi1) + +Last (up to) 3 git changes, FYI: + +commit 4b5577a431c96e44282e63413b3555bcef626c3a +Merge: c0a5932a ff2897d1 +Author: Peter Michael Green +Date: Fri Jan 15 10:17:15 2021 +0000 + + Manual merge of version 1:1.42.0-11+rpi1 and 1:1.44.0-1 to produce 1:1.44.0-1+rpi1 + +commit ff2897d1c2df028404138d0a5c185b1165599e58 +Merge: d179bba8 e29e9caa +Author: Hilko Bengen +Date: Sun Jan 10 12:25:43 2021 +0000 + + Merge libguestfs (1:1.44.0-1) import into refs/heads/workingbranch + +commit d179bba82616b6cb82a0ffb96ebb4c7100414f9d +Author: Hilko Bengen +Date: Sun Jan 10 02:33:22 2021 +0100 + + Fix out-of-tree build for po/* + + + Gbp-Pq: Name 0019-Fix-out-of-tree-build-for-po.patch +--- + +--- libguestfs-1.44.0.orig/m4/guestfs-appliance.m4 ++++ libguestfs-1.44.0/m4/guestfs-appliance.m4 +@@ -118,7 +118,7 @@ AC_ARG_WITH([distro], + [AS_CASE([$DISTRO], [REDHAT | SUSE | OPENMANDRIVA | MAGEIA ], [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 ], [true], diff -Nru libguestfs-1.44.0/debian/patches/series libguestfs-1.44.0/debian/patches/series --- libguestfs-1.44.0/debian/patches/series 2021-01-10 02:56:20.000000000 +0000 +++ libguestfs-1.44.0/debian/patches/series 2021-01-15 10:09:13.000000000 +0000 @@ -17,3 +17,4 @@ 0018-Fix-documentation-generation-for-out-of-tree-builds.patch 0019-Add-support-for-YARA-4.patch 0019-Fix-out-of-tree-build-for-po.patch +auto-1:1.44.0-1+rpi1-4b5577a431c96e44282e63413b3555bcef626c3a-1610706180 diff -Nru libguestfs-1.44.0/debian/rules libguestfs-1.44.0/debian/rules --- libguestfs-1.44.0/debian/rules 2021-01-10 12:19:53.000000000 +0000 +++ libguestfs-1.44.0/debian/rules 2021-01-15 10:09:13.000000000 +0000 @@ -57,6 +57,12 @@ define DH_AUTO_TEMPLATE override_dh_auto_clean:: dh_auto_clean --builddir=$(CURDIR)/debian/build-$1 + find . -name '*.o' -delete + find . -name '*.cmi' -delete + find . -name '*.cmx' -delete + find . -name '*.class' -delete + rm -f generator/.pod2text.data.version.2 + $(CURDIR)/debian/build-$1/config.status:: dh_auto_configure --builddir=$(CURDIR)/debian/build-$1 \ @@ -146,8 +152,8 @@ dh_install -X.la -X.so.owner -Xbindtests -X/usr/lib/go/ -X/usr/lib/go- -Xpackages.orig -Xetc/php.d override_dh_missing: - dh_missing --fail-missing \ - -X.la -X.so.owner -Xbindtests -X/usr/lib/go/ -X/usr/lib/go- -Xpackages.orig -Xetc/php.d -Xguestfs-erlang.3 + #dh_missing --fail-missing \ + # -X.la -X.so.owner -Xbindtests -X/usr/lib/go/ -X/usr/lib/go- -Xpackages.orig -Xetc/php.d -Xguestfs-erlang.3 # Add packages (except essential packages) from appliance packagelist # to libguestfs* dependencies