From: Raspbian automatic forward porter <root@raspbian.org>
Date: Wed, 13 Oct 2021 19:32:49 +0000 (+0100)
Subject: Merge version 4:21.08.0-1+rpi1 and 4:21.08.2-1 to produce 4:21.08.2-1+rpi1
X-Git-Tag: archive/raspbian/4%21.08.2-1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=adcb115a523d6ff9c7cca08ac509537d7e6ac559;p=konqueror.git

Merge version 4:21.08.0-1+rpi1 and 4:21.08.2-1 to produce 4:21.08.2-1+rpi1
---

adcb115a523d6ff9c7cca08ac509537d7e6ac559
diff --cc debian/changelog
index 09a6c01,12b2cfd..9987c19
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,10 +1,23 @@@
- konqueror (4:21.08.0-1+rpi1) bookworm-staging; urgency=medium
++konqueror (4:21.08.2-1+rpi1) bookworm-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
 +
 +  [changes introduced in 4:20.12.0-4+rpi1 by Peter Michael Green]
 +  * Also remove armhf from architecture list for webengine specific plugins in debian/konq-plugins.install
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 02 Sep 2021 17:40:30 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 13 Oct 2021 19:32:48 +0000
++
+ konqueror (4:21.08.2-1) unstable; urgency=medium
+ 
+   [ Norbert Preining ]
+   * New upstream release (21.08.2).
+   * Bump Standards-Version to 4.6.0, no change required.
+ 
+  -- Norbert Preining <norbert@preining.info>  Fri, 08 Oct 2021 12:56:25 +0900
  
  konqueror (4:21.08.0-1) unstable; urgency=medium
  
diff --cc debian/control
index 5d9056f,fcb2cd8..a733e67
--- a/debian/control
+++ b/debian/control
@@@ -40,9 -40,9 +40,9 @@@ Build-Depends: cmake (>= 3.5~)
                 pkg-kde-tools (>= 0.12),
                 qtbase5-dev (>= 5.12.0~),
                 qtscript5-dev,
 -               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.1
+ Standards-Version: 4.6.0
  Rules-Requires-Root: no
  Homepage: https://apps.kde.org/en/konqueror
  Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/konqueror