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

diff --cc debian/changelog
index 69817c807972b900b0f0bb5674ce4a049abf33eb,55b2ff41846f05f82263a0989f36f04e99680c2a..c01924d0e8b37eae5f6993e910cd2341895ce177
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,15 +1,22 @@@
- akonadi-contacts (4:17.08.3-1+rpi1) buster-staging; urgency=medium
++akonadi-contacts (4:17.08.3-2+rpi1) buster-staging; urgency=medium
 +
++  [changes brought forward from 4:17.08.3-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 18 Jan 2018 12:17:10 +0000]
 +  * Remove armhf from qtwebengine arch list.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 18 Jan 2018 12:17:10 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 27 Jan 2018 07:29:02 +0000
++
+ akonadi-contacts (4:17.08.3-2) unstable; urgency=medium
+ 
+   * Team upload.
+ 
+   [ Sandro Knauß ]
+   * mark libkf5contacteditor-dev as Multi-Arch: same
+ 
+   [ Pino Toscano ]
+   * Bump Standards-Version to 4.1.3, no changes required.
+   * Switch section of akonadi-contacts-data from libs to kde.
+ 
+  -- Pino Toscano <pino@debian.org>  Sat, 20 Jan 2018 09:20:22 +0100
  
  akonadi-contacts (4:17.08.3-1) unstable; urgency=medium
  

diff --cc debian/control
index 85d892abf1732cbf8dfdad8394dcfe2a8128b93c,1b6aaab06d56105b23a73d928d3e48cb4742b447..2f0503a4efa1fe1d71ee467175c2bd992835c6d7
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -27,8 -27,8 +27,8 @@@ Build-Depends: cmake (>= 3.0~)
                 pkg-config,
                 pkg-kde-tools (>= 0.12),
                 qtbase5-dev (>= 5.7.0~),
 -               qtwebengine5-dev (>= 5.7.0~) [amd64 arm64 armhf i386 mipsel],
 +               qtwebengine5-dev (>= 5.7.0~) [amd64 arm64 i386 mipsel],
- Standards-Version: 4.1.2
+ Standards-Version: 4.1.3
  Homepage: http://pim.kde.org/
  Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/applications/akonadi-contacts.git
  Vcs-Git: https://anonscm.debian.org/git/pkg-kde/applications/akonadi-contacts.git