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

diff --cc debian/changelog
index d9ba8757b04b4af9ce11c4675bf46149352c6130,cf9f25b0bd47d507abeab52b976796045ff85fa8..b7686bc872a0ebcd94d48dcbface82d5fad4abb7
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,18 +1,25 @@@
- konqueror (4:17.08.3-2+rpi1) buster-staging; urgency=medium
++konqueror (4:18.04.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.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Sun, 07 Jan 2018 14:14:20 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 03 May 2018 15:46:55 +0000
++
+ konqueror (4:18.04.0-1) unstable; urgency=medium
+ 
+   * Team upload.
+   * New upstream release.
+   * Add the newly required libkf5wallet-dev build dependency.
+   * Switch Vcs-* fields to salsa.debian.org.
+   * Bump the debhelper compatibility to 11:
+     - bump the debhelper build dependency to 11~
+     - bump compat to 11
+   * Bump Standards-Version to 4.1.4, no changes required.
+   * Mark libkf5konq-dev, and libkf5konq6 as Multi-Arch: same.
+   * Slightly reword the description of patch optional-qtwebengine.diff.
+   * Use https for Format in copyright.
+ 
+  -- Pino Toscano <pino@debian.org>  Sun, 22 Apr 2018 10:08:37 +0200
  
  konqueror (4:17.08.3-2) unstable; urgency=medium
  

diff --cc debian/control
index 3ed67b9788a575b28e531a3bcb21536e6f1a2c9a,991657c21dd40c1dfe9d6b3e5a93777ca2ebfa13..84792240c60987a9c6df3c9be7e0d217b218afa7
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -32,12 -33,12 +33,12 @@@ 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.3
+ Standards-Version: 4.1.4
  Homepage: http://www.kde.org/
- Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/applications/konqueror.git
- Vcs-Git: https://anonscm.debian.org/git/pkg-kde/applications/konqueror.git
+ Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/konqueror
+ Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/konqueror.git
  
  Package: konq-plugins
  Architecture: any