Merge version 20.04.1-2+rpi1 and 20.08.2-2 to produce 20.08.2-2+rpi1

diff --cc debian/changelog
index f89ff4ef2490da4919f224f2f5973a61a99de2d2,88a1baec2a71bc185dd459002723b6f9ce09e660..5e6e121e2a4d52d817cb04dd6b5ea44acaab4e72
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,21 +1,28 @@@
- kmailtransport (20.04.1-2+rpi1) bullseye-staging; urgency=medium
++kmailtransport (20.08.2-2+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>  Tue, 25 Aug 2020 20:10:51 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 28 Oct 2020 23:52:15 +0000
++
+ kmailtransport (20.08.2-2) unstable; urgency=medium
+ 
+   * Team upload to unstable.
+ 
+  -- Sandro Knauß <hefee@debian.org>  Tue, 20 Oct 2020 00:08:25 +0200
+ 
+ kmailtransport (20.08.2-1) experimental; urgency=medium
+ 
+   [ Sandro Knauß ]
+   * New upstream release (20.08.2).
+   * Update build-deps and deps with the info from cmake.
+   * Update Homepage link to point to new invent.kde.org
+   * Update field Source in debian/copyright to invent.kde.org move.
+   * Update repository related entries to metadata file.
+   * Add Bug-* entries to metadata file.
+   * Update patch for 20.08.
+ 
+  -- Sandro Knauß <hefee@debian.org>  Fri, 16 Oct 2020 00:52:42 +0200
  
  kmailtransport (20.04.1-2) unstable; urgency=medium
  

diff --cc debian/control
index df7b09c6df385fe547aace8baad383afceabc75e,5c366168301987c0f2cc9c10df47416352b2243d..4d91b377b00bc42af020199c9c1bdd9a3cd5b130
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -5,21 -5,21 +5,21 @@@ Maintainer: Debian/Kubuntu Qt/KDE Maint
  Uploaders: Maximiliano Curia <maxy@debian.org>, Sandro Knauß <hefee@debian.org>
  Build-Depends: cmake (>= 3.5~),
                 debhelper-compat (= 13),
-                extra-cmake-modules (>= 5.68.0~),
+                extra-cmake-modules (>= 5.71.0~),
                 gettext,
-                libkf5akonadi-dev (>= 4:20.04.1~),
-                libkf5akonadimime-dev (>= 4:20.04.1~),
-                libkf5configwidgets-dev (>= 5.68.0~),
+                libkf5akonadi-dev (>= 4:20.08.2~),
+                libkf5akonadimime-dev (>= 4:20.08.2~),
+                libkf5configwidgets-dev (>= 5.71.0~),
                 libkf5dbusaddons-dev,
                 libkf5doctools-dev (>= 5.39.0~),
-                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 i386 mipsel],
-                libkpimsmtp-dev (>= 20.04.1~),
+                libkf5i18n-dev (>= 5.71.0~),
+                libkf5kcmutils-dev (>= 5.71.0~),
+                libkf5kio-dev (>= 5.71.0~),
+                libkf5mime-dev (>= 20.08.2~),
+                libkf5textwidgets-dev (>= 5.71.0~),
+                libkf5wallet-dev (>= 5.71.0~),
 -               libkpimgapi-dev (>= 20.08.2~) [amd64 arm64 armhf i386 mipsel],
++               libkpimgapi-dev (>= 20.08.2~) [amd64 arm64 i386 mipsel],
+                libkpimsmtp-dev (>= 20.08.2~),
                 libsasl2-dev,
                 libsasl2-modules,
                 pkg-config,