diff -Nru meta-kde-99/debian/changelog meta-kde-99+rpi1/debian/changelog
--- meta-kde-99/debian/changelog 2018-01-20 10:00:25.000000000 +0000
+++ meta-kde-99+rpi1/debian/changelog 2018-01-25 17:19:33.000000000 +0000
@@ -1,3 +1,15 @@
+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.
+
+ -- Raspbian forward porter <root@raspbian.org> Thu, 25 Jan 2018 17:19:33 +0000
+
meta-kde (5:99) unstable; urgency=medium
* Use the epoch-less version for the kwave, and k3b suggests.
diff -Nru meta-kde-99/debian/control meta-kde-99+rpi1/debian/control
--- meta-kde-99/debian/control 2018-01-20 10:00:25.000000000 +0000
+++ meta-kde-99+rpi1/debian/control 2018-01-25 17:19:33.000000000 +0000
@@ -33,7 +33,7 @@
Package: kde-standard
Architecture: any
-Depends: akregator (>= ${kdepim:Version}) [amd64 arm64 armhf i386 mipsel],
+Depends: akregator (>= ${kdepim:Version}) [amd64 arm64 i386 mipsel],
ark (>= ${kde:Version}),
dragonplayer (>= ${kde:Version}),
gwenview (>= ${kde:Version}),
@@ -44,7 +44,7 @@
kde-plasma-desktop (>= ${source:Version}),
kde-spectacle (>= ${kde:VersionNoEpoch}),
khelpcenter (>= ${kde:Version}),
- kmail (>= ${kdepim:Version}) [amd64 arm64 armhf i386 mipsel],
+ kmail (>= ${kdepim:Version}) [amd64 arm64 i386 mipsel],
knotes (>= ${kdepim:Version}),
kopete (>= ${kde:Version}),
korganizer (>= ${kdepim:Version}),
@@ -160,7 +160,7 @@
Depends: artikulate (>= ${kde:Version}),
blinken (>= ${kde:Version}),
cantor (>= ${kde:Version}),
- kalgebra (>= ${kde:Version}) [amd64 arm64 armhf i386 mipsel],
+ kalgebra (>= ${kde:Version}) [amd64 arm64 i386 mipsel],
kalzium (>= ${kde:Version}),
kanagram (>= ${kde:Version}),
kbruch (>= ${kde:Version}),
@@ -315,20 +315,20 @@
Package: kdepim
Architecture: any
Depends: accountwizard (>= ${kdepim:Version}),
- akonadiconsole (>= ${kdepim:Version}) [amd64 arm64 armhf i386 mipsel],
- akregator (>= ${kdepim:Version}) [amd64 arm64 armhf i386 mipsel],
- blogilo (>= ${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,