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

diff --cc debian/changelog
index 887dfb4f60634d0d6860b092c5ef4ad88b457afa,781f847c93c4fa4c7feea8dacdc736fb87c32300..a6fac84814b5d210261b13dc94404b609f4aeb7b
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,40 +1,50 @@@
- konqueror (4:18.12.0-1+rpi1) buster-staging; urgency=medium
++konqueror (4:19.08.2-2+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 Michael Green <plugwash@raspbian.org>  Tue, 01 Jan 2019 20:10:24 +0000
++ -- Peter Micheal Green <plugwash@raspbian.org>  Thu, 31 Oct 2019 19:28:33 +0000
++
+ konqueror (4:19.08.2-2) unstable; urgency=medium
+ 
+   * Team upload.
+   * Ship /usr/share/webenginepart/ on all the architectures, not only where
+     QtWebEngine is available, as there is content installed no matter the
+     architecture.
+ 
+  -- Pino Toscano <pino@debian.org>  Sat, 12 Oct 2019 20:26:50 +0200
+ 
+ konqueror (4:19.08.2-1) unstable; urgency=medium
+ 
+   * Team upload.
+   * New upstream release.
+   * Bump Standards-Version to 4.4.1, no changes required.
+   * Add the configuration for the CI on salsa.
+   * Update the build dependencies according to the upstream build system:
+     - bump cmake to 3.0
+     - bump the KF packages to 5.31.0
+     - explicitly add gettext
+   * Drop the migration from kde-baseapps-dbg, no more needed after two
+     Debian stable releases.
+   * Pass -DBUILD_TESTING=OFF to cmake to disable the build of tests, as they
+     are not run at build time anyway.
+   * Drop the 'testsuite' autopkgtest, as it does not test the installed
+     packages.
+   * Update the patches:
+     - optional-qtwebengine.diff: refresh/update
+   * Backport upstream commit 9119e90c00ebe75bd41223eee9b06cda99181a0c to build
+     also with QtWebEngine < 5.12.0; patch
+     upstream_Fix-CMakeLists.txt-to-compile-WebEnginePartHtmlEmbed.patch.
+   * Update install files.
+   * Unregister akregatorplugin.categories, and konqueror.categories as
+     conffile, as they are no more in /etc.
+   * Update lintian overrides.
+   * Drop unused, and uninstalled keditbookmarks man page.
+ 
+  -- Pino Toscano <pino@debian.org>  Sat, 12 Oct 2019 17:36:32 +0200
  
  konqueror (4:18.12.0-1) unstable; urgency=medium
  

diff --cc debian/control
index f43cde3c445139f68aee329e2903b2aff06b06ac,059bc24bd6c724a926e88b7698e62542ecc634d7..a225197cdcfd3763611a95607ad142cc54119e6a
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -33,9 -34,9 +34,9 @@@ Build-Depends: cmake (>= 3.0~)
                 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.3.0
+ Standards-Version: 4.4.1
  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 e5d522d92b5e75b378a31fd6bcd86e1e69fb903f,0de7d5db429448678c273d2fe3fd30c2e4e0e24b..32a0e614dbdd5f0162bba0bd2628b8507f3af696
--- 1/debian/konqueror.install
--- 2/debian/konqueror.install
+++ b/debian/konqueror.install
@@@ -6,7 -5,7 +5,7 @@@ usr/bin/konquero
  usr/lib/*/libkdeinit5_kfmclient.so
  usr/lib/*/libkdeinit5_konqueror.so
  usr/lib/*/libkonquerorprivate.so.*
- [amd64 arm64 i386 mipsel] usr/lib/*/libkwebenginepartlib.so
 -[amd64 arm64 armhf i386 mipsel] usr/lib/*/libkwebenginepart.so
++[amd64 arm64 i386 mipsel] usr/lib/*/libkwebenginepart.so
  usr/lib/*/qt5/plugins/kcm_bookmarks.so
  usr/lib/*/qt5/plugins/kcm_konq.so
  usr/lib/*/qt5/plugins/kcm_konqhtml.so