Manual merge of version 4:20.04.3-1+rpi1 and 4:20.08.3-1 to produce 4:20.08.3-1+rpi1

diff --cc debian/changelog
index 42193831ae81dbfef7ba5a9eeb1186e36ae0eb30,4f2cf4af68fb1c3fcfbd1d9d1331341cb8a68481..1ebd3e3ca24c04db55955ec55d841be0433e060a
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,24 +1,34 @@@
- konqueror (4:20.04.3-1+rpi1) bullseye-staging; urgency=medium
++konqueror (4:20.08.3-1+rpi1) bullseye-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.
 +
 +  [changes introduced in 4:18.12.0-1+rpi1 by Peter Michal Green]
 +  * Also remove armhf from architecture list for webengine directory in debian/konqueror.install
 +
-  -- Raspbian forward porter <root@raspbian.org>  Wed, 02 Sep 2020 11:17:44 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 19 Nov 2020 14:08:55 +0000
++
+ konqueror (4:20.08.3-1) unstable; urgency=medium
+ 
+   * Team upload.
+   * New upstream release.
+   * Use secure URI in Homepage field.
+   * Re-export upstream signing key without extra signatures.
+   * Set field Upstream-Contact in debian/copyright.
+   * Remove obsolete fields Contact, Name from debian/upstream/metadata (already
+     present in machine-readable debian/copyright).
+   * Update the build dependencies according to the upstream build system:
+     - bump the Qt packages to 5.12.0
+     - bump the KF packages to 5.71.0
+   * Update the patches:
+     - optional-qtwebengine.diff: refresh
+   * Update install files.
+   * Do not ship the development files for konqsidebarplugin, for now.
+   * Update lintian overrides.
+   * Drop the kfmclient, and konqueror, as they are largely outdated.
+     (Closes: #579870)
+ 
+  -- Pino Toscano <pino@debian.org>  Fri, 13 Nov 2020 12:28:28 +0100
  
  konqueror (4:20.04.3-1) unstable; urgency=medium
  

diff --cc debian/control
index d7b7ef2bf44ba04cf48a0a8fdff21f14bf25feef,94dc147c184a3e19fa0e8466d15f8a286cd87f7a..3c8ac82f177563ac44bddd959458a6e8b0d42599
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -33,9 -33,9 +33,9 @@@ Build-Depends: cmake (>= 3.0~)
                 libx11-dev,
                 pkg-config,
                 pkg-kde-tools (>= 0.12),
-                qtbase5-dev (>= 5.9.0~),
+                qtbase5-dev (>= 5.12.0~),
                 qtscript5-dev,
-                qtwebengine5-dev (>= 5.9.0~) [amd64 arm64 i386 mipsel],
 -               qtwebengine5-dev (>= 5.12.0~) [amd64 arm64 armhf i386 mipsel],
++               qtwebengine5-dev (>= 5.12.0~) [amd64 arm64 i386 mipsel],
                 zlib1g-dev,
  Standards-Version: 4.5.0
  Rules-Requires-Root: no

diff --cc debian/konqueror.install
index 8bb7f42c10355697eab508379d3eba1d2981c5b8,effa00f5e22249181a92c0a548b4efc7f73fd299..2a70cf3d604c9f9f25b47fc0f68112737756fc68
--- 1/debian/konqueror.install
--- 2/debian/konqueror.install
+++ b/debian/konqueror.install
@@@ -1,5 -1,11 +1,11 @@@
  #!/usr/bin/dh-exec
 -[amd64 arm64 armhf i386 mipsel] usr/lib/*/libkwebenginepart.so
 -[amd64 arm64 armhf i386 mipsel] usr/lib/*/qt5/plugins/kf5/parts/webenginepart.so
 -[amd64 arm64 armhf i386 mipsel] usr/share/icons/hicolor/*/apps/webengine.png
 -[amd64 arm64 armhf i386 mipsel] usr/share/kservices5/webenginepart.desktop
 -[amd64 arm64 armhf i386 mipsel] usr/share/kxmlgui5/webenginepart/
++[amd64 arm64 i386 mipsel] usr/lib/*/libkwebenginepart.so
++[amd64 arm64 i386 mipsel] usr/lib/*/qt5/plugins/kf5/parts/webenginepart.so
++[amd64 arm64 i386 mipsel] usr/share/icons/hicolor/*/apps/webengine.png
++[amd64 arm64 i386 mipsel] usr/share/kservices5/webenginepart.desktop
++[amd64 arm64 i386 mipsel] usr/share/kxmlgui5/webenginepart/
  etc/xdg/autostart/konqy_preload.desktop
+ etc/xdg/konqsidebartngrc
  usr/bin/kfmclient
  usr/bin/konqueror
  usr/lib/*/libkdeinit5_kfmclient.so