Merge version 20.08.3-1+rpi1 and 21.08.1-1 to produce 21.08.1-1+rpi1

diff --cc debian/changelog
index 6a23c687be8991fb5f7d4d15c00f7e3d8709f6b7,dddb3fe6940dd5e2eeb4fe944e3ee32735e098d8..27beb904d390d08b46d0390bd976abb1046efa16
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,45 +1,52 @@@
- kmailtransport (20.08.3-1+rpi1) bullseye-staging; urgency=medium
++kmailtransport (21.08.1-1+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, 23 Dec 2020 13:57:10 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 29 Sep 2021 02:39:37 +0000
++
+ kmailtransport (21.08.1-1) unstable; urgency=medium
+ 
+   [ Norbert Preining ]
+   * New upstream release (21.08.1).
+   * Bump Standards-Version to 4.6.0, no change required.
+ 
+  -- Norbert Preining <norbert@preining.info>  Sat, 11 Sep 2021 07:22:58 +0900
+ 
+ kmailtransport (21.08.0-1) unstable; urgency=medium
+ 
+   [ Norbert Preining ]
+   * New upstream release (21.08.0).
+   * Update patch.
+ 
+  -- Norbert Preining <norbert@preining.info>  Tue, 17 Aug 2021 12:49:41 +0900
+ 
+ kmailtransport (21.04.3-1) experimental; urgency=medium
+ 
+   [ Norbert Preining ]
+   * New upstream release (21.04.3).
+ 
+  -- Norbert Preining <norbert@preining.info>  Fri, 09 Jul 2021 10:36:38 +0900
+ 
+ kmailtransport (21.04.1-1) experimental; urgency=medium
+ 
+   [ Norbert Preining ]
+   * New upstream release (21.04.1).
+ 
+  -- Norbert Preining <norbert@preining.info>  Fri, 14 May 2021 06:12:00 +0900
+ 
+ kmailtransport (21.04.0-1) experimental; urgency=medium
+ 
+   [ Norbert Preining ]
+   * New upstream release (21.04.0).
+   * Borrow minimal upstream signing key from k3b.
+   * Drop Kubuntu from maintainer name.
+   * Removed Maximiliano Curia from the uploaders, thanks for your work
+     on the package!
+   * Added myself to the uploaders.
+   * Update kgapi patch.
+ 
+  -- Norbert Preining <norbert@preining.info>  Thu, 13 May 2021 09:46:32 +0900
  
  kmailtransport (20.08.3-1) unstable; urgency=medium
  

diff --cc debian/control
index 6464d471985e8b40443f451411bfc602afed94dc,4945e159d822b489b9a9ccb0040063db6be598c8..6f4f4ef3769b3a0dcdda6acf154e9f3ee66c6dcd
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -1,25 -1,27 +1,27 @@@
  Source: kmailtransport
  Section: libs
  Priority: optional
- Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
- Uploaders: Maximiliano Curia <maxy@debian.org>, Sandro Knauß <hefee@debian.org>
- Build-Depends: cmake (>= 3.5~),
+ Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
+ Uploaders: Norbert Preining <norbert@preining.info>,
+            Sandro Knauß <hefee@debian.org>,
+ Build-Depends: cmake (>= 3.16~),
                 debhelper-compat (= 13),
-                extra-cmake-modules (>= 5.71.0~),
+                extra-cmake-modules (>= 5.83.0~),
                 gettext,
-                libkf5akonadi-dev (>= 4:20.08.3~),
-                libkf5akonadimime-dev (>= 4:20.08.3~),
-                libkf5configwidgets-dev (>= 5.71.0~),
+                libkf5akonadi-dev (>= 4:21.08.1~),
+                libkf5akonadimime-dev (>= 4:21.08.1~),
+                libkf5configwidgets-dev (>= 5.83.0~),
                 libkf5dbusaddons-dev,
                 libkf5doctools-dev (>= 5.39.0~),
-                libkf5i18n-dev (>= 5.71.0~),
-                libkf5kcmutils-dev (>= 5.71.0~),
-                libkf5kio-dev (>= 5.71.0~),
-                libkf5mime-dev (>= 20.08.3~),
-                libkf5textwidgets-dev (>= 5.71.0~),
-                libkf5wallet-dev (>= 5.71.0~),
-                libkpimgapi-dev (>= 20.08.3~) [amd64 arm64 i386 mipsel],
-                libkpimsmtp-dev (>= 20.08.3~),
+                libkf5i18n-dev (>= 5.83.0~),
+                libkf5kcmutils-dev (>= 5.83.0~),
+                libkf5kio-dev (>= 5.83.0~),
+                libkf5mime-dev (>= 21.08.1~),
+                libkf5service-dev (>= 5.79.0~),
+                libkf5textwidgets-dev (>= 5.83.0~),
+                libkf5wallet-dev (>= 5.83.0~),
 -               libkpimgapi-dev (>= 21.08.1~) [amd64 arm64 armhf i386 mipsel],
++               libkpimgapi-dev (>= 21.08.1~) [amd64 arm64 i386 mipsel],
+                libkpimsmtp-dev (>= 21.08.1~),
                 libsasl2-dev,
                 libsasl2-modules,
                 pkg-config,