Merge version 21.08.1-1+rpi1 and 21.12.3-2 to produce 21.12.3-2+rpi1

diff --cc debian/changelog
index 27beb904d390d08b46d0390bd976abb1046efa16,172e1e64cc63c6e57c67ce781b1ebc180e150ae4..4dbcb3a3853d935184093faa7c039bc3c4211bc2
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,19 +1,26 @@@
- kmailtransport (21.08.1-1+rpi1) bookworm-staging; urgency=medium
++kmailtransport (21.12.3-2+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 18.08.1-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Tue, 16 Oct 2018 14:10:00 +0000]
 +  * Remove armhf from architecture list for libkpimgapi-dev dependency.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Wed, 29 Sep 2021 02:39:37 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 11 Apr 2022 03:03:46 +0000
++
+ kmailtransport (21.12.3-2) unstable; urgency=medium
+ 
+   [ Patrick Franz ]
+   * Upload to unstable.
+ 
+  -- Patrick Franz <deltaone@debian.org>  Fri, 01 Apr 2022 22:09:51 +0200
+ 
+ kmailtransport (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:22:55 +0100
  
  kmailtransport (21.08.1-1) unstable; urgency=medium
  

diff --cc debian/control
index 6f4f4ef3769b3a0dcdda6acf154e9f3ee66c6dcd,ce9ba07ef6abe7a21bfb44f0b70b807a0c64ffcd..481d85fea409ae5be8c0278be87b20f8e3dd7a80
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -4,24 -4,25 +4,25 @@@ Priority: optiona
  Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
  Uploaders: Norbert Preining <norbert@preining.info>,
             Sandro Knauß <hefee@debian.org>,
+            Patrick Franz <deltaone@debian.org>,
  Build-Depends: cmake (>= 3.16~),
                 debhelper-compat (= 13),
-                extra-cmake-modules (>= 5.83.0~),
+                extra-cmake-modules (>= 5.87.0~),
                 gettext,
-                libkf5akonadi-dev (>= 4:21.08.1~),
-                libkf5akonadimime-dev (>= 4:21.08.1~),
-                libkf5configwidgets-dev (>= 5.83.0~),
+                libkf5akonadi-dev (>= 4:21.12.3~),
+                libkf5akonadimime-dev (>= 4:21.12.3~),
+                libkf5configwidgets-dev (>= 5.87.0~),
                 libkf5dbusaddons-dev,
                 libkf5doctools-dev (>= 5.39.0~),
-                libkf5i18n-dev (>= 5.83.0~),
-                libkf5kcmutils-dev (>= 5.83.0~),
-                libkf5kio-dev (>= 5.83.0~),
-                libkf5mime-dev (>= 21.08.1~),
+                libkf5i18n-dev (>= 5.87.0~),
+                libkf5kcmutils-dev (>= 5.87.0~),
+                libkf5kio-dev (>= 5.87.0~),
+                libkf5mime-dev (>= 21.12.3~),
                 libkf5service-dev (>= 5.79.0~),
-                libkf5textwidgets-dev (>= 5.83.0~),
-                libkf5wallet-dev (>= 5.83.0~),
-                libkpimgapi-dev (>= 21.08.1~) [amd64 arm64 i386 mipsel],
-                libkpimsmtp-dev (>= 21.08.1~),
+                libkf5textwidgets-dev (>= 5.87.0~),
+                libkf5wallet-dev (>= 5.87.0~),
 -               libkpimgapi-dev (>= 21.12.3~) [amd64 arm64 armhf i386 mipsel],
++               libkpimgapi-dev (>= 21.12.3~) [amd64 arm64 i386 mipsel],
+                libkpimsmtp-dev (>= 21.12.3~),
                 libsasl2-dev,
                 libsasl2-modules,
                 pkg-config,