Merge version 5:126+rpi2 and 5:127 to produce 5:127+rpi1

diff --cc debian/changelog
index bc8b7021d1ad6a453193339e8960e6bbc60352da,7224669377610700380dbad5c68c3325aaf1ff8c..0abd66669af4cd9e7937302900e379c47e3d31e1
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,32 -1,8 +1,35 @@@
- meta-kde (5:126+rpi2) bookworm-staging; urgency=medium
- 
-   * Remove armhf from the architecture list for kdepim-addons.
- 
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 28 Jul 2022 22:38:12 +0000
- 
- meta-kde (5:126+rpi1) bookworm-staging; urgency=medium
++meta-kde (5:127+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 5:93+rpi1 by Peter Michael Green <plugwash@raspbian.org> 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 <plugwash@raspbian.org> 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 <plugwash@raspbian.org> 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 <plugwash@raspbian.org> 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 <plugwash@raspbian.org> 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 <plugwash@raspbian.org> at Fri, 12 Nov 2021 00:45:45 +0000]
 +  * Remove armhf from the architecture lists for cantor.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Wed, 27 Jul 2022 14:38:05 +0000
++  [changes brought forward from 5:126+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Thu, 28 Jul 2022 22:38:12 +0000]
++  * Remove armhf from the architecture list for kdepim-addons.
++
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 09 Aug 2022 17:30:14 +0000
++
+ meta-kde (5:127) unstable; urgency=medium
+ 
+   * Bump the minimum Plasma version to 4:5.25.4.
+ 
+  -- Pino Toscano <pino@debian.org>  Wed, 03 Aug 2022 05:17:31 +0200
  
  meta-kde (5:126) unstable; urgency=medium