Manual merge of version 5:99+rpi1 and 5:101 to produce 5:101+rpi1

diff --cc debian/changelog
index 18a59cce0e497d76710719414a2923247e384eac,28f0b3d485412ea5e5564515d9b4910f2ce486a0..39ade3d0d22effa152e4e67ac8cd7432752fc160
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,28 +1,40 @@@
- meta-kde (5:99+rpi1) buster-staging; urgency=medium
++meta-kde (5:101+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.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 25 Jan 2018 17:19:33 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Wed, 18 Apr 2018 05:25:43 +0000
++
+ meta-kde (5:101) unstable; urgency=medium
+ 
+   * Set version for the kdepim metapackage (Closes: 894795)
+     Thanks to Michael Karcher for the report
+ 
+  -- Maximiliano Curia <maxy@debian.org>  Fri, 06 Apr 2018 19:09:37 +0200
+ 
+ meta-kde (5:100) unstable; urgency=medium
+ 
+   * Team upload.
+ 
+   [ Pino Toscano ]
+   * Remove kstars from kdeedu, since it is no more shipped as part of its
+     releases.
+   * Add minuet to kdeedu.
+ 
+   [ Sandro Knauß ]
+   * Update kdepim to 17.12.3
+   * Remove blogilo from kdepim metapackages (dead upstream).
+   * Use secure copyright format uri.
+   * add lintian-override for kde-sc-dev-latest.
+   * bump compat level to 11 (no changes needed).
+   * Update Vcs links to salsa.
+ 
+  -- Sandro Knauß <hefee@debian.org>  Sun, 01 Apr 2018 18:36:17 +0200
  
  meta-kde (5:99) unstable; urgency=medium
  

diff --cc debian/control
index f7d27cacafbfae79f8940d03dde52a1496e4c0a3,2fbe863e96cd29b488ec0c2e1c5eb32177353f5e..dc337a5abdb0d05b6a5e06aae4b6246d967f8ba6
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -315,20 -315,19 +315,19 @@@ Description: networking applications fr
  Package: kdepim
  Architecture: any
  Depends: accountwizard (>= ${kdepim:Version}),
 -         akonadiconsole (>= ${kdepim:Version}) [amd64 arm64 armhf i386 mipsel],
 -         akregator (>= ${kdepim:Version}) [amd64 arm64 armhf i386 mipsel],
 +         akonadiconsole (>= ${kdepim:Version}) [amd64 arm64 i386 mipsel],
 +         akregator (>= ${kdepim:Version}) [amd64 arm64 i386 mipsel],
-          blogilo (>= ${kdepim:Version}) [amd64 arm64 i386 mipsel],
           kaddressbook (>= ${kdepim:Version}),
 -         kalarm (>= ${kdepim:Version}) [amd64 arm64 armhf i386 mipsel],
 -         kdepim-runtime (>= ${kdepim:Version}) [amd64 arm64 armhf i386 mipsel],
 +         kalarm (>= ${kdepim:Version}) [amd64 arm64 i386 mipsel],
 +         kdepim-runtime (>= ${kdepim:Version}) [amd64 arm64 i386 mipsel],
           kleopatra (>= ${kdepim:Version}),
 -         kmail (>= ${kdepim:Version}) [amd64 arm64 armhf i386 mipsel],
 +         kmail (>= ${kdepim:Version}) [amd64 arm64 i386 mipsel],
           knotes (>= ${kdepim:Version}),
           konsolekalendar (>= ${kdepim:Version}),
 -         kontact (>= ${kdepim:Version}) [amd64 arm64 armhf i386 mipsel],
 +         kontact (>= ${kdepim:Version}) [amd64 arm64 i386 mipsel],
           korganizer (>= ${kdepim:Version}),
           ${misc:Depends}
 -Recommends: kdepim-addons [amd64 arm64 armhf i386 mipsel],
 +Recommends: kdepim-addons [amd64 arm64 i386 mipsel],
  Description: Personal Information Management apps from the official KDE release
   KDE (the K Desktop Environment) is a powerful Open Source graphical
   desktop environment for Unix workstations. It combines ease of use,