Merge version 1:1.48.4-2+rpi1 and 1:1.48.5-2 to produce 1:1.48.5-2+rpi1

diff --cc debian/changelog
index 6ab8ae94c2254cc8693c9b09c930b477df2028d2,ff38604d1fa60e5ab7253aa6e977db3d8dea663b..98f46e797b8fcba03e1b67676cff428ebcf14dc8
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,19 +1,32 @@@
- libguestfs (1:1.48.4-2+rpi1) bookworm-staging; urgency=medium
++libguestfs (1:1.48.5-2+rpi1) bookworm-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>  Sun, 07 Aug 2022 03:20:02 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 03 Dec 2022 14:39:15 +0000
++
+ libguestfs (1:1.48.5-2) unstable; urgency=medium
+ 
+   * Drop patch
+   * Add zstd build dependency
+   * Set correct python install dir
+   * Add patch to fix building guestfish.1 manpage
+ 
+  -- Hilko Bengen <bengen@debian.org>  Sat, 26 Nov 2022 16:48:44 +0100
+ 
+ libguestfs (1:1.48.5-1) unstable; urgency=medium
+ 
+   * New upstream version 1.48.5
+   * Don't build-depend on gjs on armel (Closes: #1018819)
+   * Update patchset
+ 
+  -- Hilko Bengen <bengen@debian.org>  Tue, 22 Nov 2022 10:58:16 +0100
  
  libguestfs (1:1.48.4-2) unstable; urgency=medium
  

diff --cc debian/control
index 8c3c1fb0ad41737c5495d65e83ff1e544c60308c,e73adf998bc8bcfbc0ac9fa33269426af1a9ddd2..537e06b92a72b63ec298356a7c4b3a1df1d07234
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -20,6 -20,6 +20,7 @@@ Build-Depends: debhelper-compat (= 13)
    libyara-dev,
    automake, autoconf, libtool,
    fdisk | util-linux (<< 2.29.2-3~),
++  fdisk,
    gperf, libxml2-utils,
    qemu-system-arm [armel armhf arm64],
    qemu-system-mips [mips mipsel mips64 mips64el],
@@@ -64,7 -72,7 +65,6 @@@
    exfatprogs,
    extlinux [i386 amd64],
    f2fs-tools,
--  fdisk,
    file,
    gawk,
    gdisk,

diff --cc debian/patches/series
index aebe047ab4dfceda97bccc171c0b71b7ef250bdc,5d8562ccb745619139e1232691e434a4ffbed489..3f57f5a7e95f99ac1a3a45762ee49064f4c2876e
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -17,4 -16,4 +16,5 @@@ Fix-out-of-tree-build-for-po.patc
  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
+ Fix-include-path-for-guestfish.1.patch
 +recognise-raspbian.diff

diff --cc debian/rules
Simple merge

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