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 bfd76bb6783d1a69265f81099091d96b9a924006,7d58982004e44eb016fc7b2a43143991910b5eda..c66267d823e76bbf4b652bfc605dd7767e601e20
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,13 +1,20 @@@
- akonadi-calendar-tools (4:20.04.1-1+rpi1) bullseye-staging; urgency=medium
++akonadi-calendar-tools (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:22:49 +0000]
 +  * Remove armhf from architecture list for kdepim-runtime dependency.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Wed, 24 Jun 2020 22:05:44 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 01 Sep 2020 08:39:43 +0000
++
+ akonadi-calendar-tools (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
+   * Unregister the old /etc/xdg/console.categories, and
+     /etc/xdg/console.renamecategories conffiles.
+ 
+  -- Pino Toscano <pino@debian.org>  Sat, 22 Aug 2020 23:20:54 +0200
  
  akonadi-calendar-tools (4:20.04.1-1) unstable; urgency=medium
  

diff --cc debian/control
Simple merge