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

diff --cc debian/changelog
index 84faa7ced3a8a240a3f49af89c16d9a645bd4f78,c756c179cc5cce4be04d0129f513aa306e89204a..e68dad49ba12ce1da5b7b31126169b6208ab7107
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,21 +1,28 @@@
- knotes (4:20.04.1-3+rpi1) bullseye-staging; urgency=medium
++knotes (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:32:43 +0000]
 +  * Remove armhf from architecture list for kdepim-runtime dependency.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sat, 05 Sep 2020 21:49:02 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 29 Oct 2020 22:44:06 +0000
++
+ knotes (4:20.08.2-2) unstable; urgency=medium
+ 
+   * Team upload to unstable.
+ 
+  -- Sandro Knauß <hefee@debian.org>  Tue, 20 Oct 2020 00:08:58 +0200
+ 
+ knotes (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.
+   * Fix copyright information for appdata.xml.
+ 
+  -- Sandro Knauß <hefee@debian.org>  Fri, 16 Oct 2020 00:53:12 +0200
  
  knotes (4:20.04.1-3) unstable; urgency=medium
  

diff --cc debian/control
Simple merge