Merge version 4:20.08.2-3+rpi1 and 4:20.08.2-4 to produce 4:20.08.2-4+rpi1

diff --cc debian/changelog
index 472e49b9241104e8d537123c39372f89080b9309,815ddeab2eceffe7d2b5c5ecac3e1aefd360e9a2..5eb31181a66d7f027fdffb69a0c247a225043580
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,8 +1,20 @@@
- kdepim-runtime (4:20.08.2-3+rpi1) bullseye-staging; urgency=medium
++kdepim-runtime (4:20.08.2-4+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, 29 Oct 2020 17:36:54 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 05 Nov 2020 19:28:55 +0000
++
+ kdepim-runtime (4:20.08.2-4) unstable; urgency=medium
+ 
+   * Add libsasl2-modules to Depends (Closes: #970127)
+ 
+  -- Sandro Knauß <hefee@debian.org>  Mon, 26 Oct 2020 23:44:27 +0100
  
  kdepim-runtime (4:20.08.2-3) unstable; urgency=medium
  

diff --cc debian/control
index a720aff2f5bd015817ddf4329cae4656f7e46c92,10fb7ffbaa64269d11dd1d67da963a0b8914c619..2e3d4b95b0eb33f7f49457ae45018f11279692bf
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -66,7 -66,8 +66,8 @@@ Package: kdepim-runtim
  Architecture: any
  Depends: akonadi-server (>= 1.8),
           kio-ldap,
 -         libsasl2-modules-kdexoauth2 [amd64 arm64 armhf i386 mipsel],
 +         libsasl2-modules-kdexoauth2 [amd64 arm64 i386 mipsel],
+          libsasl2-modules,
           ${misc:Depends},
           ${shlibs:Depends},
  Breaks: libkf5libkdepim-data (<< 4:20.08~),