Merge version 4:18.04.0-1+rpi1 and 4:18.12.0-1 to produce 4:18.12.0-1+rpi1

diff --cc debian/changelog
index b7686bc872a0ebcd94d48dcbface82d5fad4abb7,cec77971db4b30bec2b1ca60b91bbfc58dd24e67..e23e357f47320d7e713a47b7e34fd8c32565064e
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,11 +1,18 @@@
- konqueror (4:18.04.0-1+rpi1) buster-staging; urgency=medium
++konqueror (4:18.12.0-1+rpi1) buster-staging; urgency=medium
 +
 +  [changes brought forward from 4:17.08.3-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 07 Jan 2018 14:14:20 +0000]
 +  * Remove armhf from webengine arches since raspbian doesn't currently have it.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 03 May 2018 15:46:55 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 01 Jan 2019 20:10:24 +0000
++
+ konqueror (4:18.12.0-1) unstable; urgency=medium
+ 
+   * Team upload.
+   * New upstream release.
+   * Bump Standards-Version to 4.3.0, no changes required.
+   * Update install files.
+ 
+  -- Pino Toscano <pino@debian.org>  Wed, 26 Dec 2018 16:51:23 +0100
  
  konqueror (4:18.04.0-1) unstable; urgency=medium
  

diff --cc debian/control
index 84792240c60987a9c6df3c9be7e0d217b218afa7,30e2e2ab4bcf574de6672ba4629be25988cd24fa..f43cde3c445139f68aee329e2903b2aff06b06ac
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -33,9 -33,9 +33,9 @@@ Build-Depends: cmake (>= 2.8.12~)
                 pkg-kde-tools (>= 0.12),
                 qtbase5-dev (>= 5.5.0~),
                 qtscript5-dev,
 -               qtwebengine5-dev (>= 5.5.0~) [amd64 arm64 armhf i386 mipsel],
 +               qtwebengine5-dev (>= 5.5.0~) [amd64 arm64 i386 mipsel],
                 zlib1g-dev,
- Standards-Version: 4.1.4
+ Standards-Version: 4.3.0
  Homepage: http://www.kde.org/
  Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/konqueror
  Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/konqueror.git

diff --cc debian/konqueror.install
Simple merge