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

diff --cc debian/changelog
index 1dce4fd24ce0d06fdc71753b585e4496ccab2e29,142cccac044e899d07ac63f3f84012bfaa35ea25..5a545cfc688a702882d2c3f92ec589a17d36bf65
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,27 +1,34 @@@
- korganizer (4:20.04.1-2+rpi1) bullseye-staging; urgency=medium
++korganizer (4:20.08.2-3+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:48:57 +0000]
 +  * Remove armhf from architecture list for kdepim-runtime dependency.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Tue, 01 Sep 2020 09:11:33 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 29 Oct 2020 23:25:15 +0000
++
+ korganizer (4:20.08.2-3) unstable; urgency=medium
+ 
+   * Add kuserfeedback-dev to B-D.
+ 
+  -- Sandro Knauß <hefee@debian.org>  Mon, 26 Oct 2020 23:13:42 +0100
+ 
+ korganizer (4:20.08.2-2) unstable; urgency=medium
+ 
+   * Team upload to unstable.
+ 
+  -- Sandro Knauß <hefee@debian.org>  Tue, 20 Oct 2020 00:10:25 +0200
+ 
+ korganizer (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.
+   * Add Bug-* entries to metadata file.
+   * Remove not needed Build-Depends.
+ 
+  -- Sandro Knauß <hefee@debian.org>  Fri, 16 Oct 2020 00:53:51 +0200
  
  korganizer (4:20.04.1-2) unstable; urgency=medium
  

diff --cc debian/control
index 86dd9eb07ddb3f4c817bce28df1556cead4b3fd0,47c5c4f9af12a3ddefe33c144d3e8660ae6c1210..53efc8741310948c2e0609d56dd67d709379fa71
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -70,9 -70,9 +70,9 @@@ Rules-Requires-Root: n
  
  Package: korganizer
  Architecture: any
 -Depends: kdepim-runtime [amd64 arm64 armhf i386 mipsel],
 +Depends: kdepim-runtime [amd64 arm64 i386 mipsel],
           ${misc:Depends},
-          ${shlibs:Depends}
+          ${shlibs:Depends},
  Homepage: http://kontact.kde.org/korganizer/
  Description: calendar and personal organizer
   This package contains KOrganizer, a calendar and scheduling program.