Merge version 18.08.3-2+rpi1 and 18.08.3-4 to produce 18.08.3-4+rpi1

diff --cc debian/changelog
index 8f342f17e44060346c5e6febbb6df8afe4d0d689,1ef07275cdc26ae72b42fde91b1ed45eb1095944..8aba1ffdfeed58d1deb9ed5803fe6a73204d0dcc
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,20 +1,27 @@@
- kmailtransport (18.08.3-2+rpi1) buster-staging; urgency=medium
++kmailtransport (18.08.3-4+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, 26 Feb 2019 01:52:16 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 21 Nov 2019 01:34:18 +0000
++
+ kmailtransport (18.08.3-4) unstable; urgency=medium
+ 
+   * Release to unstable.
+ 
+  -- Sandro Knauß <hefee@debian.org>  Thu, 14 Nov 2019 23:50:15 +0100
+ 
+ kmailtransport (18.08.3-3) experimental; urgency=medium
+ 
+   [ Sandro Knauß ]
+   * Bump Standards-Version to 4.4.1 (No changes needed).
+   * Bump compat level to 12.
+   * Add myself to Uploaders.
+   * Delete not needed Breaks/Confilcts.
+   * Use virtual packages to bundle KDEPIM.
+   * Enforce depdendencies between KDEPIM packages to enable bundling.
+ 
+  -- Sandro Knauß <hefee@debian.org>  Sat, 05 Oct 2019 00:56:52 +0200
  
  kmailtransport (18.08.3-2) unstable; urgency=medium
  

diff --cc debian/control
index f18672009361fc8e3d9a6e2174877a1595ec3f91,7d882d50b5300d6fbd5c6eb57a4a500c06a7e1ec..6d1d0cb48e4d506fad5e0021eb2e76126d02acb0
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -14,11 -14,11 +14,11 @@@ Build-Depends: cmake (>= 3.0~)
                 libkf5i18n-dev (>= 5.47.0~),
                 libkf5kcmutils-dev (>= 5.47.0~),
                 libkf5kio-dev (>= 5.47.0~),
-                libkf5mime-dev (>= 18.08.3~),
+                libkf5mime-dev (>> 18.08.3-1),
                 libkf5textwidgets-dev (>= 5.47.0~),
                 libkf5wallet-dev (>= 5.47.0~),
-                libkpimgapi-dev (>= 18.08.3~) [amd64 arm64 i386 mipsel],
-                libkpimsmtp-dev (>= 18.08.3~),
 -               libkpimgapi-dev (>> 18.08.3-2) [amd64 arm64 armhf i386 mipsel],
++               libkpimgapi-dev (>> 18.08.3-2) [amd64 arm64 i386 mipsel],
+                libkpimsmtp-dev (>> 18.08.3-1),
                 libsasl2-dev,
                 libsasl2-modules,
                 pkg-config,