From: Peter Michael Green Date: Thu, 20 Jun 2024 15:19:29 +0000 (+0000) Subject: Manual merge of version 3.18.0-4+rpi1 and 3.19.1-1 to produce 3.19.1-1+rpi1 X-Git-Tag: archive/raspbian/3.19.1-1+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=7b95f0b7865325eebd90046f7122c54cacf18acd;p=gambas3.git Manual merge of version 3.18.0-4+rpi1 and 3.19.1-1 to produce 3.19.1-1+rpi1 --- 7b95f0b7865325eebd90046f7122c54cacf18acd diff --cc debian/changelog index 278a7bdc,59dcaad2..2ec4224d --- a/debian/changelog +++ b/debian/changelog @@@ -1,14 -1,90 +1,102 @@@ - gambas3 (3.18.0-4+rpi1) bookworm-staging; urgency=medium ++gambas3 (3.19.1-1+rpi1) trixie-staging; urgency=medium + + [changes brought forward from 3.16.3-1+rpi1 by Peter Michael Green 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 Wed, 01 Feb 2023 13:06:07 +0000 ++ -- Peter Michael Green Thu, 20 Jun 2024 15:18:30 +0000 ++ + gambas3 (3.19.1-1) unstable; urgency=medium + + * Team upload + * New upstream version 3.19.1 + * Remove library B-Ds that worked around #960707 (Closes: #1067473) + * Remove kfreebsd leftovers + * Scan git for new versions + + -- Bastian Germann Fri, 22 Mar 2024 17:22:33 +0000 + + gambas3 (3.19.0-2) unstable; urgency=medium + + * Fix lintian warning about pkg-config + * Correct lintian overrides + + -- Bastian Germann Fri, 16 Feb 2024 19:44:32 +0000 + + gambas3 (3.19.0-1) unstable; urgency=medium + + * New upstream version 3.19.0 + * d/copyright: Add new upstream info + * Add new gambas3-gb-highlight + + [ Amin Bandali ] + * patch: make 'gb.pdf' compile with poppler 24.02.0 (Closes: #1063926) + + -- Bastian Germann Thu, 15 Feb 2024 19:19:50 +0000 + + gambas3 (3.18.4-3) unstable; urgency=medium + + * Team upload + + [ Jeremy Bícha ] + * Build with webkit2gtk 4.1 instead of 4.0 + + -- Bastian Germann Thu, 04 Jan 2024 21:56:26 +0100 + + gambas3 (3.18.4-2) unstable; urgency=medium + + * Team upload + * Revert "Drop clang (armel builds with gcc again)" + * Fix lintian: debian-rules-uses-wrong-environment-variable + + -- Bastian Germann Sun, 05 Nov 2023 14:05:42 +0100 + + gambas3 (3.18.4-1) unstable; urgency=medium + + * Team upload + * Drop clang (armel builds with gcc again) + * Drop Bastian from Uploaders + * New upstream version 3.18.4 + + -- Bastian Germann Sat, 04 Nov 2023 23:29:27 +0100 + + gambas3 (3.18.3-1) unstable; urgency=medium + + * New upstream version 3.18.3 + + [ Amin Bandali ] + * Add debian/patches/gb-pdf-poppler-upper-bound.patch to remove the + upper bound on poppler version for gb.pdf, so it could be built + with poppler 23.08.0 and later as well. + + -- Bastian Germann Fri, 18 Aug 2023 22:13:04 +0200 + + gambas3 (3.18.2-3) unstable; urgency=medium + + [ Bas Couwenberg ] + * Don't use qtwebengine5-dev on mipsel; to be removed (Closes: #1041909) + + -- Bastian Germann Tue, 25 Jul 2023 10:07:47 +0200 + + gambas3 (3.18.2-2) unstable; urgency=medium + + * Disable SDL 1.2 components (Closes: #1038356) + * Include gb.geom.component with wildcard + + -- Bastian Germann Mon, 19 Jun 2023 16:32:11 +0200 + + gambas3 (3.18.2-1) unstable; urgency=medium + + * New upstream version 3.18.2 + * Drop transitional packages (Closes: #1032701, #1032702, #1032703, #1032720) + * Let -webkit packages depend on both -x11 and -wayland + * Drop upstream patch + + -- Bastian Germann Wed, 14 Jun 2023 18:14:24 +0200 gambas3 (3.18.0-4) unstable; urgency=medium diff --cc debian/control index af8fae47,4d5d2227..daed870e --- a/debian/control +++ b/debian/control @@@ -5,10 -5,9 +5,9 @@@ 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 - Uploaders: Bastian Germann , - José L. Redrejo Rodríguez + Uploaders: José L. Redrejo Rodríguez Build-Depends: debhelper-compat (= 12), - clang [armel], + clang [armel], gcc-11 [armhf], g++-11 [armhf], gettext, libalure-dev, libbz2-dev, @@@ -64,8 -54,8 +54,8 @@@ libzstd-dev, linux-libc-dev [linux-any], mesa-common-dev, - pkg-config, - qtwebengine5-dev [amd64 arm64 i386 mips64el mipsel], + pkgconf, - qtwebengine5-dev [amd64 arm64 armhf i386 mips64el], ++ qtwebengine5-dev [amd64 arm64 i386 mips64el], unixodbc-dev, xdg-utils, zlib1g-dev @@@ -932,10 -899,10 +901,10 @@@ Description: Gambas Qt5 X11 componen This package allows the QT5 component to access X11. Package: gambas3-gb-qt5-webview - Architecture: amd64 arm64 i386 mips64el mipsel -Architecture: amd64 arm64 armhf i386 mips64el ++Architecture: amd64 arm64 i386 mips64el Section: kde Depends: gambas3-gb-qt5 (>= ${binary:Version}), - gambas3-gb-qt5-x11 (>= ${binary:Version}) | gambas3-gb-qt5-wayland (>= ${binary:Version}), + gambas3-gb-qt5-x11 (>= ${binary:Version}), gambas3-gb-qt5-wayland (>= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} Description: Gambas Qt5 Webview component diff --cc debian/rules index 32198baa,e3c1a460..d5a098c8 --- a/debian/rules +++ b/debian/rules @@@ -17,9 -12,7 +17,7 @@@ DISABLE_MODULES+= --disable-gtk3waylan DISABLE_MODULES+= --disable-v4l endif - ifeq (,$(filter $(DEB_HOST_ARCH),amd64 arm64 i386 mips64el mipsel)) -ifeq (,$(filter $(DEB_HOST_ARCH),amd64 arm64 armhf i386 mips64el)) ++ifeq (,$(filter $(DEB_HOST_ARCH),amd64 arm64 i386 mips64el)) DISABLE_MODULES+= --disable-qt5webview endif