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

diff --cc debian/changelog
index 59ac825791554ac752ca82f938b527b3c92b95cf,3a5cdd825d0fab3717c656e7b1e07790d0d39574..f89ff4ef2490da4919f224f2f5973a61a99de2d2
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,18 +1,25 @@@
- kmailtransport (20.04.1-1+rpi1) bullseye-staging; urgency=medium
++kmailtransport (20.04.1-2+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from 18.08.1-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Tue, 16 Oct 2018 14:10:00 +0000]
 +  * Remove armhf from architecture list for libkpimgapi-dev dependency.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Tue, 09 Jun 2020 22:36:00 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 25 Aug 2020 20:10:51 +0000
++
+ kmailtransport (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/kmailtransport.categories, and
+     /etc/xdg/kmailtransport.renamecategories conffiles. (Closes: #946506)
+   * Remove the unused ${shlibs:Depends} substvar from libkf5mailtransport-data.
+   * Move the translations from libkf5mailtransport5 to libkf5mailtransport-data
+     - add proper breaks/replaces
+   * Tighten inter-library dependencies.
+ 
+  -- Pino Toscano <pino@debian.org>  Thu, 20 Aug 2020 06:59:26 +0200
  
  kmailtransport (20.04.1-1) unstable; urgency=medium
  

diff --cc debian/control
Simple merge