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

diff --cc debian/changelog
index 8e98e1469882719dafd6a28dd3d5afd64e526b99,fbe35eec4d7a93687a08e86e05d9bf8dbb3a9001..406a1575bd8297f0697b702ba4ca0ceb45c3a18f
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,15 +1,22 @@@
- knotes (4:20.04.1-1+rpi1) bullseye-staging; urgency=medium
++knotes (4:20.04.1-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>  Tue, 09 Jun 2020 21:00:21 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 24 Aug 2020 15:09:48 +0000
++
+ knotes (4:20.04.1-2) unstable; urgency=medium
+ 
+   * Team upload.
+   * Switch from dhmk to the dh sequencer:
+     - invoke the dh sequencer using the kf5 addon
+   * There is grantlee 5.2 in Debian, so:
+     - drop patch lower_grantlee_dep.patch
+     - bump the libgrantlee5-dev build dependency to 5.2
+   * Unregister the old /etc/xdg/knotes.categories, and
+     /etc/xdg/knotes.renamecategories conffiles.
+ 
+  -- Pino Toscano <pino@debian.org>  Sun, 16 Aug 2020 20:17:43 +0200
  
  knotes (4:20.04.1-1) unstable; urgency=medium
  

diff --cc debian/control
Simple merge