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

diff --cc debian/changelog
index 70650f616627fe5fab2b7bdae17163f55138178f,8c209a4f6078d68b00e963c1f7c623ec1ec14250..69601bb31c4b2454f7970390576163ef66e028cb
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,29 +1,37 @@@
- meta-kde (5:95+rpi1) buster-staging; urgency=medium
++meta-kde (5:98+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.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 05 Jan 2018 17:25:07 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 18 Jan 2018 03:09:31 +0000
++
+ meta-kde (5:98) unstable; urgency=medium
+ 
+   * Fix dependency in kde-baseapps on keditbookmarks, which does not have an
+     epoch in its version.
+ 
+  -- Pino Toscano <pino@debian.org>  Thu, 04 Jan 2018 08:23:27 +0100
+ 
+ meta-kde (5:97) unstable; urgency=medium
+ 
+   * Make sure the version of kde-baseapps is 16.08.3, as it was in
+     src:kde-baseapps.
+ 
+  -- Pino Toscano <pino@debian.org>  Wed, 03 Jan 2018 19:23:18 +0100
+ 
+ meta-kde (5:96) unstable; urgency=medium
+ 
+   * Limit the architectures for the akregator, and kmail dependencies also in
+     kde-standard.
+   * Do not recommend kdepim-doc in kdepim, as it is a transitional package.
+   * Move the kde-baseapps metapackage to this source; hardcode the version of
+     kde-baseapps-bin for now, hoping it will not be needed anymore soon;
+     depend also on kdialog, and keditbookmarks.
+   * Switch the kdesdk-kio-plugins | kdesvn-kio-plugins dependency in kdesdk to
+     kio-perldoc.
+ 
+  -- Pino Toscano <pino@debian.org>  Wed, 03 Jan 2018 12:25:51 +0100
  
  meta-kde (5:95) unstable; urgency=medium
  

diff --cc debian/control
Simple merge