From: Raspbian automatic forward porter Date: Wed, 2 Oct 2024 16:33:48 +0000 (+0100) Subject: Merge version 2.10.1-3+rpi1 and 2.11.1-1 to produce 2.11.1-1+rpi1 X-Git-Tag: archive/raspbian/2.11.1-1+rpi1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4c8b31c2e1bf00f3b44e0801369a1f2e39d4141d;p=labplot.git Merge version 2.10.1-3+rpi1 and 2.11.1-1 to produce 2.11.1-1+rpi1 --- feb73c37ddd781c2a35a937a08cbeddc257e3d35 diff --cc debian/changelog index 3cd829e,a0fac4f..20e7723 --- a/debian/changelog +++ b/debian/changelog @@@ -1,9 -1,30 +1,37 @@@ - labplot (2.10.1-3+rpi1) trixie-staging; urgency=medium ++labplot (2.11.1-1+rpi1) trixie-staging; urgency=medium + + [changes brought forward from 2.9.0-1+rpi1 by Peter Michael Green at Sat, 03 Sep 2022 17:52:39 +0000] + * Don't build against cantor on armhf. + - -- Raspbian forward porter Wed, 19 Jun 2024 07:52:36 +0000 ++ -- Raspbian forward porter Wed, 02 Oct 2024 16:33:48 +0000 ++ + labplot (2.11.1-1) unstable; urgency=medium + + * New upstream release. + * Update the build dependencies according to the upstream build system: + - add liborcus-dev, and libixion-dev + - add libboost-dev as missing dependency of libixion-dev + + -- Pino Toscano Wed, 17 Jul 2024 21:05:08 +0200 + + labplot (2.11.0-1) unstable; urgency=medium + + * New upstream release. + * Update the build dependencies according to the upstream build system: + - bump Qt packages to 5.12.0 + - bump KF packages to 5.32.0 + - add qtbase5-private-dev, libkf5purpose-dev, and libeigen3-dev + - add libqt5sql5-sqlite for tests + * Update the patches: + - upstream_matio-Fix-compilation-for-latest-version-1.5.27.patch: drop, + backported from upstream + * Do not ship development bits (e.g. headers) for now. + * Update install files. + * Update lintian overrides. + * CI: make the build non-verbose, so the build log fits within the salsa + limits. + + -- Pino Toscano Sat, 13 Jul 2024 21:07:39 +0200 labplot (2.10.1-3) unstable; urgency=medium diff --cc debian/control index f2508c8,1894163..c5dd8e7 --- a/debian/control +++ b/debian/control @@@ -8,30 -8,32 +8,32 @@@ Build-Depends: debhelper-compat (= 13) gettext, pkg-kde-tools (>= 0.15.16), pkgconf, - qtbase5-dev (>= 5.10.0~), - libqt5svg5-dev (>= 5.10.0~), - libqt5serialport5-dev (>= 5.10.0~), - extra-cmake-modules (>= 5.16.0~), - libkf5archive-dev (>= 5.16.0), - libkf5completion-dev (>= 5.16.0), - libkf5config-dev (>= 5.16.0), - libkf5configwidgets-dev (>= 5.16.0), - libkf5coreaddons-dev (>= 5.16.0), - libkf5crash-dev (>= 5.16.0), - libkf5doctools-dev (>= 5.16.0), - libkf5i18n-dev (>= 5.16.0), - libkf5iconthemes-dev (>= 5.16.0), - libkf5kio-dev (>= 5.16.0), - libkf5newstuff-dev (>= 5.16.0), - libkf5parts-dev (>= 5.16.0), - libkf5service-dev (>= 5.16.0), - libkf5syntaxhighlighting-dev (>= 5.16.0), - libkf5textwidgets-dev (>= 5.16.0), - libkf5widgetsaddons-dev (>= 5.16.0), - libkf5xmlgui-dev (>= 5.16.0), + qtbase5-dev (>= 5.12.0~), + qtbase5-private-dev (>= 5.12.0~), + libqt5svg5-dev (>= 5.12.0~), + libqt5serialport5-dev (>= 5.12.0~), + extra-cmake-modules (>= 5.32.0~), + libkf5archive-dev (>= 5.32.0~), + libkf5completion-dev (>= 5.32.0~), + libkf5config-dev (>= 5.32.0~), + libkf5configwidgets-dev (>= 5.32.0~), + libkf5coreaddons-dev (>= 5.32.0~), + libkf5crash-dev (>= 5.32.0~), + libkf5doctools-dev (>= 5.32.0~), + libkf5i18n-dev (>= 5.32.0~), + libkf5iconthemes-dev (>= 5.32.0~), + libkf5kio-dev (>= 5.32.0~), + libkf5newstuff-dev (>= 5.32.0~), + libkf5parts-dev (>= 5.32.0~), + libkf5purpose-dev (>= 5.32.0~), + libkf5service-dev (>= 5.32.0~), + libkf5syntaxhighlighting-dev (>= 5.32.0~), + libkf5textwidgets-dev (>= 5.32.0~), + libkf5widgetsaddons-dev (>= 5.32.0~), + libkf5xmlgui-dev (>= 5.32.0~), kuserfeedback-dev, bison, - libcantor-dev [amd64 arm64 armhf i386 mips64el], + libcantor-dev [amd64 arm64 i386 mips64el], libpoppler-qt5-dev (>= 19.12~), libspectre-dev, libcfitsio-dev,