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

diff --cc debian/changelog
index 9eeb1eb50cb86ead8b8c6ce20bb0a851efa73408,98fa6723aef9debb00d48cf2c6715cf4ea2ac998..6932e27dc12d8b2fd592f30a9fa370586cffba4b
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,25 +1,32 @@@
- akonadi-calendar-tools (4:21.12.3-2+rpi1) bookworm-staging; urgency=medium
++akonadi-calendar-tools (4:22.04.2-2+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:22:49 +0000]
 +  * Remove armhf from architecture list for kdepim-runtime dependency.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 14 Apr 2022 16:21:53 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 07 Jul 2022 20:40:22 +0000
++
+ akonadi-calendar-tools (4:22.04.2-2) unstable; urgency=medium
+ 
+   [ Patrick Franz ]
+   * Upload to unstable.
+ 
+  -- Patrick Franz <deltaone@debian.org>  Mon, 27 Jun 2022 22:03:26 +0200
+ 
+ akonadi-calendar-tools (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:48:02 +0200
+ 
+ akonadi-calendar-tools (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 19:10:36 +0200
  
  akonadi-calendar-tools (4:21.12.3-2) unstable; urgency=medium
  

diff --cc debian/control
index ee1dced2a5ab8a97da99a68eedeca31de09d945f,b1b7468ba2e888bea194e2b74d019a0e19f5c7c3..0b2695762970ebbd3096a889934a40c3b8e7eff3
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -30,9 -30,9 +30,9 @@@ Rules-Requires-Root: n
  
  Package: konsolekalendar
  Architecture: any
 -Depends: kdepim-runtime [amd64 arm64 armhf i386 mipsel],
 +Depends: kdepim-runtime [amd64 arm64 i386 mipsel],
           ${misc:Depends},
-          ${shlibs:Depends},
+          ${shlibs:Depends}
  Description: konsole personal organizer
   KonsoleKalendar is a command-line interface to KDE calendars.
   KonsoleKalendar complements KOrganizer by providing a console