Manual merge of version 4:19.08.2-2+rpi1 and 4:20.04.0-1 to produce 4:20.04.0-1+rpi1

diff --cc debian/changelog
index a6fac84814b5d210261b13dc94404b609f4aeb7b,871d10bd3b35e574b8834bc184ae92fa50d77e70..89e79d43eb23baab24b58e991d5b96c3b3eafe85
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,34 +1,44 @@@
- konqueror (4:19.08.2-2+rpi1) bullseye-staging; urgency=medium
++konqueror (4:20.04.0-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
 +
-  -- Peter Micheal Green <plugwash@raspbian.org>  Thu, 31 Oct 2019 19:28:33 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Tue, 12 May 2020 10:19:40 +0000
++
+ konqueror (4:20.04.0-1) unstable; urgency=medium
+ 
+   * Team upload.
+   * New upstream release.
+   * Update watch file to the new release-service location.
+   * Update the build dependencies according to the upstream build system:
+     - bump cmake to 3.0
+     - bump the Qt packages to 5.9.0
+     - bump the KF packages to 5.38.0
+     - add libkf5dbusaddons-dev, libkf5jobwidgets-dev, libkf5windowsystem-dev,
+       and libqt5texttospeech5-dev
+     - remove libkf5khtml-dev, libkf5widgetsaddons-dev, and libtidy-dev,
+       no more used
+   * Switch from dhmk to the dh sequencer:
+     - invoke the dh sequencer using the kf5 addon
+     - call the right debhelper command instead of $(overridden_command)
+     - manually force the generation of the substvars for the kde-l10n breaks
+   * Bump the debhelper compatibility to 12:
+     - switch the debhelper build dependency to debhelper-compat 12
+     - remove debian/compat
+     - switch from dh_install to dh_missing for --fail-missing
+   * Bump Standards-Version to 4.5.0, no changes required.
+   * Update the patches:
+     - upstream_Fix-CMakeLists.txt-to-compile-WebEnginePartHtmlEmbed.patch:
+       drop, backported from upstream
+     - optional-qtwebengine.diff: update
+   * Restore compatibility with KBookmarkMenu < 5.69; patch
+     old-kbookmarkmenu.diff.
+   * Update install files.
+ 
+  -- Pino Toscano <pino@debian.org>  Sat, 02 May 2020 16:48:06 +0200
  
  konqueror (4:19.08.2-2) unstable; urgency=medium
  

diff --cc debian/control
index a225197cdcfd3763611a95607ad142cc54119e6a,c116ed38804fdb66f8d81810eb654b7fefab5c03..7b767e855fdf07264d7f33b3629d1ac64d428803
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -31,12 -33,11 +33,11 @@@ Build-Depends: cmake (>= 3.0~)
                 libx11-dev,
                 pkg-config,
                 pkg-kde-tools (>= 0.12),
-                qtbase5-dev (>= 5.5.0~),
+                qtbase5-dev (>= 5.9.0~),
                 qtscript5-dev,
-                qtwebengine5-dev (>= 5.5.0~) [amd64 arm64 i386 mipsel],
 -               qtwebengine5-dev (>= 5.9.0~) [amd64 arm64 armhf i386 mipsel],
++               qtwebengine5-dev (>= 5.9.0~) [amd64 arm64 i386 mipsel],
                 zlib1g-dev,
- Standards-Version: 4.4.1
+ Standards-Version: 4.5.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
index 32a0e614dbdd5f0162bba0bd2628b8507f3af696,b03509304b2088985d6869dcce40d37015597727..8bb7f42c10355697eab508379d3eba1d2981c5b8
--- 1/debian/konqueror.install
--- 2/debian/konqueror.install
+++ b/debian/konqueror.install
@@@ -10,8 -10,7 +10,7 @@@ usr/lib/*/qt5/plugins/kcm_bookmarks.s
  usr/lib/*/qt5/plugins/kcm_konq.so
  usr/lib/*/qt5/plugins/kcm_konqhtml.so
  usr/lib/*/qt5/plugins/kcm_performance.so
 -[amd64 arm64 armhf i386 mipsel] usr/lib/*/qt5/plugins/kf5/parts/webenginepart.so
 +[amd64 arm64 i386 mipsel] usr/lib/*/qt5/plugins/kf5/parts/webenginepart.so
- usr/lib/*/qt5/plugins/konq_aboutpage.so
  usr/share/applications/kfmclient.desktop
  usr/share/applications/kfmclient_*.desktop
  usr/share/applications/konqbrowser.desktop
@@@ -27,12 -26,10 +26,10 @@@ usr/share/konqueror
  usr/share/kservices5/bookmarks.desktop
  usr/share/kservices5/kcmkonqyperformance.desktop
  usr/share/kservices5/kcmperformance.desktop
- usr/share/kservices5/konq_aboutpage.desktop
  usr/share/kservices5/org.kde.konqueror.desktop
 -[amd64 arm64 armhf i386 mipsel] usr/share/kservices5/webenginepart.desktop
 +[amd64 arm64 i386 mipsel] usr/share/kservices5/webenginepart.desktop
- usr/share/kservicetypes5/konqaboutpage.desktop
  usr/share/kwebkitpart/
 -[amd64 arm64 armhf i386 mipsel] usr/share/kxmlgui5/webenginepart/
 +[amd64 arm64 i386 mipsel] usr/share/kxmlgui5/webenginepart/
  usr/share/locale/*/LC_MESSAGES/kcmbookmarks.mo
  usr/share/locale/*/LC_MESSAGES/kcmkonq.mo
  usr/share/locale/*/LC_MESSAGES/kcmkonqhtml.mo