Manual merge of version 1:1.48.6-1+rpi1 and 1:1.50.1-4 to produce 1:1.50.1-4+rpi1

diff --cc debian/changelog
index d0663fe09f5960f3c66c1327f8e0dce3d41c1d63,e8565e54eab633e3ca43b4ba25edc15cc93e0ac3..87be8acd4a9016bf3845b883968839973d467553
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,50 +1,63 @@@
- libguestfs (1:1.48.6-1+rpi1) bookworm-staging; urgency=medium
++libguestfs (1:1.50.1-4+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 1:1.42.0-11+rpi1 by Peter Michael Green <plugwash@raspbian.org> 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 <root@raspbian.org>  Thu, 08 Dec 2022 18:19:00 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Fri, 17 Nov 2023 00:30:45 +0000
++
+ libguestfs (1:1.50.1-4) unstable; urgency=medium
+ 
+   * Fix timestamp specification in tar --mtime parameter.
+     This should fix those mysterious 32bit build failures for good.
+ 
+  -- Hilko Bengen <bengen@debian.org>  Mon, 24 Jul 2023 22:48:10 +0200
+ 
+ libguestfs (1:1.50.1-3) unstable; urgency=medium
+ 
+   * Bump Standards-Version
+   * Re-enable tests on i386, armhf while setting TMPDIR
+ 
+  -- Hilko Bengen <bengen@debian.org>  Sun, 23 Jul 2023 13:33:37 +0200
+ 
+ libguestfs (1:1.50.1-2) unstable; urgency=medium
+ 
+   * Disable tests on i386, armhf as a quick workaround, closes: #1037541
+ 
+  -- Hilko Bengen <bengen@debian.org>  Mon, 26 Jun 2023 16:15:12 +0200
+ 
+ libguestfs (1:1.50.1-1) unstable; urgency=medium
+ 
+   * Upload to unstable
+   * Fix typo in old changelog entry
+ 
+  -- Hilko Bengen <bengen@debian.org>  Sun, 11 Jun 2023 23:53:03 +0200
+ 
+ libguestfs (1:1.50.1-1~exp1) experimental; urgency=medium
+ 
+   * New upstream version 1.50.1
+   * Improve Build-Depends for cross builds, thanks to Helmut Grohne (Closes: #1032504)
+   * Rebase patches
+   * Add augeas-ocaml build-dependency
+   * Use SOURCE_DATE_EPOCH for reproducible timestamp
+   * Update symbols file
+   * Fix Lintian warnings
+ 
+  -- Hilko Bengen <bengen@debian.org>  Fri, 07 Apr 2023 23:36:04 +0200
+ 
+ libguestfs (1:1.48.6-2) unstable; urgency=medium
+ 
+   * Add Brazilian Portuguese debconf translation, thanks to
+     Paulo Henrique de Lima Santana (Closes: #1025726)
+   * Disable tests (quickcheck) on s390x. Closes: #1030511
+   * Replace libncurses*-dev build-dependencies
+ 
+  -- Hilko Bengen <bengen@debian.org>  Mon, 06 Mar 2023 15:29:41 +0100
  
  libguestfs (1:1.48.6-1) unstable; urgency=medium
  

diff --cc debian/control
Simple merge

diff --cc debian/patches/series
index 3f57f5a7e95f99ac1a3a45762ee49064f4c2876e,ef6109463c8e2397ec8b752b80ff8c7f9ce9d420..9a2b09dc4c1375a160de74c6c2c5bacd7e3a6787
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -15,6 -15,5 +15,6 @@@ Make-sure-that-generated-ocaml-link.sh-
  Fix-out-of-tree-build-for-po.patch
  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
+ Don-t-set-CPU-type-on-mips.patch
  Fix-include-path-for-guestfish.1.patch
 +recognise-raspbian.diff

diff --cc debian/rules
Simple merge

diff --cc m4/guestfs-appliance.m4
Simple merge