Merge version 2.54.3-1+rpi1 and 2.54.3-1.1 to produce 2.54.3-1.1+rpi1

diff --cc debian/changelog
index 5d1f2dea20b7bbc7624ab98b54976a46d9878c9b,6223ed525e60225776e95fc5d8b999f868c866c8..dc22d524177d387e6301af3dfeee8654b738c77e
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,11 +1,20 @@@
- snapd (2.54.3-1+rpi1) bookworm-staging; urgency=medium
++snapd (2.54.3-1.1+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 2.27.2-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 24 Aug 2017 17:53:18 +0000]
 +  * Treat unknown derivatives the same as Debian.
 +  * Disable testsuite.
 +  * Fix clean target.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Sun, 27 Feb 2022 11:52:31 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 05 Aug 2022 14:27:48 +0000
++
+ snapd (2.54.3-1.1) unstable; urgency=medium
+ 
+   * Non-maintainer upload.
+   * Remove unused Build-Depends and replace transitional packages
+     (Closes: #1014184)
+   * Add patch for failed test with godbus 5.0.5 (Closes: #1008450)
+ 
+  -- Shengjing Zhu <zhsj@debian.org>  Sun, 17 Jul 2022 20:18:10 +0800
  
  snapd (2.54.3-1) unstable; urgency=high