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

diff --cc debian/changelog
index 461970931b7e037cc07bb599b1324d58278e88dc,4ff7769be6878ecd73e639ada4889136044f6ad9..835c8c14ee23819bba13a6123b2c2fbc740fdcee
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,27 +1,34 @@@
- knotes (4:17.12.3-1+rpi1) buster-staging; urgency=medium
++knotes (4:18.08.1-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.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Mon, 09 Apr 2018 05:47:33 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 16 Oct 2018 14:01:47 +0000
++
+ knotes (4:18.08.1-1) unstable; urgency=medium
+ 
+   * Team upload.
+ 
+   [ Sandro Knauß ]
+   * Bump Standards-Version to 4.2.1 (No changes needed).
+   * New upstream release (18.08.1).
+   * Follow stable releases in KDE again.
+   * Update build-deps and deps with the info from cmake.
+ 
+  -- Sandro Knauß <hefee@debian.org>  Tue, 02 Oct 2018 23:20:18 +0200
+ 
+ knotes (4:18.07.90-1) experimental; urgency=medium
+ 
+   * Team upload.
+ 
+   [ Sandro Knauß ]
+   * Update watch file to match unstable releases, too.
+   * New upstream release (18.07.90).
+   * Bump Standards-Version to 4.2.0 (No changes needed).
+   * Update build-deps and deps with the info from cmake.
+   * Update copyright file for new upstream.
+ 
+  -- Sandro Knauß <hefee@debian.org>  Sat, 18 Aug 2018 12:15:05 +0200
  
  knotes (4:17.12.3-1) unstable; urgency=medium
  

diff --cc debian/control
Simple merge