Merge version 5:93+rpi1 and 5:95 to produce 5:95+rpi1

diff --cc debian/changelog
index 20b5344ae01b8fb9064ff1d4fab4c5662c32dfcc,8dc9047b620b32607bf24b5a77fc75b310bd664a..70650f616627fe5fab2b7bdae17163f55138178f
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,27 +1,35 @@@
- meta-kde (5:93+rpi1) buster-staging; urgency=medium
++meta-kde (5:95+rpi1) buster-staging; urgency=medium
 +
++  [changes brought forward from 5:93+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 17 Dec 2017 04:35:56 +0000]
 +  * Remove armhf from arch list for kalgebra dependency, sadly we don't
 +    currently have the full kalgebra in Raspbian due to webengine.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Sun, 17 Dec 2017 04:35:56 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 05 Jan 2018 17:25:07 +0000
++
+ meta-kde (5:95) unstable; urgency=medium
+ 
+   * Move the kdewebdev metapackage to this source; depend only on
+     kimagemapeditor, since the other components were dropped upstream.
+   * Exclude ksudoku, and kubrick from kdegames on armel and armhf, since they
+     require Desktop OpenGL.
+   * Suggest k3b, and kwave in kdemultimedia.
+   * Bump Standards-Version to 4.1.3, no changes required.
+ 
+  -- Pino Toscano <pino@debian.org>  Thu, 28 Dec 2017 13:30:50 +0100
+ 
+ meta-kde (5:94) unstable; urgency=medium
+ 
+   * Add a couple of variables in rules to deal with "adopted" metapackages from
+     other sources, making sure their version is higher than what already in
+     unstable; this is temporary until the next bump of the KDE version.
+   * Move the kdepim metapackage to this source; since some of the components
+     depend (directly or indirectly) on QtWebEngine, limit the architectures of
+     akonadiconsole, akregator, blogilo, kalarm, kdepim-addons, kdepim-runtime,
+     kmail, and kontact to amd64 arm64 armhf i386 mipsel.
+   * Bump the Calligra version to 1:3.0.1.
+   * Bump the minimum Plasma version to 4:5.10.
+ 
+  -- Pino Toscano <pino@debian.org>  Thu, 21 Dec 2017 14:36:07 +0100
  
  meta-kde (5:93) unstable; urgency=medium
  

diff --cc debian/control
Simple merge