From: Raspbian automatic forward porter <root@raspbian.org>
Date: Wed, 2 Sep 2020 11:17:45 +0000 (+0100)
Subject: Merge version 4:20.04.0-1+rpi1 and 4:20.04.3-1 to produce 4:20.04.3-1+rpi1
X-Git-Tag: archive/raspbian/4%20.04.3-1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b421becaf7774e13818eee84fe27c98232af0ea9;p=konqueror.git

Merge version 4:20.04.0-1+rpi1 and 4:20.04.3-1 to produce 4:20.04.3-1+rpi1
---

b421becaf7774e13818eee84fe27c98232af0ea9
diff --cc debian/changelog
index 89e79d4,efab1e8..4219383
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,18 +1,28 @@@
- konqueror (4:20.04.0-1+rpi1) bullseye-staging; urgency=medium
++konqueror (4:20.04.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
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Tue, 12 May 2020 10:19:40 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 02 Sep 2020 11:17:44 +0000
++
+ konqueror (4:20.04.3-1) unstable; urgency=medium
+ 
+   * Team upload.
+   * New upstream release.
+   * Update the patches:
+     - old-kbookmarkmenu.diff: drop, no more needed
+   * Really unregister the old /etc/xdg/konqueror.categories conffile;
+     drop the misspelt konqeror.maintscript file.
+   * Bump the debhelper compatibility to 13:
+     - switch the debhelper-compat build dependency to 13
+     - stop passing --fail-missing to dh_missing, as it is the default now
+   * Add Rules-Requires-Root: no.
+   * Update lintian overrides.
+ 
+  -- Pino Toscano <pino@debian.org>  Fri, 28 Aug 2020 10:50:34 +0200
  
  konqueror (4:20.04.0-1) unstable; urgency=medium
  
diff --cc debian/control
index 7b767e8,314f253..d7b7ef2
--- a/debian/control
+++ b/debian/control
@@@ -35,9 -35,10 +35,10 @@@ Build-Depends: cmake (>= 3.0~)
                 pkg-kde-tools (>= 0.12),
                 qtbase5-dev (>= 5.9.0~),
                 qtscript5-dev,
 -               qtwebengine5-dev (>= 5.9.0~) [amd64 arm64 armhf i386 mipsel],
 +               qtwebengine5-dev (>= 5.9.0~) [amd64 arm64 i386 mipsel],
                 zlib1g-dev,
  Standards-Version: 4.5.0
+ Rules-Requires-Root: no
  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