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 3c9566734c6dd49325048358f350f92ea8b528fc,a694dd41a497ed0a3a5b956d1cc8e2bc5093e6a7..1173c92d4b1fe10fe6c61830703fcb18b503e379
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,28 +1,35 @@@
- akonadi-calendar-tools (4:17.08.3-2+rpi1) buster-staging; urgency=medium
++akonadi-calendar-tools (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:22:49 +0000]
 +  * Remove armhf from architecture list for kdepim-runtime dependency.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Wed, 24 Jan 2018 08:22:49 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 09 Apr 2018 04:54:54 +0000
++
+ akonadi-calendar-tools (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:21:43 +0200
+ 
+ akonadi-calendar-tools (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.
+   * Remove not needed staza to disable build tests.
+   * Bump debhelper build-dep and compat to 11.
+ 
+  -- Sandro Knauß <hefee@debian.org>  Fri, 09 Mar 2018 15:13:03 +0100
  
  akonadi-calendar-tools (4:17.08.3-2) unstable; urgency=medium
  

diff --cc debian/control
index 3a4b528134f4a2aa4320b1d3f32ab280f2d30737,6ce30e80b59adc0d2528053af85c6750fd3e2467..8e39118bdbedc9630889728bf319b5581c6fbe4a
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -28,8 -29,9 +29,9 @@@ Vcs-Git: https://salsa.debian.org/qt-kd
  
  Package: konsolekalendar
  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},
  Breaks: korganizer (<< 4:17.08~), ${kde-l10n:all}
  Replaces: korganizer (<< 4:17.08~), ${kde-l10n:all}
  Description: konsole personal organizer