Merge version 5:161+rpi1 and 5:162 to produce 5:162+rpi1

diff --cc debian/changelog
index 1e774b1517446a61d8abf48707a5b80c1b2efd9c,43774db2ff15cd3f7333a35469a54e0bc0aedffb..3c5d24e684c663ba3bd6128c3b81729c3dd0b5c9
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,29 -1,20 +1,47 @@@
- meta-kde (5:161+rpi1) trixie-staging; urgency=medium
++meta-kde (5:162+rpi1) trixie-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.
 +
 +  [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.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Fri, 02 May 2025 01:17:10 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 17 May 2025 10:03:53 +0000
++
+ meta-kde (5:162) unstable; urgency=medium
+ 
+   * Team upload.
+ 
+   [ Aurélien COUDERC ]
+   * Recommend kde-inotify-survey and webext-plasma-browser-integration for
+     kde-plasma-desktop.
+   * Move apps from depends to recommends so they can be uninstalled without
+     breaking kde-standard / task-kde-desktop. (Closes: #1099321)
+   * Drop obsolete kaccessible recommends.
+   * Drop incorrect kdegraphics-mobipocket recommends.
+   * Drop versioned dependency for kfloppy it’s not released with Gear
+     anymore.
+   * Add merkuro to kdepim.
+   * Add various Gear apps to their respective meta-packages.
+ 
+  -- Aurélien COUDERC <coucouf@debian.org>  Mon, 05 May 2025 23:29:44 +0200
  
  meta-kde (5:161) unstable; urgency=medium
  

diff --cc debian/control
index 0a42265d44d98edaa20a198a03a672a2c7bc016c,712fa366a13d216f79d394617a6eeccd73b66d50..ded2aa79cd9204822dbe3d02a3aac1a0c5ad34fd
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -308,19 -315,20 +315,20 @@@ Description: networking applications fr
  Package: kdepim
  Architecture: any
  Depends: accountwizard (>= ${kdepim:Version}),
 -         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 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 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}
+          merkuro (>= ${kdepim:VersionNoEpoch}) [amd64 arm64 armhf i386],
+          ${misc:Depends},
  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,
@@@ -402,8 -412,8 +412,8 @@@ Description: general-purpose utilities 
  
  Package: kdewebdev
  Architecture: any
 -Depends: kimagemapeditor (>= ${gear:Version}) [amd64 arm64 armhf i386],
 +Depends: kimagemapeditor (>= ${gear:Version}) [amd64 arm64 i386],
-          ${misc:Depends}
+          ${misc:Depends},
  Description: web development apps from the official KDE release
   This metapackage includes a collection of web development applications
   provided with the official release of KDE.