Merge version 4:20.12.1-3+rpi2 and 4:21.08.0-1 to produce 4:21.08.0-1+rpi1

diff --cc debian/changelog
index a76ce56cd9d83277e448540d29d05373f8bc6c5a,f32e9e214ebc090d42ebb40ca9653ba3a9a92c8e..cdac5d7159589b7d5a0f68d01e77ecc9d4044edf
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,27 +1,38 @@@
- kaccounts-providers (4:20.12.1-3+rpi2) bullseye-staging; urgency=medium
++kaccounts-providers (4:21.08.0-1+rpi1) bookworm-staging; urgency=medium
 +
++  [changes brought forward from 4:20.08.0-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 20 Aug 2020 13:42:41 +0000]
++  * Remove armhf from qtwebengine architecture list.
++
++  [changes brought forward from 4:20.12.1-3+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Wed, 10 Feb 2021 03:10:22 +0000]
 +  * Also remove qtwebengine from architecture list for qml-module-qtwebengine
 +    dependency.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Wed, 10 Feb 2021 03:10:22 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 02 Sep 2021 22:18:02 +0000
 +
- kaccounts-providers (4:20.12.1-3+rpi1) bullseye-staging; urgency=medium
+ kaccounts-providers (4:21.08.0-1) unstable; urgency=medium
  
-   [changes brought forward from 4:20.08.0-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 20 Aug 2020 13:42:41 +0000]
-   * Remove armhf from qtwebengine architecture list.
+   [ Norbert Preining ]
+   * New upstream release (21.08.0).
+   * Drop patch since upstream allowed for option qtwebengine.
+ 
+  -- Norbert Preining <norbert@preining.info>  Tue, 17 Aug 2021 12:26:16 +0900
+ 
+ kaccounts-providers (4:21.04.3-1) experimental; urgency=medium
+ 
+   [ Norbert Preining ]
+   * New upstream release (21.04.3).
+ 
+  -- Norbert Preining <norbert@preining.info>  Fri, 09 Jul 2021 10:51:31 +0900
+ 
+ kaccounts-providers (4:21.04.0-1) experimental; urgency=medium
+ 
+   [ Norbert Preining ]
+   * New upstream release (21.04.0).
+   * Borrow minimal upstream signing key from k3b.
+   * Drop Kubuntu from maintainer name.
+   * Added myself to the uploaders.
  
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 05 Feb 2021 21:43:55 +0000
+  -- Norbert Preining <norbert@preining.info>  Wed, 28 Apr 2021 09:51:36 +0900
  
  kaccounts-providers (4:20.12.1-3) unstable; urgency=medium
  

diff --cc debian/control
Simple merge