Merge version 4:21.12.3-2+rpi1 and 4:22.04.2-3 to produce 4:22.04.2-3+rpi1

diff --cc debian/changelog
index 74521193731f5c67af459e05fac897f2862fcae9,301477036cb187b7840d88802916017e920c253b..061f773e514385152b1d447fee7a61581ea89023
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,45 +1,52 @@@
- korganizer (4:21.12.3-2+rpi1) bookworm-staging; urgency=medium
++korganizer (4:22.04.2-3+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 4:17.08.3-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 24 Jan 2018 08:48:57 +0000]
 +  * Remove armhf from architecture list for kdepim-runtime dependency.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 14 Apr 2022 17:38:20 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 07 Jul 2022 21:42:24 +0000
++
+ korganizer (4:22.04.2-3) unstable; urgency=medium
+ 
+   * Team upload.
+   * Bump Standards-Version to 4.6.1, no changes required.
+   * Remove inactive Uploaders.
+   * Modernize building:
+     - add the dh-sequence-kf5 build dependency to use the kf5 addon
+       automatically, removing pkg-kde-tools
+     - drop all the manually specified addons and buildsystem for dh
+   * Mark the xauth, and xvfb build dependencies as nocheck, as they are needed
+     only by dh_auto_test.
+   * CI: enable again the blhc job.
+   * Unregister the old /etc/xdg/autostart/org.kde.korgac.desktop conffile.
+   * Use execute_after_dh_auto_install to avoid invoking dh_auto_install
+     manually.
+   * Print which development files are removed, so it is easier to notice
+     whether there are still any.
+ 
+  -- Pino Toscano <pino@debian.org>  Sun, 03 Jul 2022 06:53:28 +0200
+ 
+ korganizer (4:22.04.2-2) unstable; urgency=medium
+ 
+   [ Patrick Franz ]
+   * Upload to unstable.
+ 
+  -- Patrick Franz <deltaone@debian.org>  Mon, 27 Jun 2022 22:04:09 +0200
+ 
+ korganizer (4:22.04.2-1) experimental; urgency=medium
+ 
+   [ Patrick Franz ]
+   * New upstream release (22.04.2).
+   * Update build-deps and deps with the info from cmake.
+ 
+  -- Patrick Franz <deltaone@debian.org>  Sun, 19 Jun 2022 02:49:03 +0200
+ 
+ korganizer (4:22.04.1-1) experimental; urgency=medium
+ 
+   [ Patrick Franz ]
+   * New upstream release (22.04.1).
+   * Update build-deps and deps with the info from cmake.
+ 
+  -- Patrick Franz <deltaone@debian.org>  Thu, 26 May 2022 21:02:29 +0200
  
  korganizer (4:21.12.3-2) unstable; urgency=medium
  

diff --cc debian/control
index 04a6c691f3480636dbdc914fc5331c33db51e68a,4b3a997d65c1426ca05fd337b0df26b7bd2a1b5d..18885d24b4245f725b4db5c1c8e8f2a3675dd907
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -70,9 -67,9 +67,9 @@@ Rules-Requires-Root: n
  
  Package: korganizer
  Architecture: any
 -Depends: kdepim-runtime [amd64 arm64 armhf i386 mipsel],
 +Depends: kdepim-runtime [amd64 arm64 i386 mipsel],
           ${misc:Depends},
-          ${shlibs:Depends},
+          ${shlibs:Depends}
  Homepage: http://kontact.kde.org/korganizer/
  Description: calendar and personal organizer
   This package contains KOrganizer, a calendar and scheduling program.