Merge version 1:1.46.2-4+rpi1 and 1:1.46.2-11 to produce 1:1.46.2-11+rpi1

diff --cc debian/changelog
index 2ec541dc981ca18bb9dd429b9d941a5581569a96,fd6de887532820ca094e35d3571c81981e1fe2a8..6c89b0f15e453c957c8ebf645e5d23df004bd783
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,51 +1,60 @@@
- libguestfs (1:1.46.2-4+rpi1) bookworm-staging; urgency=medium
++libguestfs (1:1.46.2-11+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.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Wed, 26 Jan 2022 06:35:33 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 03 Feb 2022 18:25:46 +0000
++
+ libguestfs (1:1.46.2-11) unstable; urgency=medium
+ 
+   * audopkgtest: add yet another missing dependency
+ 
+  -- Hilko Bengen <bengen@debian.org>  Fri, 28 Jan 2022 16:05:15 +0100
+ 
+ libguestfs (1:1.46.2-10) unstable; urgency=medium
+ 
+   * audopkgtest: add yet another missing dependency
+ 
+  -- Hilko Bengen <bengen@debian.org>  Thu, 27 Jan 2022 00:16:49 +0100
+ 
+ libguestfs (1:1.46.2-9) unstable; urgency=medium
+ 
+   * audopkgtest: add missing dependency
+ 
+  -- Hilko Bengen <bengen@debian.org>  Wed, 26 Jan 2022 13:26:04 +0100
+ 
+ libguestfs (1:1.46.2-8) unstable; urgency=medium
+ 
+   * autopkgtest: remove --mode=root
+ 
+  -- Hilko Bengen <bengen@debian.org>  Wed, 26 Jan 2022 00:02:23 +0100
+ 
+ libguestfs (1:1.46.2-7) unstable; urgency=medium
+ 
+   * Use correct version in removing conffiles (Closes: #1004076, again)
+ 
+  -- Hilko Bengen <bengen@debian.org>  Sun, 23 Jan 2022 16:47:27 +0100
+ 
+ libguestfs (1:1.46.2-6) unstable; urgency=medium
+ 
+   [ Hilko Bengen ]
+   * Fix typo (Closes: #1004127)
+   * Remove virt-builder conffiles (Closes: #1004076)
+   * Fix quickcheck architecture check
+ 
+   [ Johannes 'josch' Schauer ]
+   * Add autopkgtest (Closes: #944729)
+ 
+  -- Hilko Bengen <bengen@debian.org>  Sun, 23 Jan 2022 01:48:11 +0100
+ 
+ libguestfs (1:1.46.2-5) unstable; urgency=medium
+ 
+   * Edit patch: Don't pass -cpu argument to qemu on mips*
+   * Run make quickcheck on more architectures
+ 
+  -- Hilko Bengen <bengen@debian.org>  Sun, 23 Jan 2022 00:50:43 +0100
  
  libguestfs (1:1.46.2-4) unstable; urgency=medium
  

diff --cc debian/patches/series
index 1749f678f708987fa58fbe738647aa9c9d59a11e,592854a75c628bbeb6b783f16f4e60ab122f9366..aebe047ab4dfceda97bccc171c0b71b7ef250bdc
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -16,5 -16,4 +16,5 @@@ 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.patch
+ Set-special-CPU-type-on-RISCV64-don-t-set-CPU-type-on-mip.patch
 +recognise-raspbian.diff

diff --cc debian/rules
Simple merge