Merge version 18.3-1+rpi1 and 18.3-2 to produce 18.3-2+rpi1

diff --cc debian/changelog
index 55e0f3cd7292b83756e62120b9051455edfe2291,b962f2bad83d58ea93e88483c8de69161d4fdf1e..ebfdb6f2faef0866fd2f71a294a77d8ab0c9e324
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,10 +1,18 @@@
- pentobi (18.3-1+rpi1) bullseye-staging; urgency=medium
++pentobi (18.3-2+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 16.2-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 13 Jul 2019 13:40:59 +0000]
 +  * Remove armhf from qtwebview (qtwebengine) architecture list because we
 +    don't have qtwebengine in raspbian.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Tue, 01 Dec 2020 22:33:59 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 28 Oct 2021 18:24:26 +0000
++
+ pentobi (18.3-2) unstable; urgency=medium
+ 
+   * Team upload.
+   * Declare compliance with Debian Policy 4.6.0.
+   * Fix FTBFS with GCC 11. (Closes: #984290)
+ 
+  -- Markus Koschany <apo@debian.org>  Fri, 22 Oct 2021 00:11:53 +0200
  
  pentobi (18.3-1) unstable; urgency=medium
  

diff --cc debian/control
Simple merge