Manual merge of version 4:6.3.4-2+rpi1 and 4:6.5.4-1 to produce 4:6.5.4-1+rpi1

diff --cc debian/changelog
index 3d5365bb60173130bf4275013370c80df6bdcce7,2cdcd20f3be5a67314b28e1b3637bb4b0a3113a9..57593720be47b40eccdb7c6044d11e35b25d50ec
--- 1/debian/changelog
--- 2/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 <plugwash@raspbian.org> at Mon, 30 Dec 2024 23:18:31 +0000]
 +  * Avoid qt6-webengine on armhf.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 05 Sep 2025 14:00:53 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  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 <coucouf@debian.org>  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 <pino@debian.org>  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 <coucouf@debian.org>  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 <coucouf@debian.org>  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 <coucouf@debian.org>  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 <coucouf@debian.org>  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 <coucouf@debian.org>  Tue, 07 Oct 2025 20:10:23 +0200
  
  plasma-nm (4:6.3.4-2) unstable; urgency=medium
  

diff --cc debian/control
index edfbadefa725aa2bc28615c5c3a5d26c1a08de9d,72454fc93216289bf1de10b1c9d7f37940dbe77c..390205d17397027842793b8e39c67b8721f5d565
--- 1/debian/control
--- 2/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 727f7be5b32d0b6e0c879436bdc7249ecd248923,4b25ac73653572e9c7f199ecce31f09ee7ef344b..a7af452f87d998ff6433dc75ee7ed15b08eaa4c6
--- 1/debian/rules
--- 2/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