From: Raspbian forward pporter <root@raspbian.org>
Date: Mon, 9 Apr 2018 05:47:33 +0000 (+0100)
Subject: Merge version 4:17.08.3-2+rpi1 and 4:17.12.3-1 to produce 4:17.12.3-1+rpi1
X-Git-Tag: raspbian/4%17.12.3-1+rpi1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ee7e6460c5b98ca1ffb82aec7766a160c12b4f9d;p=knotes.git

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

649a7ac879383c9523048dcce64d995841d46364
diff --cc debian/changelog
index 6a1f954,dfa9035..4619709
--- a/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