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 5ee1a2ca237104907b0cc7af1286b921780fa089,77d85030c01bbdc0d21c998d7f350a61b084ee96..7664f371550f181824b244211a87ef7b87963b5b
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,19 +1,26 @@@
- knotes (4:18.08.3-1+rpi1) buster-staging; urgency=medium
++knotes (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:32:43 +0000]
 +  * Remove armhf from architecture list for kdepim-runtime dependency.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 28 Feb 2019 16:01:04 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 06 Dec 2019 00:47:28 +0000
++
+ knotes (4:18.08.3-3) unstable; urgency=medium
+ 
+   * Release to unstable.
+ 
+  -- Sandro Knauß <hefee@debian.org>  Thu, 14 Nov 2019 23:51:17 +0100
+ 
+ knotes (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:43:18 +0200
  
  knotes (4:18.08.3-1) unstable; urgency=medium
  

diff --cc debian/control
Simple merge