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

diff --cc debian/changelog
index 926f53da1747cce41fae45601fea87d924dcfe82,5fd30578d0ce1caecaaf5312f01f3327c6a3b125..b3edd608b647bc61c89fb26994f51e5b1ae1f9c8
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,34 +1,46 @@@
- kdepim-runtime (4:21.12.3-4+rpi1) bookworm-staging; urgency=medium
++kdepim-runtime (4:22.04.2-2+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 4:18.08.3-4+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 03 Apr 2019 22:53:45 +0000]
 +  * Remove armhf from architecture list for build-depends on libkpimgapi-dev 
 +    and qtwebengine5-dev
 +
 +  [changes brought forward from 4:18.08.3-4+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Thu, 04 Apr 2019 13:53:23 +0000]
 +  * Remove armhf from architecture list for depends on
 +    libsasl2-modules-kdexoauth2
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 14 Apr 2022 18:30:07 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 07 Jul 2022 23:42:52 +0000
++
+ kdepim-runtime (4:22.04.2-2) unstable; urgency=medium
+ 
+   [ Patrick Franz ]
+   * Upload to unstable.
+ 
+  -- Patrick Franz <deltaone@debian.org>  Mon, 27 Jun 2022 22:02:14 +0200
+ 
+ kdepim-runtime (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:47:33 +0200
+ 
+ kdepim-runtime (4:22.04.1-2) experimental; urgency=medium
+ 
+   [ Patrick Franz ]
+   * Remove unused libkf5pimcommon-dev B-D.
+ 
+  -- Patrick Franz <deltaone@debian.org>  Sat, 28 May 2022 00:54:40 +0200
+ 
+ kdepim-runtime (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.
+   * Remove dependency to kalarm as it is not used anymore.
+   * Remove make_qtwebengine_optional.patch as it is not needed anymore.
+ 
+  -- Patrick Franz <deltaone@debian.org>  Thu, 26 May 2022 16:13:36 +0200
  
  kdepim-runtime (4:21.12.3-4) unstable; urgency=medium
  

diff --cc debian/control
index d2eed20e50d47995c143a8474dfee055c44d9460,9da97d642915d72ad093de9348cc1ced47c5d8bc..1133834097cb4e376915303bb3e379dc00db2316
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -15,38 -15,36 +15,36 @@@ Build-Depends: cmake (>= 3.16~)
                 libboost-system-dev,
                 libboost-thread-dev,
                 libgrantlee5-dev (>= 5.2~),
-                libkf5akonadi-dev (>= 4:21.12.3~),
-                libkf5akonadicalendar-dev (>= 4:21.12.3~),
-                libkf5akonadicontact-dev (>= 4:21.12.3~),
-                libkf5akonadimime-dev (>= 4:21.12.3~),
-                libkf5akonadinotes-dev (>= 4:21.12.3~),
-                libkf5alarmcalendar-dev (>= 4:21.12.3~),
-                libkf5calendarcore-dev (>= 5:5.87.0~),
-                libkf5calendarutils-dev (>= 4:21.12.3~),
-                libkf5codecs-dev (>= 5.87.0~),
-                libkf5config-dev (>= 5.87.0~),
-                libkf5configwidgets-dev (>= 5.87.0~),
-                libkf5contacts-dev (>= 5:5.87.0~),
-                libkf5dav-dev (>= 1:5.87.0~),
-                libkf5doctools-dev (>= 5.87.0~),
-                libkf5holidays-dev (>= 1:5.87.0~),
-                libkf5identitymanagement-dev (>= 21.12.3~),
-                libkf5imap-dev (>= 21.12.3~),
-                libkf5itemmodels-dev (>= 5.87.0~),
-                libkf5kcmutils-dev (>= 5.87.0~),
-                libkf5kio-dev (>= 5.87.0~),
-                libkf5ldap-dev (>= 21.12.3~),
-                libkf5libkdepim-dev (>= 4:21.12.3~),
-                libkf5mailtransport-dev (>= 21.12.3~),
-                libkf5mbox-dev (>= 21.12.3~),
-                libkf5mime-dev (>= 21.12.3~),
-                libkf5notifications-dev (>= 5.87.0~),
-                libkf5notifyconfig-dev (>= 5.87.0~),
-                libkf5pimcommon-dev (>= 4:21.08.1~),
-                libkf5textwidgets-dev (>= 5.87.0~),
-                libkf5windowsystem-dev (>= 5.87.0~),
+                libkf5akonadi-dev (>= 4:22.04.2~),
+                libkf5akonadicalendar-dev (>= 4:22.04.2~),
+                libkf5akonadicontact-dev (>= 4:22.04.2~),
+                libkf5akonadimime-dev (>= 4:22.04.2~),
+                libkf5akonadinotes-dev (>= 4:22.04.2~),
+                libkf5calendarcore-dev (>= 5:5.91.0~),
+                libkf5calendarutils-dev (>= 4:22.04.2~),
+                libkf5codecs-dev (>= 5.91.0~),
+                libkf5config-dev (>= 5.91.0~),
+                libkf5configwidgets-dev (>= 5.91.0~),
+                libkf5contacts-dev (>= 5:5.91.0~),
+                libkf5dav-dev (>= 1:5.91.0~),
+                libkf5doctools-dev (>= 5.91.0~),
+                libkf5holidays-dev (>= 1:5.91.0~),
+                libkf5identitymanagement-dev (>= 22.04.2~),
+                libkf5imap-dev (>= 22.04.2~),
+                libkf5itemmodels-dev (>= 5.91.0~),
+                libkf5kcmutils-dev (>= 5.91.0~),
+                libkf5kio-dev (>= 5.91.0~),
+                libkf5ldap-dev (>= 22.04.2~),
+                libkf5libkdepim-dev (>= 4:22.04.2~),
+                libkf5mailtransport-dev (>= 22.04.2~),
+                libkf5mbox-dev (>= 22.04.2~),
+                libkf5mime-dev (>= 22.04.2~),
+                libkf5notifications-dev (>= 5.91.0~),
+                libkf5notifyconfig-dev (>= 5.91.0~),
+                libkf5textwidgets-dev (>= 5.91.0~),
+                libkf5windowsystem-dev (>= 5.91.0~),
                 libkolabxml-dev (>= 1.1~),
-                libkpimgapi-dev (>= 21.12.3~) [amd64 arm64 i386 mipsel],
 -               libkpimgapi-dev (>= 22.04.2~) [amd64 arm64 armhf i386 mipsel],
++               libkpimgapi-dev (>= 22.04.2~) [amd64 arm64 i386 mipsel],
                 libqca-qt5-2-dev (>= 2.3.0~),
                 libqt5networkauth5-dev (>= 5.15.2~),
                 libqt5texttospeech5-dev,
@@@ -56,9 -54,9 +54,9 @@@
                 pkg-kde-tools (>= 0.12),
                 qt5keychain-dev,
                 qtbase5-dev (>= 5.15.2~),
 -               qtwebengine5-dev (>= 5.15.2~) [amd64 arm64 armhf i386 mipsel],
 +               qtwebengine5-dev (>= 5.15.2~) [amd64 arm64 i386 mipsel],
                 shared-mime-info (>= 1.3~),
-                xsltproc,
+                xsltproc
  Standards-Version: 4.6.0
  Homepage: https://invent.kde.org/pim/kdepim-runtime
  Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/kdepim-runtime
@@@ -71,13 -69,13 +69,13 @@@ Depends: akonadi-server
           kio-ldap,
           kmailtransport-akonadi,
           libsasl2-modules,
 -         libsasl2-modules-kdexoauth2 [amd64 arm64 armhf i386 mipsel],
 +         libsasl2-modules-kdexoauth2 [amd64 arm64 i386 mipsel],
           ${misc:Depends},
-          ${shlibs:Depends},
+          ${shlibs:Depends}
  Breaks: libkf5libkdepim-data (<< 4:20.08~),
-         libkf5libkdepim-plugins (<< 4:20.08~),
+         libkf5libkdepim-plugins (<< 4:20.08~)
  Replaces: libkf5libkdepim-data (<< 4:20.08~),
-           libkf5libkdepim-plugins (<< 4:20.08~),
+           libkf5libkdepim-plugins (<< 4:20.08~)
  Description: runtime components for Akonadi KDE
   This package contains Akonadi agents written using KDE Development Platform
   libraries.