From: Peter Michael Green Date: Thu, 30 Apr 2026 15:58:52 +0000 (+0000) Subject: Manual merge of version 4:6.3.4-2+rpi1 and 4:6.5.4-1 to produce 4:6.5.4-1+rpi1 X-Git-Tag: archive/raspbian/4%6.6.3-3+rpi1~1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=669ec96ca86797716c438058a2c9f9b1fc5b87cd;p=plasma-nm.git Manual merge of version 4:6.3.4-2+rpi1 and 4:6.5.4-1 to produce 4:6.5.4-1+rpi1 --- 669ec96ca86797716c438058a2c9f9b1fc5b87cd diff --cc debian/changelog index 3d5365b,2cdcd20..5759372 --- a/debian/changelog +++ b/debian/changelog @@@ -1,9 -1,72 +1,79 @@@ - plasma-nm (4:6.3.4-2+rpi1) trixie-staging; urgency=medium ++plasma-nm (4:6.5.4-1+rpi1) forky-staging; urgency=medium + + [changes brought forward from 4:6.2.4-1+rpi1 by Peter Michael Green at Mon, 30 Dec 2024 23:18:31 +0000] + * Avoid qt6-webengine on armhf. + - -- Raspbian forward porter Fri, 05 Sep 2025 14:00:53 +0000 ++ -- Peter Michael Green Thu, 30 Apr 2026 15:55:34 +0000 ++ + plasma-nm (4:6.5.4-1) unstable; urgency=medium + + [ Aurélien COUDERC ] + * New upstream release (6.5.4). + * Update build-deps and deps with the info from cmake. + + -- Aurélien COUDERC Tue, 09 Dec 2025 20:53:03 +0100 + + plasma-nm (4:6.5.3-2) unstable; urgency=medium + + * Team upload. + * CI: update/simplify configuration. + * Skip the whole MobileProvidersTest::testProviderFromMccMnc() test, and only + part of it, as it relies on the data provided by an older version of + mobile-broadband-provider-info; patch + tests-skip-testProviderFromMccMnc.diff (Closes: #1121042) + - drop patch skip-providers-test.patch, obsoleted by the new one + * Simplify lintian overrides. + * Use /usr/share/dpkg/architecture.mk rather than querying for variables + manually. + + -- Pino Toscano Tue, 25 Nov 2025 18:23:27 +0100 + + plasma-nm (4:6.5.3-1) unstable; urgency=medium + + [ Aurélien COUDERC ] + * New upstream release (6.5.3). + * Update build-deps and deps with the info from cmake. + + -- Aurélien COUDERC Tue, 18 Nov 2025 19:25:40 +0100 + + plasma-nm (4:6.5.2-1) unstable; urgency=medium + + [ Aurélien COUDERC ] + * Migrate to debian/watch version 5 syntax. + * Add/update David Edmundson’s key in upstream keyring. + * New upstream release (6.5.2). + * Update build-deps and deps with the info from cmake. + + -- Aurélien COUDERC Tue, 04 Nov 2025 21:34:01 +0100 + + plasma-nm (4:6.5.1-1) unstable; urgency=medium + + [ Aurélien COUDERC ] + * New upstream release (6.5.1). + * Update build-deps and deps with the info from cmake. + + -- Aurélien COUDERC Tue, 28 Oct 2025 23:16:14 +0100 + + plasma-nm (4:6.5.0-1) unstable; urgency=medium + + [ Aurélien COUDERC ] + * New upstream release (6.5.0). + * Update build-deps and deps with the info from cmake. + * Refresh copyright information. + * Release to unstable. + + -- Aurélien COUDERC Thu, 16 Oct 2025 22:00:46 +0200 + + plasma-nm (4:6.4.91-1) experimental; urgency=medium + + [ Aurélien COUDERC ] + * New upstream release (6.4.91). + * Update build-deps and deps with the info from cmake. + * Drop backported commits now part of the upstream release. + * Refresh lintian overrides. + * Drop Rules-Requires-Root: no, not needed anymore since trixie. + + -- Aurélien COUDERC Tue, 07 Oct 2025 20:10:23 +0200 plasma-nm (4:6.3.4-2) unstable; urgency=medium diff --cc debian/control index edfbade,72454fc..390205d --- a/debian/control +++ b/debian/control @@@ -37,9 -37,9 +37,9 @@@ Build-Depends: debhelper-compat (= 13) modemmanager-dev (>= 1.0.0~), pkgconf, qcoro-qt6-dev, - qt6-base-dev (>= 6.7.0~), - qt6-declarative-dev (>= 6.7.0~), - qt6-webengine-dev (>= 6.7.0~) [amd64 arm64 i386], + qt6-base-dev (>= 6.9.0~), + qt6-declarative-dev (>= 6.9.0~), - qt6-webengine-dev (>= 6.9.0~) [amd64 arm64 armhf i386], ++ qt6-webengine-dev (>= 6.9.0~) [amd64 arm64 i386], Standards-Version: 4.7.2 Homepage: https://invent.kde.org/plasma/plasma-nm Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/plasma-nm diff --cc debian/rules index 727f7be,4b25ac7..a7af452 --- a/debian/rules +++ b/debian/rules @@@ -4,8 -6,7 +6,7 @@@ include /usr/share/dpkg/architecture.m export DEB_BUILD_MAINT_OPTIONS=hardening=+all # limit the build of OpenConnect VPN to archs where qtwebengine is available - DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) -ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armhf i386)) +ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 i386)) extra_cmake_args += -DBUILD_OPENCONNECT=ON else extra_cmake_args += -DBUILD_OPENCONNECT=OFF