Merge version 3.17.3-2+rpi1 and 3.18.0-3 to produce 3.18.0-3+rpi1

diff --cc debian/changelog
index 34984f60fb60ef2bb2a21a7575eb577b094cf085,ab95a96c622b6a4f95ef881eb0844b1650db3b90..0e1f16018ba39ed5e1db20bd8f77469268b102e6
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,23 +1,35 @@@
- gambas3 (3.17.3-2+rpi1) bookworm-staging; urgency=medium
++gambas3 (3.18.0-3+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.
 +
 +  [changes taken from 3.17.3-2ubuntu1 by Gianfranco Costamagna]
 +  * Use gcc-11 for now to fix a strange armhf build failure
 +
-  -- Peter Micheal Green <plugwash@raspbian.org>  Fri, 09 Sep 2022 15:58:13 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 26 Jan 2023 05:01:56 +0000
++
+ gambas3 (3.18.0-3) unstable; urgency=high
+ 
+   * Build armel with clang (gcc 12.2 fails)
+   * Use the correct DEB_HOST_ARCH_OS var for cross compilation
+ 
+  -- Bastian Germann <bage@debian.org>  Mon, 23 Jan 2023 16:32:17 +0100
+ 
+ gambas3 (3.18.0-2) unstable; urgency=medium
+ 
+   * Add reserved font names
+ 
+  -- Bastian Germann <bage@debian.org>  Tue, 17 Jan 2023 21:14:45 +0100
+ 
+ gambas3 (3.18.0-1) unstable; urgency=medium
+ 
+   * New upstream version 3.18.0
+   * gambas3-gb-gtk3-opengl: Install missing files
+   * Add new components
+ 
+  -- Bastian Germann <bage@debian.org>  Mon, 16 Jan 2023 18:32:36 +0100
  
  gambas3 (3.17.3-2) unstable; urgency=medium
  

diff --cc debian/control
index 376b164587b31bbc7c0f193b3054f7ccb2197a6c,65d42ca7dc264dcac4d4040a74346bced23395d5..8d1255ed9483f3d04eaca1ca14f86d455ac51c4b
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -8,7 -8,8 +8,8 @@@ Maintainer: Debian Gambas Team <team+de
  Uploaders: Ian Haywood <ian@haywood.id.au>,
             Bastian Germann <bage@debian.org>,
             José L. Redrejo Rodríguez <jredrejo@debian.org>
- Build-Depends: debhelper-compat (= 12), gcc-11 [armhf], g++-11 [armhf],
+ Build-Depends: debhelper-compat (= 12),
 -               clang [armel],
++               clang [armel], gcc-11 [armhf], g++-11 [armhf],
                 gettext,
                 libalure-dev,
                 libbz2-dev,

diff --cc debian/rules
Simple merge