Merge version 4:20.08.3-3+rpi1 and 4:21.08.1-1 to produce 4:21.08.1-1+rpi1

diff --cc debian/changelog
index 941aa249d73901b47fe2798d10a97656f7d5b194,8740218019b8f97315ce26ce1263bff81b1e8cdd..f315a763eabc9dc02075936217175f9c79c508b0
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,44 +1,51 @@@
- akonadi (4:20.08.3-3+rpi1) bullseye-staging; urgency=medium
++akonadi (4:21.08.1-1+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 4:20.04.1-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 07 Jun 2020 20:57:50 +0000]
 +  * Link with libatomic on armhf too.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Mon, 10 May 2021 08:06:38 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 23 Sep 2021 13:02:25 +0000
++
+ akonadi (4:21.08.1-1) unstable; urgency=medium
+ 
+   [ Norbert Preining ]
+   * New upstream release (21.08.1).
+   * Bump Standards-Version to 4.6.0, no change required.
+ 
+  -- Norbert Preining <norbert@preining.info>  Sat, 11 Sep 2021 07:19:14 +0900
+ 
+ akonadi (4:21.08.0-1) unstable; urgency=medium
+ 
+   [ Norbert Preining ]
+   * New upstream release (21.08.0).
+ 
+  -- Norbert Preining <norbert@preining.info>  Mon, 16 Aug 2021 15:41:09 +0900
+ 
+ akonadi (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:32:19 +0900
+ 
+ akonadi (4:21.04.1-1) experimental; urgency=medium
+ 
+   [ Norbert Preining ]
+   * New upstream release (21.04.1).
+ 
+  -- Norbert Preining <norbert@preining.info>  Fri, 14 May 2021 06:08:24 +0900
+ 
+ akonadi (4:21.04.0-1) experimental; urgency=medium
+ 
+   [ Norbert Preining ]
+   * New upstream release (21.04.0).
+   * Update upstream signing key.
+   * Drop Modestas and Max from uploaders, thanks for your work.
+   * Add myself to uploaders.
+   * Drop Kubuntu from maintainer name.
+   * Update dependencies according to cmake.
+   * Update patches.
+ 
+  -- Norbert Preining <norbert@preining.info>  Thu, 13 May 2021 09:45:57 +0900
  
  akonadi (4:20.08.3-3) unstable; urgency=medium