Merge version 4:5.20.5-1+rpi1 and 4:5.21.5-3 to produce 4:5.21.5-3+rpi1

diff --cc debian/changelog
index 36038c4fdea8a51a1aa51bcb17fd0e72b770b9f0,d6685c9316ec5aed0e47b64fd861b632ad3dec43..704839e9663f3a6d98fc76338356f575acbdaa9e
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,77 +1,84 @@@
- libksysguard (4:5.20.5-1+rpi1) bullseye-staging; urgency=medium
++libksysguard (4:5.21.5-3+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 4:5.17.5-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Mon, 17 Feb 2020 22:43:59 +0000]
 +  * Remove armhf from qtwebengine architecture list.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sun, 10 Jan 2021 10:24:10 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 01 Sep 2021 05:28:46 +0000
++
+ libksysguard (4:5.21.5-3) unstable; urgency=medium
+ 
+   * Team upload.
+   * Update symbols files from the logs of buildds.
+   * Bump Standards-Version to 4.6.0, no changes required.
+   * Properly use the ${shlibs:Depends} substvar in libkf5sysguard-dev, as it
+     contains Qt designer plugins.
+   * Update lintian overrides.
+   * Since the unit test fail (and they seem to require a bigger environment
+     than the building one), then:
+     - pass -DBUILD_TESTING=OFF to cmake to disable their build
+     - drop the xauth, and xvfb build dependencies
+ 
+  -- Pino Toscano <pino@debian.org>  Fri, 20 Aug 2021 11:46:08 +0200
+ 
+ libksysguard (4:5.21.5-2) unstable; urgency=medium
+ 
+   [ Patrick Franz ]
+   * Release to unstable.
+ 
+  -- Patrick Franz <deltaone@debian.org>  Tue, 17 Aug 2021 03:24:16 +0200
+ 
+ libksysguard (4:5.21.5-1) experimental; urgency=medium
+ 
+   [ Patrick Franz ]
+   * New upstream release (5.21.5).
+ 
+  -- Patrick Franz <patfra71@gmail.com>  Fri, 07 May 2021 13:55:02 +0200
+ 
+ libksysguard (4:5.21.4-1) experimental; urgency=medium
+ 
+   [ Patrick Franz ]
+   * New upstream release (5.21.4).
+ 
+  -- Patrick Franz <patfra71@gmail.com>  Tue, 06 Apr 2021 17:47:14 +0200
+ 
+ libksysguard (4:5.21.3.1-1) experimental; urgency=medium
+ 
+   [ Norbert Preining ]
+   * New upstream release (5.21.3.1).
+   * Update symbols.
+ 
+  -- Norbert Preining <norbert@preining.info>  Wed, 17 Mar 2021 07:40:09 +0900
+ 
+ libksysguard (4:5.21.2-2) experimental; urgency=medium
+ 
+   [ Patrick Franz ]
+   * Update symbols for libprocesscore9.
+   * Bump Standards-Version to 4.5.1 (no changes needed).
+ 
+  -- Patrick Franz <patfra71@gmail.com>  Fri, 05 Mar 2021 13:55:32 +0100
+ 
+ libksysguard (4:5.21.2-1) experimental; urgency=medium
+ 
+   [ Patrick Franz ]
+   * New upstream release (5.21.2).
+ 
+  -- Norbert Preining <norbert@preining.info>  Wed, 03 Mar 2021 05:33:50 +0900
+ 
+ libksysguard (4:5.21.1-1) experimental; urgency=medium
+ 
+   [ Norbert Preining ]
+   * New upstream release (5.21.1).
+ 
+  -- Norbert Preining <norbert@preining.info>  Wed, 24 Feb 2021 14:36:40 +0900
+ 
+ libksysguard (4:5.21.0-1) experimental; urgency=medium
+ 
+   [ Norbert Preining ]
+   * New upstream release (5.21.0).
+   * Update build-deps and deps with the info from cmake.
+   * Update symbols.
+ 
+  -- Norbert Preining <norbert@preining.info>  Wed, 17 Feb 2021 05:42:27 +0900
  
  libksysguard (4:5.20.5-1) unstable; urgency=medium
  

diff --cc debian/control
index 753dbbe8688c9c341b47db328a2474a7ceed9b8e,3e8172c76e13a39e648bd7a8232af4b5f79ab1ad..07854adf18ba53495b6eb78d64840d2edff28c32
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -31,13 -32,12 +32,12 @@@ Build-Depends: cmake (>= 3.0~)
                 libxres-dev,
                 pkg-kde-tools (>= 0.15.18~),
                 qtbase5-dev (>= 5.15.0~),
+                qtdeclarative5-dev (>= 5.15.0~),
                 qtscript5-dev (>= 5.15.0~),
                 qttools5-dev (>= 5.15.0~),
 -               qtwebengine5-dev (>= 5.15.0~) [amd64 arm64 armhf i386 mipsel],
 +               qtwebengine5-dev (>= 5.15.0~) [amd64 arm64 i386 mipsel],
-                xauth,
-                xvfb,
-                zlib1g-dev,
- Standards-Version: 4.5.0
+                zlib1g-dev
+ Standards-Version: 4.6.0
  Homepage: https://invent.kde.org/plasma/libksysguard
  Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/libksysguard
  Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/libksysguard.git