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

diff --cc debian/changelog
index c66267d823e76bbf4b652bfc605dd7767e601e20,7a6a2ce0c79b90b43d78829531055112c7f487dd..eb2c60e22fdd780d3d40c264699449250d23f3c6
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,19 +1,26 @@@
- akonadi-calendar-tools (4:20.04.1-2+rpi1) bullseye-staging; urgency=medium
++akonadi-calendar-tools (4:20.08.2-2+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from 4:17.08.3-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 24 Jan 2018 08:22:49 +0000]
 +  * Remove armhf from architecture list for kdepim-runtime dependency.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Tue, 01 Sep 2020 08:39:43 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 29 Oct 2020 16:57:07 +0000
++
+ akonadi-calendar-tools (4:20.08.2-2) unstable; urgency=medium
+ 
+   * Team upload to unstable.
+ 
+  -- Sandro Knauß <hefee@debian.org>  Tue, 20 Oct 2020 00:09:53 +0200
+ 
+ akonadi-calendar-tools (4: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.
+ 
+  -- Sandro Knauß <hefee@debian.org>  Fri, 16 Oct 2020 00:53:27 +0200
  
  akonadi-calendar-tools (4:20.04.1-2) unstable; urgency=medium
  

diff --cc debian/control
index 0ac43c91eccb99b11475b8ef228b3d99bd27ef46,2942b3ba1caa672ba9ac5803f3e27022bc2e86dc..e2f8fa84cbaad77ea086605d7b396b4bcf947725
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -31,9 -32,9 +32,9 @@@ Rules-Requires-Root: n
  
  Package: konsolekalendar
  Architecture: any
 -Depends: kdepim-runtime [amd64 arm64 armhf i386 mipsel],
 +Depends: kdepim-runtime [amd64 arm64 i386 mipsel],
           ${misc:Depends},
-          ${shlibs:Depends}
+          ${shlibs:Depends},
  Description: konsole personal organizer
   KonsoleKalendar is a command-line interface to KDE calendars.
   KonsoleKalendar complements KOrganizer by providing a console