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

diff --cc debian/changelog
index 94885d8193fe4e1249fbc04ec3f95ccf5bdd7ab9,418bd0e647eff18ae6a948d3a12180fa541e400d..a41d29f26f3a2b3f3e79b671033c554d51970c40
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,8 +1,19 @@@
- kdeplasma-addons (4:5.20.4-2+rpi1) bullseye-staging; urgency=medium
++kdeplasma-addons (4:5.20.5-1+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>  Sun, 03 Jan 2021 12:42:01 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 14 Jan 2021 21:26:24 +0000
++
+ kdeplasma-addons (4:5.20.5-1) unstable; urgency=medium
+ 
+   * New upstream release (5.20.5).
+ 
+  -- Norbert Preining <norbert@preining.info>  Wed, 06 Jan 2021 23:50:51 +0900
  
  kdeplasma-addons (4:5.20.4-2) unstable; urgency=medium