Manual merge of version 1.48.2-1+rpi1+deb12u1 and 1.52.3-1 to produce 1.52.3-1+rpi1

diff --cc debian/changelog
index 28cd6a53f75fa8adc57c04dd73b5283e730c1462,3dca0e0891c0d0d92a18d5d6301db1b7aa4da157..e53b469a76a47a4e4dff2ffc767627a40977ebf9
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,21 -1,120 +1,130 @@@
- guestfs-tools (1.48.2-1+rpi1+deb12u1) bookworm-staging; urgency=medium
++guestfs-tools (1.52.3-1+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 1.46.1-4+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Fri, 28 Jan 2022 00:01:59 +0000]
 +  * Disable testsuite and remove test-only build-dependencies.
 +
 +  [changes introduced in 1.48.1-1+rpi1 by Peter Michael Green]
 +  * Add build-depends on qmeu-tools.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Mon, 05 Jun 2023 03:49:03 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Fri, 04 Jul 2025 07:08:36 +0000
 +
- guestfs-tools (1.48.2-1+deb12u1) bookworm-security; urgency=high
+ guestfs-tools (1.52.3-1) unstable; urgency=medium
  
-   * Non-maintainer upload by the Security Team.
+   * New upstream version 1.52.3
+ 
+  -- Hilko Bengen <bengen@debian.org>  Wed, 19 Feb 2025 12:08:52 +0100
+ 
+ guestfs-tools (1.52.2-4) unstable; urgency=medium
+ 
+   * Drop kernel build-dependency for i386
+ 
+  -- Hilko Bengen <bengen@debian.org>  Sat, 01 Feb 2025 17:11:41 +0100
+ 
+ guestfs-tools (1.52.2-3) unstable; urgency=medium
+ 
+   * Fix AppArmor policy file (Closes: #1093780)
+ 
+  -- Hilko Bengen <bengen@debian.org>  Wed, 22 Jan 2025 20:34:06 +0100
+ 
+ guestfs-tools (1.52.2-2) unstable; urgency=medium
+ 
+   [ Stefano Brivio ]
+   * Introduce AppArmor profile (Closes: #1086844)
  
    [ Hilko Bengen ]
-   * Add libguestfs-common patch, fixing CVE-2022-2211 (Closes: #1014764)
+   * Add build-dependency for AppArmor profile
+ 
+  -- Hilko Bengen <bengen@debian.org>  Wed, 27 Nov 2024 21:31:37 +0100
+ 
+ guestfs-tools (1.52.2-1) unstable; urgency=medium
+ 
+   * New upstream version 1.52.2
+   * Remove obsolete patch
+   * Update build-dependencies
+   * Remove obsolete lintian overrides
+   * Disable test
+ 
+  -- Hilko Bengen <bengen@debian.org>  Sat, 05 Oct 2024 22:35:42 +0200
+ 
+ guestfs-tools (1.52.0-4) unstable; urgency=medium
+ 
+   * Apply upstream patch to remove sparsify test (Closes: #1078282)
+ 
+  -- Hilko Bengen <bengen@debian.org>  Wed, 21 Aug 2024 20:34:14 +0200
+ 
+ guestfs-tools (1.52.0-3) unstable; urgency=medium
+ 
+   * rpi kernel as armel build dependency.
+     Thanks to Peter Green (Closes: #1072980)
+ 
+  -- Hilko Bengen <bengen@debian.org>  Tue, 11 Jun 2024 13:07:24 +0200
+ 
+ guestfs-tools (1.52.0-2) unstable; urgency=medium
+ 
+   * Disable tests that use the network
+ 
+  -- Hilko Bengen <bengen@debian.org>  Tue, 09 Jan 2024 01:35:38 +0100
+ 
+ guestfs-tools (1.52.0-1) unstable; urgency=medium
+ 
+   * New upstream version 1.52.0
+   * Ensure that package can be rebuilt from source after successful build
+     (Closes: #1045072)
+ 
+  -- Hilko Bengen <bengen@debian.org>  Sun, 07 Jan 2024 22:42:07 +0100
+ 
+ guestfs-tools (1.50.1-4) unstable; urgency=medium
+ 
+   * Disable tests on i386 for now
+ 
+  -- Hilko Bengen <bengen@debian.org>  Thu, 29 Jun 2023 10:00:45 +0200
+ 
+ guestfs-tools (1.50.1-3) unstable; urgency=medium
+ 
+   * Make tests verbose: dump log on test failure
+ 
+  -- Hilko Bengen <bengen@debian.org>  Thu, 29 Jun 2023 00:58:11 +0200
+ 
+ guestfs-tools (1.50.1-2) unstable; urgency=medium
+ 
+   * Disable tests that fail on some architectures
+ 
+  -- Hilko Bengen <bengen@debian.org>  Wed, 28 Jun 2023 15:44:14 +0200
+ 
+ guestfs-tools (1.50.1-1) unstable; urgency=medium
+ 
+   * New upstream version 1.50.1
+   * Drop patch
+   * Update build-dependencies
+ 
+  -- Hilko Bengen <bengen@debian.org>  Mon, 12 Jun 2023 14:49:18 +0200
+ 
+ guestfs-tools (1.48.3-4) unstable; urgency=medium
+ 
+   * Disable test-virt-resize.pl
+   * Add libguestfs-common patch, fixing CVE-2022-2211. Closes: #1014764
+ 
+  -- Hilko Bengen <bengen@debian.org>  Mon, 10 Apr 2023 14:18:02 +0200
+ 
+ guestfs-tools (1.48.3-3) unstable; urgency=medium
+ 
+   * Remove s390x from test architectures
+ 
+  -- Hilko Bengen <bengen@debian.org>  Mon, 20 Mar 2023 01:07:58 +0100
+ 
+ guestfs-tools (1.48.3-2) unstable; urgency=medium
+ 
+   * Disable test-virt-builder.sh (Closes: ##1031471)
+   * Replace obsolete libtinfo-dev build-dependency
+ 
+  -- Hilko Bengen <bengen@debian.org>  Tue, 21 Feb 2023 01:06:21 +0100
+ 
+ guestfs-tools (1.48.3-1) unstable; urgency=medium
+ 
+   * New upstream version 1.48.3
+   * Update Lintian overriides (syntax)
  
-  -- Salvatore Bonaccorso <carnil@debian.org>  Tue, 23 May 2023 22:19:49 +0200
+  -- Hilko Bengen <bengen@debian.org>  Thu, 12 Jan 2023 10:56:31 +0100
  
  guestfs-tools (1.48.2-1) unstable; urgency=medium
  

diff --cc debian/control
index 352aa72bd65519c143fc3c6541f3e735670a7f31,1b83c26da3ef17d13b610a1cdbeb307a6a86a256..20ee810dc0a18f61e8afaaaf8a778dff1c86c744
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -27,7 -29,24 +29,8 @@@ Build-Depends: debhelper-compat (= 13)
   xorriso,
   xz-utils,
   bash-completion,
 - guestfish (>> 1:1.46) <!nocheck>,
 - ipxe-qemu <!nocheck>,
 - libxml2-utils <!nocheck>,
 - linux-image-alpha-generic [alpha] <!nocheck>,
+  linux-image-rpi [armel] <!nocheck> | linux-image-marvell [armel] <!nocheck> | linux-image-versatile [armel] <!nocheck>,
 - linux-image-armmp [armhf] <!nocheck>,
 - linux-image-arm64 [arm64] <!nocheck>,
 - linux-image-4kc-malta [mips mipsel] <!nocheck> | linux-image-5kc-malta [mips mipsel] <!nocheck>,
 - linux-image-5kc-malta [mips64 mips64el] <!nocheck>,
 - linux-image-s390x [s390x] <!nocheck>,
 - linux-image-parisc [hppa] <!nocheck>,
 - linux-image-powerpc [powerpc] <!nocheck>,
 - linux-image-powerpc64 [ppc64] <!nocheck>,
 - linux-image-powerpc64le [ppc64el] <!nocheck>,
 - linux-image-sparc64 [sparc sparc64] <!nocheck>,
 - linux-image-amd64 [amd64 x32] <!nocheck>,
 - linux-image-riscv64 [riscv64] <!nocheck>,
 - linux-image-itanium [ia64] <!nocheck> | linux-image-mckinley [ia64] <!nocheck>,
 + qemu-utils
  Standards-Version: 4.6.0
  Homepage: https://libguestfs.org
  Vcs-Browser: https://salsa.debian.org/libvirt-team/guestfs-tools

diff --cc debian/rules
index 077962799ba86a013419bcd68e2c0db8fb809ff6,fe778c21a1306f2a0b0aafb76b01557783d1fdf1..95bafaaa29c5b3bd045fe8aff9804681d4311ef0
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -12,8 -12,20 +12,20 @@@ include /usr/share/dpkg/architecture.m
  # Disable because the test seems to hang.
  export SKIP_RHBZ1285847_SH=1
  export SKIP_TEST_VIRT_SYSPREP_SCRIPT_SH=1
+ export SKIP_TEST_VIRT_BUILDER_SH=1
+ export SKIP_TEST_VIRT_DIFF_SH=1 # failed on i386, riscv64
+ export SKIP_TEST_VIRT_FILESYSTEMS_SH=1 # failed on ppc64
+ export SKIP_TEST_VIRT_RESIZE_PL=1
+ 
+ # Disable because the tests use the network
+ export SKIP_TEST_VIRT_BUILDER_CACHEALL_SH=1
+ export SKIP_TEST_VIRT_BUILDER_LIST_SH=1
+ export SKIP_TEST_VIRT_BUILDER_LIST_SIMPLESTREAMS_SH=1
+ 
+ # Apparently fails on warning "program compiled against libxml 212 using older 209"
+ export SKIP_TEST_MACHINE_READABLE_SH=1
  
 -TEST_ARCHITECTURES := amd64 arm64 riscv64 ppc64el
 +TEST_ARCHITECTURES :=
  
  %:
        dh $@