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 642f86cefc48c5f95aba0004c1e8ea517e4939b1,425d5a2fd1839237a8f5bd5ca601572d0b9f8b91..0318a7c104d3460ee4958a63ae0dfe1be6538318
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,14 +1,27 @@@
- libkf5libkleo (4:20.04.1-1+rpi1) bullseye-staging; urgency=medium
++libkf5libkleo (4:20.04.1-2+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from 4:17.08.3-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 18 Jan 2018 16:40:34 +0000]
 +  * Update symbols file for Raspbian.
 +
 +  [changes introduced in 4:18.08.1-1+rpi1 by Peter Michael Green]
 +  * Further symbols files updates for raspbian.
 +
 +  [changes introduce in 4:20.04.1-1+rpi1 by Peter Michael Green]
 +  * Further symbols file updates for raspbian.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Tue, 09 Jun 2020 23:32:18 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 01 Sep 2020 09:53:58 +0000
++
+ libkf5libkleo (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/libkleo.categories, and
+     /etc/xdg/libkleo.renamecategories conffiles.
+ 
+  -- Pino Toscano <pino@debian.org>  Sun, 23 Aug 2020 10:32:31 +0200
  
  libkf5libkleo (4:20.04.1-1) unstable; urgency=medium