Merge version 1:1.44.1-1+rpi1 and 1:1.44.1-2 to produce 1:1.44.1-2+rpi1

diff --cc debian/changelog
index 348feb575687cb08033731a1fffa9f394d15abfa,843a9036ec8c9670d3abad5691b979ee27bc3ba2..2556b8e9ff6671d1f0553694f008253338bb9a28
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,10 +1,19 @@@
- libguestfs (1:1.44.1-1+rpi1) bookworm-staging; urgency=medium
++libguestfs (1:1.44.1-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.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Tue, 24 Aug 2021 21:57:49 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 06 Sep 2021 17:57:29 +0000
++
+ libguestfs (1:1.44.1-2) unstable; urgency=medium
+ 
+   * When building on/for Ubuntu, add code to call dpkg-statoverride to
+     lift restrictive permissions on kernel images
+   * Add patch to fix build in usr-merged environments
+ 
+  -- Hilko Bengen <bengen@debian.org>  Tue, 31 Aug 2021 17:02:19 +0200
  
  libguestfs (1:1.44.1-1) unstable; urgency=medium
  

diff --cc debian/patches/series
index bab4afbd5033124424c07b56beaf5384f5b60fd1,73679d4dd0651599e70501a8ccc2ed261a06920d..159ad85e8dd3df6afc415ebc6782e1c266570b96
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -18,4 -18,4 +18,5 @@@
  0019-Add-support-for-YARA-4.patch
  0019-Fix-out-of-tree-build-for-po.patch
  0020-Update-packagelist-as-haxdump-has-been-moved-to-bsde.patch
+ 0021-appliance-Fix-searching-for-shared-libraries-on-usr-.patch
 +auto-1:1.44.0-1+rpi1-4b5577a431c96e44282e63413b3555bcef626c3a-1610706180

diff --cc debian/rules
index fda58b6f14f9c0268f117a37882b5490a6d2b63d,1065f5bcc9ce323b3a9c0fd909362126014a0319..054f937e136164ec42c7926b91a67f0f58a10544
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -151,9 -145,18 +151,18 @@@ override_dh_install
  
        dh_install -X.la -X.so.owner -Xbindtests -X/usr/lib/go/ -X/usr/lib/go- -Xpackages.orig -Xetc/php.d
  
+       # Workaround for Ubuntu's strict kernel permissions
+       if [ "$$(sed -ne '/^ID=/ { s/^[^=]*=//;p }' /etc/os-release)" = ubuntu ]; then \
+               mkidr -p debian/libguestfs0/etc/kernel/preinst.d debian/libguestfs0/etc/kernel/postrm.d ; \
+               install -m755 debian/libguestfs0.kernel-preinst debian/libguestfs0/etc/kernel/preinst.d/libguestfs0 ; \
+               install -m755 debian/libguestfs0.kernel-postrm  debian/libguestfs0/etc/kernel/postrm.d/libguestfs0  ; \
+               cat debian/libguestfs0.preinst.snippet >> debian/libguestfs0.preinst.debhelper ; \
+               cat debian/libguestfs0.postrm.snippet  >> debian/libguestfs0.postrm.debhelper  ; \
+       fi
+ 
  override_dh_missing:
 -      dh_missing --fail-missing \
 -              -X.la -X.so.owner -Xbindtests -X/usr/lib/go/ -X/usr/lib/go- -Xpackages.orig -Xetc/php.d -Xguestfs-erlang.3
 +      #dh_missing --fail-missing \
 +      #       -X.la -X.so.owner -Xbindtests -X/usr/lib/go/ -X/usr/lib/go- -Xpackages.orig -Xetc/php.d -Xguestfs-erlang.3
  
  # Add packages (except essential packages) from appliance packagelist
  # to libguestfs* dependencies