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

diff --cc debian/changelog
index 1fecc71f29e12ce0ca9496227ccaf057cd8aa402,c599a51a2a068acdaf0c7421f91253d369983432..a75a87cbdd6bc8acb2ac25ec368ad22d4544fbfe
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,32 +1,39 @@@
- kio-extras (4:17.08.3-2+rpi1) buster-staging; urgency=medium
++kio-extras (4:18.08.1-1+rpi1) buster-staging; urgency=medium
 +
++  [changes brought forward from 4:17.08.3-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 16 Dec 2017 12:43:57 +0000]
 +  * Remove qtwebengine5-dev build-dependency.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Sat, 16 Dec 2017 12:43:57 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 14 Sep 2018 18:27:17 +0000
++
+ kio-extras (4:18.08.1-1) unstable; urgency=medium
+ 
+   * Team upload.
+   * New upstream release.
+   * Fix Vcs-Git field.
+ 
+  -- Pino Toscano <pino@debian.org>  Sat, 08 Sep 2018 08:41:30 +0200
+ 
+ kio-extras (4:18.08.0-1) unstable; urgency=medium
+ 
+   * Team upload.
+   * Upload to unstable.
+   * New upstream release.
+   * Bump Standards-Version to 4.2.1, no changes required.
+   * Update lintian overrides.
+ 
+  -- Pino Toscano <pino@debian.org>  Thu, 06 Sep 2018 08:23:20 +0200
+ 
+ kio-extras (4:18.04.3-1) experimental; urgency=medium
+ 
+   * New upstream release (18.04.3).
+   * Update build-deps and deps with the info from cmake
+   * Bump to Standards-Version 4.1.4
+   * Update Vcs fields
+   * Update copyright information
+   * Update install files
+   * Release to experimental
+ 
+  -- Maximiliano Curia <maxy@debian.org>  Tue, 17 Jul 2018 11:15:24 +0200
  
  kio-extras (4:17.08.3-2) unstable; urgency=medium
  

diff --cc debian/control
index ffaf73b2c01d95131c6dd64773c2ed25577761d8,e07e4804db79d9ff6ae51fcea98839ee52422752..3188105260a975ef2eb9929300a15045271d1c3e
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -34,11 -34,12 +34,11 @@@ Build-Depends: cmake (>= 3.0~)
                 pkg-config,
                 pkg-kde-tools (>= 0.15.18~),
                 qtbase5-dev (>= 5.5.0~),
 -               qtwebengine5-dev (>= 5.7.0~) [amd64 arm64 armhf i386 mipsel],
                 shared-mime-info,
- Standards-Version: 4.1.2
+ Standards-Version: 4.2.1
  Homepage: https://projects.kde.org/projects/kde/workspace/kio-extras
- Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/plasma/kio-extras.git
- Vcs-Git: https://anonscm.debian.org/git/pkg-kde/plasma/kio-extras.git
+ Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/kio-extras
+ Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/kio-extras.git
  
  Package: kio-extras
  Architecture: any