Merge version 19.08.3-1+rpi1 and 20.04.1-1 to produce 20.04.1-1+rpi1

diff --cc debian/changelog
index aa545fee4924db0672f48d1f89ca5a386538509d,376df9166baddc390970ce4bc6e211be84ef2526..59ac825791554ac752ca82f938b527b3c92b95cf
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,31 +1,38 @@@
- kmailtransport (19.08.3-1+rpi1) bullseye-staging; urgency=medium
++kmailtransport (20.04.1-1+rpi1) bullseye-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>  Mon, 09 Dec 2019 08:40:53 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 09 Jun 2020 22:36:00 +0000
++
+ kmailtransport (20.04.1-1) unstable; urgency=medium
+ 
+   [ Sandro Knauß ]
+   * New upstream release (20.04.1).
+   * Update build-deps and deps with the info from cmake.
+ 
+  -- Sandro Knauß <hefee@debian.org>  Wed, 27 May 2020 00:00:08 +0200
+ 
+ kmailtransport (20.04.0-1) experimental; urgency=medium
+ 
+   [ Sandro Knauß ]
+   * Update watch file to the new release-service location.
+   * Bump compat level to 13.
+   * Bump Standards-Version to 4.5.0 (No changes needed).
+   * Get rid of debug-symbol-migration package.
+   * Add Rules-Requires-Root field to control.
+   * New upstream release (19.12.3).
+   * Update build-deps and deps with the info from cmake.
+   * Update patch hunks.
+   * New upstream release (20.04.0).
+   * Update patch hunks.
+   * Cleanup copyright file.
+   * Wrap long lines in changelog entries: 16.04.1-1.
+   * Set field Upstream-Contact in debian/copyright.
+   * Remove obsolete fields Contact, Name from debian/upstream/metadata
+     (already present in machine-readable debian/copyright).
+ 
+  -- Sandro Knauß <hefee@debian.org>  Wed, 13 May 2020 12:22:42 +0200
  
  kmailtransport (19.08.3-1) unstable; urgency=medium
  

diff --cc debian/control
index b2325316d9d639750cc1c656b92e1829dd4ef035,55ccc5fcbdacbbcdbdb95fcef1af42784c4b353e..176e137487dc120be8668a8f4980b8b509e79156
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -4,21 -4,21 +4,21 @@@ Priority: optiona
  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~),
-                debhelper-compat (= 12),
-                extra-cmake-modules (>= 5.60.0~),
-                libkf5akonadi-dev (>= 4:19.08.3~),
-                libkf5akonadimime-dev (>= 4:19.08.3~),
-                libkf5configwidgets-dev (>= 5.60.0~),
+                debhelper-compat (= 13),
+                extra-cmake-modules (>= 5.68.0~),
+                libkf5akonadi-dev (>= 4:20.04.1~),
+                libkf5akonadimime-dev (>= 4:20.04.1~),
+                libkf5configwidgets-dev (>= 5.68.0~),
                 libkf5dbusaddons-dev,
                 libkf5doctools-dev (>= 5.39.0~),
-                libkf5i18n-dev (>= 5.60.0~),
-                libkf5kcmutils-dev (>= 5.60.0~),
-                libkf5kio-dev (>= 5.60.0~),
-                libkf5mime-dev (>= 19.08.3~),
-                libkf5textwidgets-dev (>= 5.60.0~),
-                libkf5wallet-dev (>= 5.60.0~),
-                libkpimgapi-dev (>= 19.08.3~) [amd64 arm64 i386 mipsel],
-                libkpimsmtp-dev (>= 19.08.3~),
+                libkf5i18n-dev (>= 5.68.0~),
+                libkf5kcmutils-dev (>= 5.68.0~),
+                libkf5kio-dev (>= 5.68.0~),
+                libkf5mime-dev (>= 20.04.1~),
+                libkf5textwidgets-dev (>= 5.68.0~),
+                libkf5wallet-dev (>= 5.68.0~),
 -               libkpimgapi-dev (>= 20.04.1~) [amd64 arm64 armhf i386 mipsel],
++               libkpimgapi-dev (>= 20.04.1~) [amd64 arm64 i386 mipsel],
+                libkpimsmtp-dev (>= 20.04.1~),
                 libsasl2-dev,
                 libsasl2-modules,
                 pkg-config,