Merge version 4:5.19.5-4+rpi1 and 4:5.20.4-2 to produce 4:5.20.4-2+rpi1

diff --cc debian/changelog
index 3c5e7793c0b5afd17a6a8564aa8770511d0e4c04,d6035d2e9c6f7042718745b983552ac23a70deb0..94885d8193fe4e1249fbc04ec3f95ccf5bdd7ab9
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,19 +1,30 @@@
- kdeplasma-addons (4:5.19.5-4+rpi1) bullseye-staging; urgency=medium
++kdeplasma-addons (4:5.20.4-2+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from 4:5.12.4-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 05 Apr 2018 14:07:17 +0000]
 +  * Remove armhf from qtwebengine architectures, we don't have 
 +    qtwebengine in Raspbian.
 +
 +  [changes brought forward from 4:5.14.5.1-2+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Sat, 12 Oct 2019 14:12:46 +0000]
 +  * Remove armhf from architecture list of qml-module-qtwebengine dependency.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 13 Nov 2020 21:28:01 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 03 Jan 2021 12:42:01 +0000
++
+ kdeplasma-addons (4:5.20.4-2) unstable; urgency=medium
+ 
+   * Release to unstable.
+ 
+  -- Norbert Preining <norbert@preining.info>  Tue, 22 Dec 2020 11:04:36 +0900
+ 
+ kdeplasma-addons (4:5.20.4-1) experimental; urgency=medium
+ 
+   [ Norbert Preining ]
+   * New upstream release (5.20.4).
+   * Update list of installed files.
+ 
+   [ John Scott ]
+   * Suggest the quota package needed for the Disk Quota desktop widget.
+ 
+  -- Norbert Preining <norbert@preining.info>  Wed, 09 Dec 2020 14:17:31 +0900
  
  kdeplasma-addons (4:5.19.5-4) unstable; urgency=medium
  

diff --cc debian/control
index b9671f71ede09621e4ec49b9a62eebea512b0560,536d4c94cca26be871ed4746df50a89485a9dd7f..c4517bf565f1c82049d9539fa3c99fec1bf730be
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -35,7 -35,7 +35,7 @@@ Build-Depends: cmake (>= 3.0~)
                 plasma-workspace,
                 qtbase5-dev (>= 5.14.0~),
                 qtdeclarative5-dev (>= 5.14.0~),
-                qtwebengine5-dev (>= 5.14.0~) [amd64 arm64 i386 mipsel],
 -               qtwebengine5-dev (>= 5.14.0~) [amd64 arm64 armhf i386 mipsel]
++               qtwebengine5-dev (>= 5.14.0~) [amd64 arm64 i386 mipsel]
  Standards-Version: 4.5.0
  Homepage: https://invent.kde.org/plasma/kdeplasma-addons
  Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/kdeplasma-addons
@@@ -161,11 -161,12 +161,12 @@@ Depends: kdeplasma-addons-data (= ${sou
           qml-module-qtquick-layouts,
           qml-module-qtquick-window2,
           qml-module-qtquick2,
 -         qml-module-qtwebengine [amd64 arm64 armhf i386 mipsel],
 +         qml-module-qtwebengine [amd64 arm64 i386 mipsel],
           qml-module-qtwebkit,
           ${misc:Depends},
-          ${shlibs:Depends},
+          ${shlibs:Depends}
  Recommends: ksysguard (>= 4:5.19~)
+ Suggests: quota
  Description: additional widgets for Plasma 5
   This package contains additional Plasma 5 widgets shipped in the Plasma
   addons module. Install it if you want a variety of widgets on your Plasma