Merge version 4:19.08.3-1+rpi1 and 4:20.04.1-1 to produce 4:20.04.1-1+rpi1

diff --cc debian/changelog
index cc06e7f0c4cd08c9505eaed7afee6f0fb0210e02,b6e80c214633cc4ebbf60c84a3bd87690bd37d98..8e98e1469882719dafd6a28dd3d5afd64e526b99
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,29 +1,36 @@@
- knotes (4:19.08.3-1+rpi1) bullseye-staging; urgency=medium
++knotes (4:20.04.1-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>  Mon, 09 Dec 2019 18:57:30 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 09 Jun 2020 21:00:21 +0000
++
+ knotes (4:20.04.1-1) unstable; urgency=medium
+ 
+   [ Sandro Knauß ]
+   * New upstream release (20.04.1).
+   * Update build-deps and deps with the info from cmake.
+   * Remove not needed Build-Depends.
+   * Lower Grantlee dependency to 5.1.
+ 
+  -- Sandro Knauß <hefee@debian.org>  Wed, 27 May 2020 00:00:30 +0200
+ 
+ knotes (4:20.04.0-1) experimental; urgency=medium
+ 
+   [ Sandro Knauß ]
+   * Update watch file to the new release-service location.
+   * Bump compat level to 13.
+   * Bump Standards-Version to 4.5.0 (No changes needed).
+   * Add Rules-Requires-Root field to control.
+   * New upstream release (20.04.0).
+   * Update build-deps and deps with the info from cmake.
+   * Lower Grantlee depdendency to 5.1.
+   * Enable hardening all.
+   * Set fields Upstream-Name, Upstream-Contact in debian/copyright.
+   * Remove obsolete fields Contact, Name from debian/upstream/metadata
+     (already present in machine-readable debian/copyright).
+ 
+  -- Sandro Knauß <hefee@debian.org>  Wed, 13 May 2020 12:23:42 +0200
  
  knotes (4:19.08.3-1) unstable; urgency=medium
  

diff --cc debian/control
Simple merge