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 53ce5bdfff30c12209f346e1bee3f8af6cc375dd,f8fd99d061be9f5923f4be4d04e582c62158e592..1dce4fd24ce0d06fdc71753b585e4496ccab2e29
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,15 +1,22 @@@
- korganizer (4:20.04.1-1+rpi1) bullseye-staging; urgency=medium
++korganizer (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:48:57 +0000]
 +  * Remove armhf from architecture list for kdepim-runtime dependency.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 12 Jun 2020 01:01:45 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 01 Sep 2020 09:11:33 +0000
++
+ korganizer (4:20.04.1-2) unstable; urgency=medium
+ 
+   * Team upload.
+   * Explicitly add the gettext build dependency.
+   * Switch from dhmk to the dh sequencer:
+     - invoke the dh sequencer using the kf5 addon
+     - call the right debhelper command instead of $(overridden_command)
+   * Unregister the old /etc/xdg/korganizer.categories,
+     /etc/xdg/korganizer.knsrc, and /etc/xdg/korganizer.renamecategories
+     conffiles.
+ 
+  -- Pino Toscano <pino@debian.org>  Sat, 22 Aug 2020 22:55:35 +0200
  
  korganizer (4:20.04.1-1) unstable; urgency=medium
  

diff --cc debian/control
Simple merge