Merge version 4:18.08.3-1+rpi1 and 4:18.08.3-3 to produce 4:18.08.3-3+rpi1

diff --cc debian/changelog
index 13c06adccfefee76c54b17718a1a7a69e7f665cb,b9e451f1166b0ac6e4d6e16d296f1583ce006835..60556a65f6d2fa45378c4997b80ded9a2e35d8d2
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,19 +1,26 @@@
- akonadi-calendar-tools (4:18.08.3-1+rpi1) buster-staging; urgency=medium
++akonadi-calendar-tools (4:18.08.3-3+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from 4:17.08.3-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 24 Jan 2018 08:22:49 +0000]
 +  * Remove armhf from architecture list for kdepim-runtime dependency.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 28 Feb 2019 15:25:59 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 05 Dec 2019 18:12:06 +0000
++
+ akonadi-calendar-tools (4:18.08.3-3) unstable; urgency=medium
+ 
+     * Release to unstable.
+ 
+  -- Sandro Knauß <hefee@debian.org>  Thu, 14 Nov 2019 23:54:32 +0100
+ 
+ akonadi-calendar-tools (4:18.08.3-2) 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.
+ 
+  -- Sandro Knauß <hefee@debian.org>  Sun, 06 Oct 2019 22:44:16 +0200
  
  akonadi-calendar-tools (4:18.08.3-1) unstable; urgency=medium
  

diff --cc debian/control
index e2043eff8fba654560117a6c95287ff22c63ed1e,5e719c52d9d8acd5006ba9393b886e9f00210576..c70dd746172f723326eb353ea2d1735a7185e8f2
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -29,11 -30,11 +30,11 @@@ Vcs-Git: https://salsa.debian.org/qt-kd
  
  Package: konsolekalendar
  Architecture: any
 -Depends: kdepim-runtime [amd64 arm64 armhf i386 mipsel],
 +Depends: kdepim-runtime [amd64 arm64 i386 mipsel],
           ${misc:Depends},
           ${shlibs:Depends},
- Breaks: korganizer (<< 4:17.08~), ${kde-l10n:all}
- Replaces: korganizer (<< 4:17.08~), ${kde-l10n:all}
+ Breaks: ${kde-l10n:all}
+ Replaces: ${kde-l10n:all}
  Description: konsole personal organizer
   KonsoleKalendar is a command-line interface to KDE calendars.
   KonsoleKalendar complements KOrganizer by providing a console