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

diff --cc debian/changelog
index d30f1890ee9e777d142284883258bbba3c0ef08f,2157163291af4ebe2f66826a7784b9890826538a..5e5909830bbf367cd49ef60773b54b76cb0ba20f
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,15 +1,24 @@@
- gambas3 (3.16.3-1+rpi1) bookworm-staging; urgency=medium
++gambas3 (3.16.3-2+rpi1) bookworm-staging; urgency=medium
 +
++  [changes brought forward from 3.16.3-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 30 Sep 2021 17:21:52 +0000]
 +  * Don't use qtwebengine on raspbian.
 +  * Add build conflicts on libcgal-dev, it seems to break the build.
 +  * Fix clean target.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 30 Sep 2021 17:21:52 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 15 Oct 2021 18:11:07 +0000
++
+ gambas3 (3.16.3-2) unstable; urgency=medium
+ 
+   [ Bastian Germann ]
+   * Correct zstd component's description
+   * d/changelog: Correct email in old entry
+   * Set bage's debian.org email
+   * Webview components need gui impl (LP: #1944540)
+ 
+   [ Pino Toscano ]
+   * Limit the Wayland component & packages to Linux only
+ 
+  -- Bastian Germann <bastiangermann@fishpost.de>  Thu, 07 Oct 2021 02:16:48 +0200
  
  gambas3 (3.16.3-1) unstable; urgency=medium
  

diff --cc debian/control
index c989250110b3cc8ec1e2f64983d69bc5f7b25361,1216e62e4a7763ac57ef3c246b1c7877b00fa67a..cc57c2335359d468146a51b417f8cced964437e4
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -896,9 -893,10 +895,10 @@@ Description: Gambas Qt5 X11 componen
   This package allows the QT5 component to access X11.
  
  Package: gambas3-gb-qt5-webview
 -Architecture: amd64 arm64 armhf i386 mips64el mipsel
 +Architecture: amd64 arm64 i386 mips64el mipsel
  Section: kde
  Depends: gambas3-gb-qt5 (>= ${binary:Version}),
+          gambas3-gb-qt5-x11 | gambas3-gb-qt5-wayland,
           ${misc:Depends},
           ${shlibs:Depends}
  Description: Gambas Qt5 Webview component

diff --cc debian/rules
Simple merge