Merge version 1.36.3-1+rpi1 and 1.38.2-2 to produce 1.38.2-2+rpi1

diff --cc debian/changelog
index ac8084a140d5c0cf3202f5a007bc15eb7358b566,51103bce60da66e59ff1f9c3d712b7cefa5c036d..d920e06a21e7af987d9f0068b4a28b0e881edf53
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,33 +1,41 @@@
- nbdkit (1.36.3-1+rpi1) trixie-staging; urgency=medium
++nbdkit (1.38.2-2+rpi1) trixie-staging; urgency=medium
 +
++  [changes brought forward from 1.36.3-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Tue, 06 Feb 2024 14:42:36 +0000]
 +  * Remove build-dependency on linux-image-armmp.
 +  * Disable testsuite.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Tue, 06 Feb 2024 14:42:36 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 17 Jun 2024 02:35:52 +0000
++
+ nbdkit (1.38.2-2) unstable; urgency=medium
+ 
+   * Allow -rpi kernel to be used for running tests on armel (Closes: #1070769)
+ 
+  -- Hilko Bengen <bengen@debian.org>  Fri, 10 May 2024 12:38:26 +0200
+ 
+ nbdkit (1.38.2-1) unstable; urgency=medium
+ 
+   * New upstream version 1.38.2
+   * Rebase patches
+ 
+  -- Hilko Bengen <bengen@debian.org>  Wed, 08 May 2024 11:06:53 +0200
+ 
+ nbdkit (1.38.1-1) unstable; urgency=medium
+ 
+   * New upstream version 1.38.1
+ 
+  -- Hilko Bengen <bengen@debian.org>  Sun, 21 Apr 2024 18:37:33 +0200
+ 
+ nbdkit (1.38.0-1) unstable; urgency=medium
+ 
+   * New upstream version 1.38.0
+   * Remove __pycache__ directories on clean (Closes: #1047305)
+   * Add build-dependencies to test libguestfs backend on loong64.
+     Thanks to Dandan Zhang (Closes: #1060136)
+   * Update patches
+   * Add gcs plugin to install list
+   * Fix pkgconf build-dependency
+ 
+  -- Hilko Bengen <bengen@debian.org>  Fri, 05 Apr 2024 14:51:42 +0200
  
  nbdkit (1.36.3-1) unstable; urgency=medium
  

diff --cc debian/control
index f99298432dd290abf380b6bbca50263220354e48,150e3a3b3915a69212f367d38b845ca2f33f2381..469e1cebcfc2e0300ffe24ace8127c52312ca89e
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -27,7 -27,8 +27,7 @@@ Build-Depends: debhelper-compat (= 12)
   zlib1g-dev,
   libzstd-dev,
   linux-image-amd64 [amd64] <!nocheck>,
-  linux-image-marvell [armel] <!nocheck>,
+  linux-image-rpi [armel] <!nocheck> | linux-image-marvell [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>,
@@@ -47,8 -49,8 +48,8 @@@
   expect <!nocheck>,
   bsdextrautils <!nocheck>,
   openssh-server <!nocheck>,
-- qemu-utils <!nocheck>,
   openssh-server <!nocheck>,
++ qemu-utils <!nocheck>,
  Standards-Version: 4.5.0
  Homepage: https://github.com/libguestfs/nbdkit
  Vcs-Git: https://salsa.debian.org/debian/nbdkit.git