Merge version 4:18.08.3-4+rpi2 and 4:18.08.3-6 to produce 4:18.08.3-6+rpi1

diff --cc debian/changelog
index d951a58542e4309cc0a1f848556ff57c4292f8e4,29a93afcc3d1c887b65ae0b58e5975e8fee3c50b..fd076be064865d1820db096261eb61cc1eadf3a7
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,19 +1,31 @@@
- kdepim-runtime (4:18.08.3-4+rpi2) buster-staging; urgency=medium
++kdepim-runtime (4:18.08.3-6+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
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 04 Apr 2019 13:53:23 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 06 Dec 2019 03:56:46 +0000
 +
- kdepim-runtime (4:18.08.3-4+rpi1) buster-staging; urgency=medium
+ kdepim-runtime (4:18.08.3-6) unstable; urgency=medium
  
-   * Remove armhf from architecture list for build-depends on libkpimgapi-dev 
-     and qtwebengine5-dev
+   * Release to unstable.
+ 
+  -- Sandro Knauß <hefee@debian.org>  Thu, 14 Nov 2019 23:51:03 +0100
+ 
+ kdepim-runtime (4:18.08.3-5) 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.
+   * Enforce depdendencies between KDEPIM packages to enable bundling.
  
-  -- Peter Michael Green <plugwash@raspbian.org>  Wed, 03 Apr 2019 22:53:45 +0000
+  -- Sandro Knauß <hefee@debian.org>  Sun, 06 Oct 2019 22:43:28 +0200
  
  kdepim-runtime (4:18.08.3-4) unstable; urgency=medium
  

diff --cc debian/control
index ac93aea3022d31ba6e3dbbe1a028449dca48e7d6,2b6847f8d451a77073b36032fd5e34aa2582ab08..8063d5280f262e72385a9c5af7d459bfad8d8761
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -41,18 -42,18 +42,18 @@@ Build-Depends: cmake (>= 3.0~)
                 libkf5textwidgets-dev (>= 5.47.0~),
                 libkf5windowsystem-dev (>= 5.47.0~),
                 libkolabxml-dev (>= 1.1~),
-                libkpimgapi-dev (>= 18.08.3~) [amd64 arm64 i386 mipsel],
-                libkpimkdav-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],
+                libkpimkdav-dev (>> 18.08.3-2),
                 libqt5texttospeech5-dev,
                 libqt5xmlpatterns5-dev (>= 5.9.0~),
                 libsasl2-dev,
                 pkg-config,
                 pkg-kde-tools (>= 0.12),
                 qtbase5-dev (>= 5.9.0~),
 -               qtwebengine5-dev (>= 5.9.0~) [amd64 arm64 armhf i386 mipsel],
 +               qtwebengine5-dev (>= 5.9.0~) [amd64 arm64 i386 mipsel],
                 shared-mime-info (>= 1.3~),
                 xsltproc,
- Standards-Version: 4.3.0
+ Standards-Version: 4.4.1
  Homepage: http://pim.kde.org/
  Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/kdepim-runtime
  Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/kdepim-runtime.git
@@@ -61,17 -62,11 +62,11 @@@ 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],
           ${misc:Depends},
           ${shlibs:Depends},
- Replaces: kf5-kdepimlibs-kio-plugins, ${kde-l10n:all}
- Breaks: kf5-kdepimlibs-kio-plugins,
-         kmail (<< 4:17.08),
-         knotes (<< 4:17.08),
-         konsolekalendar (<< 4:17.08),
-         kontact (<< 4:17.08),
-         korganizer (<< 4:17.08),
-         ${kde-l10n:all},
+ Replaces: ${kde-l10n:all}
+ Breaks: ${kde-l10n:all}
  Description: runtime components for Akonadi KDE
   This package contains Akonadi agents written using KDE Development Platform
   libraries.