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

diff --cc debian/changelog
index e68dad49ba12ce1da5b7b31126169b6208ab7107,c38fb7fc3f8106d422a552cb6a0ba7909ede0706..d00f6bc12f126560151d5f56b96a5742010df6b4
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,12 +1,19 @@@
- knotes (4:20.08.2-2+rpi1) bullseye-staging; urgency=medium
++knotes (4:20.08.3-1+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>  Thu, 29 Oct 2020 22:44:06 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 23 Dec 2020 13:10:04 +0000
++
+ knotes (4:20.08.3-1) unstable; urgency=medium
+ 
+   [ Sandro Knauß ]
+   * Bump Standards-Version to 4.5.1 (No changes needed).
+   * New upstream release (20.08.3).
+   * Update build-deps and deps with the info from cmake.
+   * Minimize the upstream GPG signing key.
+ 
+  -- Sandro Knauß <hefee@debian.org>  Wed, 16 Dec 2020 01:50:10 +0100
  
  knotes (4:20.08.2-2) unstable; urgency=medium
  

diff --cc debian/control
Simple merge