diff -Nru guestfs-tools-1.48.0/debian/changelog guestfs-tools-1.48.0/debian/changelog --- guestfs-tools-1.48.0/debian/changelog 2022-03-15 10:10:37.000000000 +0000 +++ guestfs-tools-1.48.0/debian/changelog 2022-03-29 19:14:39.000000000 +0000 @@ -1,3 +1,10 @@ +guestfs-tools (1.48.0-1+rpi1) bookworm-staging; urgency=medium + + [changes brought forward from 1.46.1-4+rpi1 by Peter Michael Green at Fri, 28 Jan 2022 00:01:59 +0000] + * Disable testsuite and remove test-only build-dependencies. + + -- Peter Michael Green Tue, 29 Mar 2022 19:14:39 +0000 + guestfs-tools (1.48.0-1) unstable; urgency=medium * New upstream version 1.48.0 diff -Nru guestfs-tools-1.48.0/debian/control guestfs-tools-1.48.0/debian/control --- guestfs-tools-1.48.0/debian/control 2022-01-15 12:47:23.000000000 +0000 +++ guestfs-tools-1.48.0/debian/control 2022-03-29 19:14:39.000000000 +0000 @@ -27,25 +27,6 @@ xorriso, xz-utils, bash-completion, - guestfish (>> 1:1.46) , - ipxe-qemu , - libxml2-utils , - linux-image-alpha-generic [alpha] , - linux-image-marvell [armel] | linux-image-versatile [armel] , - linux-image-armmp [armhf] , - linux-image-arm64 [arm64] , - linux-image-4kc-malta [mips mipsel] | linux-image-5kc-malta [mips mipsel] , - linux-image-5kc-malta [mips64 mips64el] , - linux-image-s390x [s390x] , - linux-image-parisc [hppa] , - linux-image-powerpc [powerpc] , - linux-image-powerpc64 [ppc64] , - linux-image-powerpc64le [ppc64el] , - linux-image-sparc64 [sparc sparc64] , - linux-image-amd64 [amd64 x32] , - linux-image-686-pae [i386] | linux-image-586 [i386] | linux-image-486 [i386] , - linux-image-riscv64 [riscv64] , - linux-image-itanium [ia64] | linux-image-mckinley [ia64] , Standards-Version: 4.6.0 Homepage: https://libguestfs.org Vcs-Browser: https://salsa.debian.org/libvirt-team/guestfs-tools diff -Nru guestfs-tools-1.48.0/debian/rules guestfs-tools-1.48.0/debian/rules --- guestfs-tools-1.48.0/debian/rules 2022-01-16 19:06:34.000000000 +0000 +++ guestfs-tools-1.48.0/debian/rules 2022-03-29 19:14:39.000000000 +0000 @@ -13,7 +13,7 @@ export SKIP_RHBZ1285847_SH=1 export SKIP_TEST_VIRT_SYSPREP_SCRIPT_SH=1 -TEST_ARCHITECTURES := i386 amd64 arm64 riscv64 ppc64el s390x +TEST_ARCHITECTURES := %: dh $@