From: Peter Michael Green Date: Fri, 2 May 2025 01:17:40 +0000 (+0000) Subject: Manual merge of version 5:142+rpi1 and 5:161 to produce 5:161+rpi1 X-Git-Tag: archive/raspbian/5%161+rpi1~1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=2c0f77acce34c4e90709608fce273773b2e85b70;p=meta-kde.git Manual merge of version 5:142+rpi1 and 5:161 to produce 5:161+rpi1 --- 2c0f77acce34c4e90709608fce273773b2e85b70 diff --cc debian/changelog index f4794ef,8797918..1e774b1 --- a/debian/changelog +++ b/debian/changelog @@@ -1,29 -1,162 +1,189 @@@ - meta-kde (5:142+rpi1) bookworm-staging; urgency=medium ++meta-kde (5:161+rpi1) trixie-staging; urgency=medium + + [changes brought forward from 5:93+rpi1 by Peter Michael Green at Sun, 17 Dec 2017 04:35:56 +0000] + * Remove armhf from arch list for kalgebra dependency, sadly we don't + currently have the full kalgebra in Raspbian due to webengine. + + [changes brought forward from 5:98+rpi2 by Peter Michael Green at Wed, 24 Jan 2018 07:36:26 +0000] + * Align dependencies for armhf to those for armel as we don't currently have + qtwebengine in Raspbian. + + [changes brought forward from 5:104+rpi2 by Peter Michael Green at Thu, 11 Jun 2020 23:55:11 +0000] + * Drop kig for now as it depends on boost 1.67 + + [changes brought forward from 5:104+rpi3 by Peter Michael Green at Sun, 28 Jun 2020 17:18:28 +0000] + * Reinstate kig, package is now fixed. + + [changes brought forward from 5:106+rpi2 by Peter Michael Green at Fri, 21 Aug 2020 22:29:17 +0000] + * Remove armhf from the architecture lists for parley and kimagemapeditor + + [changes brought forward from 5:114+rpi2 by Peter Michael Green at Fri, 12 Nov 2021 00:45:45 +0000] + * Remove armhf from the architecture lists for cantor. + + [changes brought forward from 5:126+rpi2 by Peter Michael Green at Thu, 28 Jul 2022 22:38:12 +0000] + * Remove armhf from the architecture list for kdepim-addons. + - -- Raspbian forward porter Sun, 12 Mar 2023 22:15:40 +0000 ++ -- Peter Michael Green Fri, 02 May 2025 01:17:10 +0000 ++ + meta-kde (5:161) unstable; urgency=medium + + * Bump the minimum Plasma version to 4:6.3.4. + + -- Pino Toscano Fri, 04 Apr 2025 06:18:26 +0200 + + meta-kde (5:160) unstable; urgency=medium + + * Bump the minimum kdepim version to 4:24.12.3. + * Simplify GPL license text in debian/copyright. + + -- Pino Toscano Sun, 30 Mar 2025 11:13:43 +0200 + + meta-kde (5:159) unstable; urgency=medium + + * Pull again cantor everywhere but on i386: it requires poppler-qt6, which + is not built on i386. + * Bump the minimum KDE Gear version to 4:24.12.0. + + -- Pino Toscano Thu, 20 Mar 2025 06:28:25 +0100 + + meta-kde (5:158) unstable; urgency=medium + + * Limit again the architectures of cantor to a smaller subset, i.e. + amd64 arm64 armhf; those are the ones in testing, minus i386 from which + cantor will be removed (it requires poppler-qt6, which is not available + on i386). + + -- Pino Toscano Fri, 14 Mar 2025 17:15:47 +0100 + + meta-kde (5:157) unstable; urgency=medium + + * Bump Standards-Version to 4.7.2, no changes required. + * Bump the minimum Plasma version to 4:6.3.2. + * Pull okular on all the architectures again, as it builds fine everywhere + now. + * Pull cantor everywhere but on i386: it requires poppler-qt6, which is not + built on i386. + * Pull parley on all the architectures again, as it builds fine everywhere + now. + * Pull elisa on all the architectures again, as it builds fine everywhere + now. + * Drop the kgamma5 alternative for kgamma, as the component is back as kgamma + now, and thus ensure the newer version is used. + * Bump the minimum kdepim version to 4:24.12.2. + + -- Pino Toscano Fri, 14 Mar 2025 06:35:15 +0100 + + meta-kde (5:156) unstable; urgency=medium + + * Team upload. + + [ Aurélien COUDERC ] + * Remove spectacle from kde-standard / kdegraphics, it’s now part of + Plasma. + + -- Aurélien COUDERC Fri, 28 Feb 2025 09:58:16 +0100 + + meta-kde (5:155) unstable; urgency=medium + + * Team upload. + + [ Aurélien COUDERC ] + * Limit dependencies on konqueror and okular to architectures where + they exist. (Closes: ##1091902). + * Rename build variable to . + + -- Aurélien COUDERC Thu, 02 Jan 2025 16:53:21 +0100 + + meta-kde (5:154) unstable; urgency=medium + + * Depend on khelpcenter only for the QtWebengine architectures. (Closes: + #1091792) + + -- Bastian Germann Tue, 31 Dec 2024 13:47:49 +0000 + + meta-kde (5:153) unstable; urgency=medium + + * Team upload. + + [ Patrick Franz ] + * Limit more KDE PIM packages to archs where they are available. + * Bump the minimum kdepim version to 4:24.12.0. + * Bump the minimum Plasma version to 4:6.2.4. + + -- Patrick Franz Sat, 21 Dec 2024 10:47:40 +0100 + + meta-kde (5:152) unstable; urgency=medium + + * Team upload. + * Drop i386 as an architecture from kdepim-addons as it cannot be + built there. + + -- Patrick Franz Sat, 21 Dec 2024 10:21:53 +0100 + + meta-kde (5:151) unstable; urgency=medium + + * Team upload. + + [ Aurélien COUDERC ] + * Remove knotes from kde-standard and kdepim since it was not ported + to Qt6. + * For kdegraphics, add alternate dependency to kgamma which replaces + kgamma5 in Plasma 6. + + -- Aurélien COUDERC Wed, 27 Nov 2024 12:57:32 +0100 + + meta-kde (5:150) unstable; urgency=low + + * Team upload + * Recommend kasts and krecorder for multimedia and utils + + -- Salvo 'LtWorf' Tomaselli Tue, 17 Sep 2024 16:38:19 +0200 + + meta-kde (5:149) unstable; urgency=low + + * Team upload + * Add skladnik to kdegames + + -- Salvo 'LtWorf' Tomaselli Thu, 29 Aug 2024 22:28:49 +0200 + + meta-kde (5:148) unstable; urgency=medium + + * Bump Standards-Version to 4.7.0, no changes required. + * Bump the minimum Plasma version to 4:5.27.11. + + -- Pino Toscano Sun, 19 May 2024 16:14:44 +0200 + + meta-kde (5:147) unstable; urgency=medium + + * Bump the minimum Plasma version to 4:5.27.10. + + -- Pino Toscano Sat, 13 Jan 2024 10:59:30 +0100 + + meta-kde (5:146) unstable; urgency=medium + + * Bump the minimum Plasma version to 4:5.27.9. + + -- Pino Toscano Sat, 28 Oct 2023 05:06:09 +0200 + + meta-kde (5:145) unstable; urgency=medium + + * Bump the minimum Plasma version to 4:5.27.8. + + -- Pino Toscano Thu, 14 Sep 2023 06:16:55 +0200 + + meta-kde (5:144) unstable; urgency=medium + + * Bump the minimum Plasma version to 4:5.27.7. + + -- Pino Toscano Fri, 04 Aug 2023 07:03:21 +0200 + + meta-kde (5:143) unstable; urgency=medium + + * Bump the minimum Plasma version to 4:5.27.5. + * Drop mipsel as architecture from all the packages that, directly or + indirectly, use QtWebEngine: QtWebEngine will be soon dropped from mipsel. + + -- Pino Toscano Tue, 18 Jul 2023 22:22:28 +0200 meta-kde (5:142) unstable; urgency=medium diff --cc debian/control index 5ab7a83,72da4dc..72743f9 --- a/debian/control +++ b/debian/control @@@ -31,24 -31,22 +31,22 @@@ Description: KDE Plasma Desktop and min Package: kde-standard Architecture: any - Depends: akregator (>= ${kdepim:Version}) [amd64 arm64 i386 mipsel], - ark (>= ${kde:Version}), - dragonplayer (>= ${kde:Version}), - gwenview (>= ${kde:Version}), - juk (>= ${kde:Version}), -Depends: akregator (>= ${kdepim:Version}) [amd64 arm64 armhf i386], ++Depends: akregator (>= ${kdepim:Version}) [amd64 arm64 i386], + ark (>= ${gear:Version}), + dragonplayer (>= ${gear:Version}), + gwenview (>= ${gear:Version}), + juk (>= ${gear:Version}), kaddressbook (>= ${kdepim:Version}), - kate (>= ${kde:Version}), - kcalc (>= ${kde:Version}), + kate (>= ${gear:Version}), + kcalc (>= ${gear:Version}), kde-plasma-desktop (>= ${source:Version}), - kde-spectacle (>= ${kde:VersionNoEpoch}), - khelpcenter (>= ${kde:Version}), - kmail (>= ${kdepim:Version}) [amd64 arm64 i386 mipsel], - knotes (>= ${kdepim:Version}), - korganizer (>= ${kdepim:Version}), - kwalletmanager (>= ${kde:Version}), - okular (>= ${kde:Version}), - khelpcenter (>= ${gear:Version}) [amd64 arm64 armhf i386], - kmail (>= ${kdepim:Version}) [amd64 arm64 armhf i386], - korganizer (>= ${kdepim:Version}) [amd64 arm64 armhf i386], ++ khelpcenter (>= ${gear:Version}) [amd64 arm64 i386], ++ kmail (>= ${kdepim:Version}) [amd64 arm64 i386], ++ korganizer (>= ${kdepim:Version}) [amd64 arm64 i386], + kwalletmanager (>= ${gear:Version}), + okular (>= ${gear:Version}), plasma-dataengines-addons (>= ${plasma:Version}), - plasma-pa (>= ${plasma:VersionNoEpoch}) | kmix (>= ${kde:Version}), + plasma-pa (>= ${plasma:VersionNoEpoch}) | kmix (>= ${gear:Version}), plasma-runners-addons (>= ${plasma:Version}), plasma-wallpapers-addons (>= ${plasma:Version}), plasma-widgets-addons (>= ${plasma:Version}), @@@ -151,27 -149,27 +149,27 @@@ Description: base applications from th Package: kdeedu Architecture: any - Depends: artikulate (>= ${kde:Version}), - blinken (>= ${kde:Version}), - cantor (>= ${kde:Version}) [amd64 arm64 i386 mipsel], - kalgebra (>= ${kde:Version}) [amd64 arm64 i386 mipsel], - kalzium (>= ${kde:Version}), - kanagram (>= ${kde:Version}), - kbruch (>= ${kde:Version}), - kgeography (>= ${kde:Version}), - khangman (>= ${kde:Version}), - kig (>= ${kde:Version}), - kiten (>= ${kde:Version}), - klettres (>= ${kde:Version}), - kmplot (>= ${kde:Version}), - ktouch (>= ${kde:Version}), - kturtle (>= ${kde:Version}), - kwordquiz (>= ${kde:Version}), - marble (>= ${kde:Version}), - minuet (>= ${kde:VersionNoEpoch}), - parley (>= ${kde:Version}) [amd64 arm64 i386 mipsel], - rocs (>= ${kde:Version}), - step (>= ${kde:Version}), + Depends: artikulate (>= ${gear:Version}), + blinken (>= ${gear:Version}), + cantor (>= ${gear:Version}) [!i386], - kalgebra (>= ${gear:Version}) [amd64 arm64 armhf i386], ++ kalgebra (>= ${gear:Version}) [amd64 arm64 i386], + kalzium (>= ${gear:Version}), + kanagram (>= ${gear:Version}), + kbruch (>= ${gear:Version}), + kgeography (>= ${gear:Version}), + khangman (>= ${gear:Version}), + kig (>= ${gear:Version}), + kiten (>= ${gear:Version}), + klettres (>= ${gear:Version}), + kmplot (>= ${gear:Version}), + ktouch (>= ${gear:Version}), + kturtle (>= ${gear:Version}), + kwordquiz (>= ${gear:Version}), + marble (>= ${gear:Version}), + minuet (>= ${gear:VersionNoEpoch}), + parley (>= ${gear:Version}), + rocs (>= ${gear:Version}), + step (>= ${gear:Version}), ${misc:Depends} Description: educational applications from the official KDE release KDE is produced by an international technology team that creates free and open @@@ -309,19 -308,18 +308,18 @@@ Description: networking applications fr Package: kdepim Architecture: any Depends: accountwizard (>= ${kdepim:Version}), - akonadiconsole (>= ${kdepim:Version}) [amd64 arm64 i386 mipsel], - akregator (>= ${kdepim:Version}) [amd64 arm64 i386 mipsel], - akonadiconsole (>= ${kdepim:Version}) [amd64 arm64 armhf i386], - akregator (>= ${kdepim:Version}) [amd64 arm64 armhf i386], ++ akonadiconsole (>= ${kdepim:Version}) [amd64 arm64 i386], ++ akregator (>= ${kdepim:Version}) [amd64 arm64 i386], kaddressbook (>= ${kdepim:Version}), - kalarm (>= ${kdepim:Version}) [amd64 arm64 i386 mipsel], - kalendarac (>= ${kdepim:Version}), - kdepim-addons (>= ${kdepim:VersionNoEpoch}) [amd64 arm64 i386 mipsel], - kdepim-runtime (>= ${kdepim:Version}) [amd64 arm64 i386 mipsel], - kalarm (>= ${kdepim:Version}) [amd64 arm64 armhf i386], - kalendarac (>= ${kdepim:Version}) [amd64 arm64 armhf i386], - kdepim-addons (>= ${kdepim:VersionNoEpoch}) [amd64 arm64 armhf], - kdepim-runtime (>= ${kdepim:Version}) [amd64 arm64 armhf i386], ++ kalarm (>= ${kdepim:Version}) [amd64 arm64 i386], ++ kalendarac (>= ${kdepim:Version}) [amd64 arm64 i386], ++ kdepim-addons (>= ${kdepim:VersionNoEpoch}) [amd64 arm64], ++ kdepim-runtime (>= ${kdepim:Version}) [amd64 arm64 i386], kleopatra (>= ${kdepim:Version}), - kmail (>= ${kdepim:Version}) [amd64 arm64 i386 mipsel], - knotes (>= ${kdepim:Version}), - konsolekalendar (>= ${kdepim:Version}), - kontact (>= ${kdepim:Version}) [amd64 arm64 i386 mipsel], - korganizer (>= ${kdepim:Version}), - kmail (>= ${kdepim:Version}) [amd64 arm64 armhf i386], - konsolekalendar (>= ${kdepim:Version}) [amd64 arm64 armhf i386], - kontact (>= ${kdepim:Version}) [amd64 arm64 armhf i386], - korganizer (>= ${kdepim:Version}) [amd64 arm64 armhf i386], ++ kmail (>= ${kdepim:Version}) [amd64 arm64 i386], ++ konsolekalendar (>= ${kdepim:Version}) [amd64 arm64 i386], ++ kontact (>= ${kdepim:Version}) [amd64 arm64 i386], ++ korganizer (>= ${kdepim:Version}) [amd64 arm64 i386], ${misc:Depends} Description: Personal Information Management apps from the official KDE release KDE (the K Desktop Environment) is a powerful Open Source graphical @@@ -403,7 -402,7 +402,7 @@@ Description: general-purpose utilities Package: kdewebdev Architecture: any - Depends: kimagemapeditor (>= ${kde:Version}) [amd64 arm64 i386 mipsel], -Depends: kimagemapeditor (>= ${gear:Version}) [amd64 arm64 armhf i386], ++Depends: kimagemapeditor (>= ${gear:Version}) [amd64 arm64 i386], ${misc:Depends} Description: web development apps from the official KDE release This metapackage includes a collection of web development applications