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

diff --cc debian/changelog
index f903b50ba9758625e792c07ed0362b935946eb90,9083e0e17f00f8ff98aeb703ed457739c440bf29..a422362594bc80fc2e37cdba59523284d43a2a12
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,11 +1,23 @@@
- gambas3 (3.20.4-1+rpi1) forky-staging; urgency=medium
++gambas3 (3.20.4-2+rpi1) forky-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
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sat, 17 Jan 2026 14:34:10 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 23 May 2026 02:21:37 +0000
++
+ gambas3 (3.20.4-2) unstable; urgency=medium
+ 
+   * Team upload
+ 
+   [ Alessandro Astone ]
+   * d/p: Fix build against poppler 26.01 (Closes: #1135576)
+ 
+  -- Bastian Germann <bage@debian.org>  Sat, 16 May 2026 11:28:07 +0200
  
  gambas3 (3.20.4-1) unstable; urgency=medium