Merge version 5:124+rpi1 and 5:126 to produce 5:126+rpi1

diff --cc debian/changelog
index e298a31a0f7d4c5f228f1f4b6f99e5a869171467,0e34716c364f326c8f9144b4257c69bbe129dfc2..7d51b00b6d2a0baf652790c72c0a59ed8fa53d13
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,26 -1,19 +1,43 @@@
- meta-kde (5:124+rpi1) bookworm-staging; urgency=medium
++meta-kde (5:126+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>  Sat, 23 Jul 2022 14:45:50 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 27 Jul 2022 14:38:05 +0000
++
+ meta-kde (5:126) unstable; urgency=medium
+ 
+   * Add a kdepim:VersionNoEpoch substvar for epoch-less kdepim packages.
+   * Switch kdepim-addons to kdepim:VersionNoEpoch, as it has no epoch.
+ 
+  -- Pino Toscano <pino@debian.org>  Fri, 22 Jul 2022 06:28:38 +0200
+ 
+ meta-kde (5:125) unstable; urgency=medium
+ 
+   [ Patrick Franz ]
+   * Add kalendarac and kdepim-addons as dependencies for kdepim.
+ 
+   [ Pino Toscano ]
+   * Bump the minimum Plasma version to 4:5.25.3.
+ 
+  -- Pino Toscano <pino@debian.org>  Thu, 21 Jul 2022 20:47:54 +0200
  
  meta-kde (5:124) unstable; urgency=medium
  

diff --cc debian/control
index 4e42dcabe7894492dc5c5d8266c138ddf0f086df,879978dba253f4dfff77411a9d9df9341e97fd4b..f0d45cdb7ef425133675aeddb652454600aa020f
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -309,19 -309,20 +309,20 @@@ Description: networking applications fr
  Package: kdepim
  Architecture: any
  Depends: accountwizard (>= ${kdepim:Version}),
 -         akonadiconsole (>= ${kdepim:Version}) [amd64 arm64 armhf i386 mipsel],
 -         akregator (>= ${kdepim:Version}) [amd64 arm64 armhf i386 mipsel],
 +         akonadiconsole (>= ${kdepim:Version}) [amd64 arm64 i386 mipsel],
 +         akregator (>= ${kdepim:Version}) [amd64 arm64 i386 mipsel],
           kaddressbook (>= ${kdepim:Version}),
 -         kalarm (>= ${kdepim:Version}) [amd64 arm64 armhf i386 mipsel],
 +         kalarm (>= ${kdepim:Version}) [amd64 arm64 i386 mipsel],
+          kalendarac  (>= ${kdepim:Version}),
+          kdepim-addons (>= ${kdepim:VersionNoEpoch}) [amd64 arm64 armhf i386 mipsel],
 -         kdepim-runtime (>= ${kdepim:Version}) [amd64 arm64 armhf i386 mipsel],
 +         kdepim-runtime (>= ${kdepim:Version}) [amd64 arm64 i386 mipsel],
           kleopatra (>= ${kdepim:Version}),
 -         kmail (>= ${kdepim:Version}) [amd64 arm64 armhf i386 mipsel],
 +         kmail (>= ${kdepim:Version}) [amd64 arm64 i386 mipsel],
           knotes (>= ${kdepim:Version}),
           konsolekalendar (>= ${kdepim:Version}),
 -         kontact (>= ${kdepim:Version}) [amd64 arm64 armhf i386 mipsel],
 +         kontact (>= ${kdepim:Version}) [amd64 arm64 i386 mipsel],
           korganizer (>= ${kdepim:Version}),
           ${misc:Depends}
- Recommends: kdepim-addons [amd64 arm64 i386 mipsel],
  Description: Personal Information Management apps from the official KDE release
   KDE (the K Desktop Environment) is a powerful Open Source graphical
   desktop environment for Unix workstations. It combines ease of use,