Merge version 4:21.08.1-1+rpi1 and 4:21.12.3-4 to produce 4:21.12.3-4+rpi1

diff --cc debian/changelog
index bb91871cf3b76ce913361bef9bbf3d0994587630,35a72e4d6f37f0bcc6e8ab3c36c6d7ed6c3ffad2..926f53da1747cce41fae45601fea87d924dcfe82
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,33 +1,45 @@@
- kdepim-runtime (4:21.08.1-1+rpi1) bookworm-staging; urgency=medium
++kdepim-runtime (4:21.12.3-4+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>  Fri, 01 Oct 2021 19:42:37 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 14 Apr 2022 18:30:07 +0000
++
+ kdepim-runtime (4:21.12.3-4) unstable; urgency=medium
+ 
+   [ Patrick Franz ]
+   * Upload to unstable.
+ 
+  -- Patrick Franz <deltaone@debian.org>  Fri, 01 Apr 2022 22:11:00 +0200
+ 
+ kdepim-runtime (4:21.12.3-3) experimental; urgency=medium
+ 
+   [ Patrick Franz ]
+   * Fix patches.
+ 
+  -- Patrick Franz <deltaone@debian.org>  Sat, 26 Mar 2022 16:42:26 +0100
+ 
+ kdepim-runtime (4:21.12.3-2) experimental; urgency=medium
+ 
+   [ Patrick Franz ]
+   * Fix patches.
+ 
+  -- Patrick Franz <deltaone@debian.org>  Sat, 26 Mar 2022 09:28:46 +0100
+ 
+ kdepim-runtime (4:21.12.3-1) experimental; urgency=medium
+ 
+   [ Patrick Franz ]
+   * New upstream release (21.12.3).
+   * Update build-deps and deps with the info from cmake.
+   * Add myself to Uploaders.
+   * Refresh patches.
+ 
+  -- Patrick Franz <deltaone@debian.org>  Thu, 24 Mar 2022 23:28:23 +0100
  
  kdepim-runtime (4:21.08.1-1) unstable; urgency=medium
  

diff --cc debian/control
index ffda26e90e73050c59f9d375c07523fd97d756e9,ca7e530433e01322471b40a2152d2a9794bb1e0a..d2eed20e50d47995c143a8474dfee055c44d9460
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -11,49 -12,51 +12,51 @@@ Build-Depends: cmake (>= 3.16~)
                 gettext,
                 libboost-dev,
                 libboost-program-options-dev,
-                libkf5akonadi-dev (>= 4:21.08.1~),
-                libkf5akonadicalendar-dev (>= 4:21.08.1~),
-                libkf5akonadicontact-dev (>= 4:21.08.1~),
-                libkf5akonadimime-dev (>= 4:21.08.1~),
-                libkf5akonadinotes-dev (>= 4:21.08.1~),
-                libkf5alarmcalendar-dev (>= 4:21.08.1~),
-                libkf5calendarcore-dev (>= 5:5.83.0~),
-                libkf5calendarutils-dev (>= 4:21.08.1~),
-                libkf5codecs-dev (>= 5.83.0~),
-                libkf5config-dev (>= 5.83.0~),
-                libkf5configwidgets-dev (>= 5.83.0~),
-                libkf5contacts-dev (>= 5:5.83.0~),
-                libkf5dav-dev (>= 1:5.83.0~),
-                libkf5doctools-dev (>= 5.83.0~),
-                libkf5grantleetheme-dev (>= 21.08.1~),
-                libkf5holidays-dev (>= 1:5.83.0~),
-                libkf5identitymanagement-dev (>= 21.08.1~),
-                libkf5imap-dev (>= 21.08.1~),
-                libkf5itemmodels-dev (>= 5.83.0~),
-                libkf5kcmutils-dev (>= 5.83.0~),
-                libkf5kio-dev (>= 5.83.0~),
-                libkf5ldap-dev (>= 21.08.1~),
-                libkf5libkdepim-dev (>= 4:21.08.1~),
-                libkf5mailtransport-dev (>= 21.08.1~),
-                libkf5mbox-dev (>= 21.08.1~),
-                libkf5mime-dev (>= 21.08.1~),
-                libkf5notifications-dev (>= 5.83.0~),
-                libkf5notifyconfig-dev (>= 5.83.0~),
+                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.83.0~),
-                libkf5windowsystem-dev (>= 5.83.0~),
+                libkf5textwidgets-dev (>= 5.87.0~),
+                libkf5windowsystem-dev (>= 5.87.0~),
                 libkolabxml-dev (>= 1.1~),
-                libkpimgapi-dev (>= 21.08.1~) [amd64 arm64 i386 mipsel],
 -               libkpimgapi-dev (>= 21.12.3~) [amd64 arm64 armhf i386 mipsel],
++               libkpimgapi-dev (>= 21.12.3~) [amd64 arm64 i386 mipsel],
                 libqca-qt5-2-dev (>= 2.3.0~),
-                libqt5networkauth5-dev (>= 5.15.0~),
+                libqt5networkauth5-dev (>= 5.15.2~),
                 libqt5texttospeech5-dev,
-                libqt5xmlpatterns5-dev (>= 5.15.0~),
+                libqt5xmlpatterns5-dev (>= 5.15.2~),
                 libsasl2-dev,
                 pkg-config,
                 pkg-kde-tools (>= 0.12),
                 qt5keychain-dev,
-                qtbase5-dev (>= 5.15.0~),
-                qtwebengine5-dev (>= 5.15.0~) [amd64 arm64 i386 mipsel],
+                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,
  Standards-Version: 4.6.0