Merge version 4:5.12.4-1+rpi1 and 4:5.12.5-1 to produce 4:5.12.5-1+rpi1

diff --cc debian/changelog
index 678f80998cdb2428f768822dc95bf0739701688b,0c00bd0243227843ddb33de55b77705f0acea415..3bee73ae4d55ec236a01c71a1c57ca09a31107e5
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,11 +1,19 @@@
- kdeplasma-addons (4:5.12.4-1+rpi1) buster-staging; urgency=medium
++kdeplasma-addons (4:5.12.5-1+rpi1) buster-staging; urgency=medium
 +
++  [changes brought forward from 4:5.12.4-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 05 Apr 2018 14:07:17 +0000]
 +  * Remove armhf from qtwebengine architectures, we don't have 
 +    qtwebengine in Raspbian.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 05 Apr 2018 14:07:17 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 10 Jun 2018 23:11:11 +0000
++
+ kdeplasma-addons (4:5.12.5-1) unstable; urgency=medium
+ 
+   * New upstream release (5.12.5).
+   * Bump Standards-Version to 4.1.4.
+   * Use https for the debian/copyright
+   * Release to unstable
+ 
+  -- Maximiliano Curia <maxy@debian.org>  Wed, 09 May 2018 13:23:55 +0200
  
  kdeplasma-addons (4:5.12.4-1) unstable; urgency=medium
  

diff --cc debian/control
index 8d111d120ad23b10b9a8da64b0422db4e9471562,2f98ddefba65a46b9526fca267ec75aa6be11d80..63df77293fbffc1aea7a7081744b7330431fdaa8
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -38,10 -38,10 +38,10 @@@ Build-Depends: cmake (>= 2.8.12)
                 plasma-workspace-dev (>= 4:5.7~),
                 qtbase5-dev (>= 5.9.0~),
                 qtdeclarative5-dev (>= 5.9.0~),
 -               qtwebengine5-dev (>= 5.9.0~) [amd64 arm64 armhf i386 mipsel],
 +               qtwebengine5-dev (>= 5.9.0~) [amd64 arm64 i386 mipsel],
                 scim-dev,
                 shared-mime-info,
- Standards-Version: 4.1.3
+ Standards-Version: 4.1.4
  Homepage: https://projects.kde.org/projects/kde/workspace/kdeplasma-addons
  Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/kdeplasma-addons
  Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/kdeplasma-addons.git