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 064bb48c595f4e87cbd97cb9bab87e05787c9f80,53e50893ca0fc00e1699a872060051c1e278f73b..a3b14d07ab4fd2b99a6ae56bd952905447702e56
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,28 +1,35 @@@
- korganizer (4:17.08.3-2+rpi1) buster-staging; urgency=medium
++korganizer (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:48:57 +0000]
 +  * Remove armhf from architecture list for kdepim-runtime dependency.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Wed, 24 Jan 2018 08:48:57 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 09 Apr 2018 06:58:29 +0000
++
+ korganizer (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:37 +0200
+ 
+ korganizer (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 (make them non-failing).
+   * Bump debhelper build-dep and compat to 11.
+ 
+  -- Sandro Knauß <hefee@debian.org>  Fri, 09 Mar 2018 15:14:57 +0100
  
  korganizer (4:17.08.3-2) unstable; urgency=medium
  

diff --cc debian/control
index 30e7c2d24e1f25c0965d397ca656e980a58c480f,acdbb5578a9cc6a171015081a9ae8ef4f505d800..1de5d4154fe5e66513be98998e794038bc20b0be
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -64,13 -67,12 +67,12 @@@ Vcs-Git: https://salsa.debian.org/qt-kd
  
  Package: korganizer
  Architecture: any
 -Depends: kdepim-runtime [amd64 arm64 armhf i386 mipsel],
 +Depends: kdepim-runtime [amd64 arm64 i386 mipsel],
-          ${misc:Depends}, ${shlibs:Depends}
+          ${misc:Depends},
+          ${shlibs:Depends},
  Homepage: http://kontact.kde.org/korganizer/
- Breaks: kdepim-doc (<< 4:16.12.0),
-         ${kde-l10n:all},
- Replaces: kdepim-doc (<< 4:16.12.0),
-           ${kde-l10n:all},
+ Breaks: kdepim-doc (<< 4:16.12.0), ${kde-l10n:all}
+ Replaces: kdepim-doc (<< 4:16.12.0), ${kde-l10n:all}
  Description: calendar and personal organizer
   This package contains KOrganizer, a calendar and scheduling program.
   .