From: Raspbian automatic forward porter <root@raspbian.org>
Date: Wed, 1 Feb 2023 13:06:07 +0000 (+0000)
Subject: Merge version 3.18.0-3+rpi1 and 3.18.0-4 to produce 3.18.0-4+rpi1
X-Git-Tag: archive/raspbian/3.18.0-4+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b49b34d258db74d80270fa507b941352c094514f;p=gambas3.git

Merge version 3.18.0-3+rpi1 and 3.18.0-4 to produce 3.18.0-4+rpi1
---

b49b34d258db74d80270fa507b941352c094514f
diff --cc debian/changelog
index 0e1f1601,ad7dc2c7..278a7bdc
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,9 +1,21 @@@
- gambas3 (3.18.0-3+rpi1) bookworm-staging; urgency=medium
++gambas3 (3.18.0-4+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
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 26 Jan 2023 05:01:56 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 01 Feb 2023 13:06:07 +0000
++
+ gambas3 (3.18.0-4) unstable; urgency=medium
+ 
+   * Change dependencies to guarantee IDE startup
+   * Remove Ian (disappeared) from Uploaders
+ 
+  -- Bastian Germann <bage@debian.org>  Thu, 26 Jan 2023 09:11:56 +0100
  
  gambas3 (3.18.0-3) unstable; urgency=high
  
diff --cc debian/control
index 8d1255ed,d9af48e5..af8fae47
--- a/debian/control
+++ b/debian/control
@@@ -5,11 -5,10 +5,10 @@@ Homepage: http://gambas.sourceforge.ne
  Vcs-Git: https://salsa.debian.org/gambas-team/gambas3.git
  Vcs-Browser: https://salsa.debian.org/gambas-team/gambas3
  Maintainer: Debian Gambas Team <team+debian-gambas@tracker.debian.org>
- Uploaders: Ian Haywood <ian@haywood.id.au>,
-            Bastian Germann <bage@debian.org>,
+ Uploaders: Bastian Germann <bage@debian.org>,
             José L. Redrejo Rodríguez <jredrejo@debian.org>
  Build-Depends: debhelper-compat (= 12),
 -               clang [armel],
 +               clang [armel], gcc-11 [armhf], g++-11 [armhf],
                 gettext,
                 libalure-dev,
                 libbz2-dev,
@@@ -934,10 -930,10 +932,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,
+          gambas3-gb-qt5-x11 (>= ${binary:Version}) | gambas3-gb-qt5-wayland (>= ${binary:Version}),
           ${misc:Depends},
           ${shlibs:Depends}
  Description: Gambas Qt5 Webview component