Merge version 5:98+rpi2 and 5:99 to produce 5:99+rpi1

diff --cc debian/changelog
index 1b606073825c9a1b74228f1bb1261c7f40c8449f,6ba7ffa3f9e0c40b72afc29d13ac99d539d32e42..18a59cce0e497d76710719414a2923247e384eac
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,17 -1,18 +1,30 @@@
- meta-kde (5:98+rpi2) buster-staging; urgency=medium
++meta-kde (5:99+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.
++
++  [changes brought forward from 5:98+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Wed, 24 Jan 2018 07:36:26 +0000]
 +  * Align dependencies for armhf to those for armel as we don't currently have
 +    qtwebengine in Raspbian.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Wed, 24 Jan 2018 07:36:26 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 25 Jan 2018 17:19:33 +0000
 +
- meta-kde (5:98+rpi1) buster-staging; urgency=medium
+ meta-kde (5:99) unstable; 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.
+   * Use the epoch-less version for the kwave, and k3b suggests.
+   * Bump the minimum KDE Application version to 4:17.08.3
+     - because of this, remove the special version handling for the
+       kde-baseapps, kdepim, and kdewebdev metapackages
+   * Remove the kde-runtime dependency in kde-plasma-desktop: while there are
+     still applications based on kdelibs 4.x, let them pull kde-runtime as
+     dependency, instead of unconditionally installing it via
+     kde-plasma-desktop.
+   * Remove the kde-l10n suggest in kde-plasma-desktop, kde-standard, and
+     kde-full: the kde-l10n-* packages nowadays contain only translations for
+     applications based on kdelibs 4.x, which are less and less.
  
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 18 Jan 2018 03:09:31 +0000
+  -- Pino Toscano <pino@debian.org>  Sat, 20 Jan 2018 11:00:25 +0100
  
  meta-kde (5:98) unstable; urgency=medium
  

diff --cc debian/control
Simple merge