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

diff --cc debian/changelog
index a94ab1177caad7996e90e562d5271253f285ca2e,0b8f3ee6f42db254742c5f6e6ef24d7ec1282b01..31a0f4e486e1a5bc8067ff696cd733db1d835bb6
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,21 -1,9 +1,28 @@@
- libguestfs (1:1.54.1-1+rpi1) trixie-staging; urgency=medium
++libguestfs (1:1.54.1-2+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.
 +
 +  [changes introduced in 1:1.50.1-4+rpi1 by Peter Michael Green]
 +  * Add build-conflicts on rustc.
 +
 +  [changes introduced in 1:1.52.2-7+rpi1 by Peter Michael Green]
 +  * disable some translations due to build failures.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Wed, 05 Mar 2025 02:44:14 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 02 Jun 2025 00:28:27 +0000
++
+ libguestfs (1:1.54.1-2) unstable; urgency=medium
+ 
+   * Replace isc-dhcp-client build-dependency with dhcpcd-base.
+     Thanks to Bastian Blank (Closes: #1106125)
+ 
+  -- Hilko Bengen <bengen@debian.org>  Sat, 24 May 2025 21:31:19 +0200
  
  libguestfs (1:1.54.1-1) unstable; urgency=medium
  

diff --cc debian/control
Simple merge