Merge version 4:17.08.3-2+rpi1 and 4:17.12.3-1 to produce 4:17.12.3-1+rpi1

diff --cc debian/changelog
index 6a1f9542cd7320d0a7c2949df03c59d531006afe,dfa903577615d5d39be58752bfdb5c642e25dbe8..461970931b7e037cc07bb599b1324d58278e88dc
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,28 +1,35 @@@
- knotes (4:17.08.3-2+rpi1) buster-staging; urgency=medium
++knotes (4:17.12.3-1+rpi1) buster-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.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Wed, 24 Jan 2018 08:32:43 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 09 Apr 2018 05:47:33 +0000
++
+ knotes (4:17.12.3-1) unstable; urgency=medium
+ 
+   * Team upload.
+ 
+   [ Sandro Knauß ]
+   * New upstream release (17.12.3).
+   * Update build-deps and deps with the info from cmake.
+   * use secure copyright format uri.
+   * small fixes in copyright file.
+ 
+  -- Sandro Knauß <hefee@debian.org>  Sat, 31 Mar 2018 18:26:12 +0200
+ 
+ knotes (4:17.12.2-1) experimental; urgency=medium
+ 
+   * Team upload.
+ 
+   [ Sandro Knauß ]
+   * New upstream release (17.12.2).
+   * Update Vcs links to salsa.
+   * Update build-deps and deps with the info from cmake
+   * Update copyright file.
+   * Enable build tests.
+   * Bump debhelper build-dep and compat to 11.
+ 
+  -- Sandro Knauß <hefee@debian.org>  Fri, 09 Mar 2018 15:14:44 +0100
  
  knotes (4:17.08.3-2) unstable; urgency=medium
  

diff --cc debian/control
Simple merge