diff -Nru gambas3-3.18.0/debian/changelog gambas3-3.18.0/debian/changelog
--- gambas3-3.18.0/debian/changelog	2023-01-26 08:11:56.000000000 +0000
+++ gambas3-3.18.0/debian/changelog	2023-02-04 09:09:23.000000000 +0000
@@ -1,3 +1,10 @@
+gambas3 (3.18.0-4ubuntu1) lunar; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Use gcc-11 for now to fix a strange armhf build failure
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Sat, 04 Feb 2023 10:09:23 +0100
+
 gambas3 (3.18.0-4) unstable; urgency=medium
 
   * Change dependencies to guarantee IDE startup
@@ -12,6 +19,13 @@
 
  -- Bastian Germann <bage@debian.org>  Mon, 23 Jan 2023 16:32:17 +0100
 
+gambas3 (3.18.0-2ubuntu1) lunar; urgency=medium
+
+  * Sync with Debian. Remaining change:
+    - Use gcc-11 for now to fix a strange armhf build failure
+
+ -- Jeremy Bicha <jbicha@ubuntu.com>  Fri, 20 Jan 2023 18:46:02 -0500
+
 gambas3 (3.18.0-2) unstable; urgency=medium
 
   * Add reserved font names
@@ -26,6 +40,18 @@
 
  -- Bastian Germann <bage@debian.org>  Mon, 16 Jan 2023 18:32:36 +0100
 
+gambas3 (3.17.3-2ubuntu2) lunar; urgency=medium
+
+  * Rebuild against latest poppler
+
+ -- Jeremy Bicha <jbicha@ubuntu.com>  Sun, 18 Dec 2022 08:30:12 -0500
+
+gambas3 (3.17.3-2ubuntu1) kinetic; urgency=medium
+
+  * Use gcc-11 for now to fix a strange armhf build failure
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 02 Sep 2022 11:20:53 +0200
+
 gambas3 (3.17.3-2) unstable; urgency=medium
 
   * Patch: Import pcre2 variant when configured to use it (Closes: #1018019)
diff -Nru gambas3-3.18.0/debian/control gambas3-3.18.0/debian/control
--- gambas3-3.18.0/debian/control	2023-01-26 08:11:56.000000000 +0000
+++ gambas3-3.18.0/debian/control	2023-02-04 09:09:23.000000000 +0000
@@ -7,7 +7,7 @@
 Maintainer: Debian Gambas Team <team+debian-gambas@tracker.debian.org>
 Uploaders: Bastian Germann <bage@debian.org>,
            José L. Redrejo Rodríguez <jredrejo@debian.org>
-Build-Depends: debhelper-compat (= 12),
+Build-Depends: debhelper-compat (= 12), gcc-11 [armhf], g++-11 [armhf],
                clang [armel],
                gettext,
                libalure-dev,
diff -Nru gambas3-3.18.0/debian/rules gambas3-3.18.0/debian/rules
--- gambas3-3.18.0/debian/rules	2023-01-26 08:11:56.000000000 +0000
+++ gambas3-3.18.0/debian/rules	2023-01-26 15:39:07.000000000 +0000
@@ -1,5 +1,10 @@
 #!/usr/bin/make -f
 
+ifeq (armhf,$(DEB_HOST_ARCH))
+  export CC=gcc-11
+  export CXX=g++-11
+endif
+
 #export DH_VERBOSE=1
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 export XDG_DATA_HOME=$(CURDIR)/debian/tmp/usr/share