diff -Nru libguestfs-1.46.2/debian/changelog libguestfs-1.46.2/debian/changelog --- libguestfs-1.46.2/debian/changelog 2022-01-01 17:32:00.000000000 +0000 +++ libguestfs-1.46.2/debian/changelog 2022-01-26 06:35:33.000000000 +0000 @@ -1,3 +1,12 @@ +libguestfs (1:1.46.2-4+rpi1) bookworm-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 Wed, 26 Jan 2022 06:35:33 +0000 + libguestfs (1:1.46.2-4) unstable; urgency=medium * Bump Standards-Version, DH compat level, don't require root for build diff -Nru libguestfs-1.46.2/debian/patches/recognise-raspbian.diff libguestfs-1.46.2/debian/patches/recognise-raspbian.diff --- libguestfs-1.46.2/debian/patches/recognise-raspbian.diff 1970-01-01 00:00:00.000000000 +0000 +++ libguestfs-1.46.2/debian/patches/recognise-raspbian.diff 2022-01-26 06:35:33.000000000 +0000 @@ -0,0 +1,11 @@ +--- libguestfs-1.46.2.orig/m4/guestfs-appliance.m4 ++++ libguestfs-1.46.2/m4/guestfs-appliance.m4 +@@ -120,7 +120,7 @@ AM_CONDITIONAL([HAVE_RPM], + [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.46.2/debian/patches/series libguestfs-1.46.2/debian/patches/series --- libguestfs-1.46.2/debian/patches/series 2022-01-01 17:32:00.000000000 +0000 +++ libguestfs-1.46.2/debian/patches/series 2022-01-26 06:35:33.000000000 +0000 @@ -17,3 +17,4 @@ Update-packagelist-as-haxdump-has-been-moved-to-bsdextrau.patch Fix-golang-bindtest-and-check-mli.sh-for-out-of-tree-buil.patch Set-special-CPU-type-on-RISCV64.patch +recognise-raspbian.diff diff -Nru libguestfs-1.46.2/debian/rules libguestfs-1.46.2/debian/rules --- libguestfs-1.46.2/debian/rules 2022-01-01 17:28:34.000000000 +0000 +++ libguestfs-1.46.2/debian/rules 2022-01-26 06:35:33.000000000 +0000 @@ -56,6 +56,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 \ @@ -158,8 +164,8 @@ fi 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