diff -Nru libguestfs-1.48.0/debian/changelog libguestfs-1.48.0/debian/changelog --- libguestfs-1.48.0/debian/changelog 2022-03-21 14:53:46.000000000 +0000 +++ libguestfs-1.48.0/debian/changelog 2022-03-24 23:46:34.000000000 +0000 @@ -1,3 +1,16 @@ +libguestfs (1:1.48.0-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. + + [changes introduced in 1:1.46.2-11+rpi1 by Peter Michael Green] + * Remove testsuite-specific build-dependencies. + * Disable testsuite. + + -- Raspbian forward porter Thu, 24 Mar 2022 23:46:34 +0000 + libguestfs (1:1.48.0-4) unstable; urgency=medium * autopkgtest: Fix QEMU_FLAVOR (dumb mistake) diff -Nru libguestfs-1.48.0/debian/control libguestfs-1.48.0/debian/control --- libguestfs-1.48.0/debian/control 2022-03-16 09:03:22.000000000 +0000 +++ libguestfs-1.48.0/debian/control 2022-03-24 23:46:34.000000000 +0000 @@ -41,7 +41,7 @@ libstring-shellquote-perl, libsys-virt-perl, libwin-hivex-perl, libfuse-dev, fuse, - libglib2.0-dev, gjs [!s390x] , gobject-introspection, libgirepository1.0-dev, + libglib2.0-dev, gobject-introspection, libgirepository1.0-dev, libgtk-3-dev, db-util, netpbm, icoutils, @@ -49,14 +49,6 @@ flex, bison, golang-go [i386 amd64 armel armhf arm64 mips mipsel mips64el ppc64el], dh-php, php-all-dev | php5-dev, -# for testing (make quickcheck) - linux-image-amd64 [amd64] , - linux-image-armmp [armhf] , - linux-image-arm64 [arm64] , - linux-image-686-pae [i386] | linux-image-586 [i386] | linux-image-486 [i386] , - linux-image-powerpc64le [ppc64el] , - linux-image-riscv64 [riscv64] , - linux-image-s390x [s390x] , #-# appliance start acl, attr, diff -Nru libguestfs-1.48.0/debian/patches/recognise-raspbian.diff libguestfs-1.48.0/debian/patches/recognise-raspbian.diff --- libguestfs-1.48.0/debian/patches/recognise-raspbian.diff 1970-01-01 00:00:00.000000000 +0000 +++ libguestfs-1.48.0/debian/patches/recognise-raspbian.diff 2022-03-24 23:46:34.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.48.0/debian/patches/series libguestfs-1.48.0/debian/patches/series --- libguestfs-1.48.0/debian/patches/series 2022-03-16 10:52:16.000000000 +0000 +++ libguestfs-1.48.0/debian/patches/series 2022-03-24 23:46:34.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-don-t-set-CPU-type-on-mip.patch +recognise-raspbian.diff diff -Nru libguestfs-1.48.0/debian/rules libguestfs-1.48.0/debian/rules --- libguestfs-1.48.0/debian/rules 2022-03-16 09:03:22.000000000 +0000 +++ libguestfs-1.48.0/debian/rules 2022-03-24 23:46:34.000000000 +0000 @@ -49,13 +49,19 @@ -e 's,arm.*,arm,') # Run "make quickcheck" only on these architectures -QUICKCHECK_ARCHITECTURES := i386 amd64 armhf arm64 riscv64 ppc64el s390x +QUICKCHECK_ARCHITECTURES := # Template for generating dh_{clean,configure,build,test} overrides. # $1 is replaced with the build number. 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