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

diff --cc debian/changelog
index 406a1575bd8297f0697b702ba4ca0ceb45c3a18f,747195b76660832d37e5aa65496b60aa58095db0..84faa7ced3a8a240a3f49af89c16d9a645bd4f78
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,11 +1,18 @@@
- knotes (4:20.04.1-2+rpi1) bullseye-staging; urgency=medium
++knotes (4:20.04.1-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:32:43 +0000]
 +  * Remove armhf from architecture list for kdepim-runtime dependency.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Mon, 24 Aug 2020 15:09:48 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 05 Sep 2020 21:49:02 +0000
++
+ knotes (4:20.04.1-3) unstable; urgency=medium
+ 
+   * Team upload.
+   * Explicitly add the gettext build dependency.
+   * Unregister the old /etc/xdg/knotes_printing_theme.knsrc conffile.
+   * Update lintian overrides.
+ 
+  -- Pino Toscano <pino@debian.org>  Fri, 28 Aug 2020 12:16:45 +0200
  
  knotes (4:20.04.1-2) unstable; urgency=medium
  

diff --cc debian/control
Simple merge