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 b8d92e20150281081fbe718b1b7e901922c88c62,a33532d722015bddac520236d0fbc8f2481fe927..856d6647a294521bcca10e351ae2f009f94f2d7d
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,20 +1,32 @@@
- kdepim-runtime (4:20.04.1-1+rpi1) bullseye-staging; urgency=medium
++kdepim-runtime (4:20.04.1-2+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from 4:18.08.3-4+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 03 Apr 2019 22:53:45 +0000]
 +  * Remove armhf from architecture list for build-depends on libkpimgapi-dev 
 +    and qtwebengine5-dev
 +
 +  [changes brought forward from 4:18.08.3-4+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Thu, 04 Apr 2019 13:53:23 +0000]
 +  * Remove armhf from architecture list for depends on
 +    libsasl2-modules-kdexoauth2
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 11 Jun 2020 13:16:19 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 01 Sep 2020 10:46:14 +0000
++
+ kdepim-runtime (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/kdepim-runtime.categories, and
+     /etc/xdg/kdepim-runtime.renamecategories conffiles.
+   * Backport upstream commit bd64ab29116aa7318fdee7f95878ff97580162f2 to make
+     new POP3 connections encrypted by default (CVE-2020-15954); patch
+     upstream_Fix-Bug-423426-POP3-setup-wizard-defaults-to-unencry.patch.
+     (Closes: #966666)
+   * Update lintian overrides.
+   * Fix typo in the description of patch make_qtwebengine_optional.patch.
+ 
+  -- Pino Toscano <pino@debian.org>  Sat, 22 Aug 2020 20:35:34 +0200
  
  kdepim-runtime (4:20.04.1-1) unstable; urgency=medium
  

diff --cc debian/control
Simple merge