Merge version 4:21.08.1-1+rpi1 and 4:21.12.3-2 to produce 4:21.12.3-2+rpi1

diff --cc debian/changelog
index f315a763eabc9dc02075936217175f9c79c508b0,39e4da7999f2105c72c1880e63ca55a59988fe90..64124e24f33fde058f35e52fc1b58cb19aae4b84
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,19 +1,26 @@@
- akonadi (4:21.08.1-1+rpi1) bookworm-staging; urgency=medium
++akonadi (4:21.12.3-2+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>  Thu, 23 Sep 2021 13:02:25 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 10 Apr 2022 17:06:51 +0000
++
+ akonadi (4:21.12.3-2) unstable; urgency=medium
+ 
+   [ Patrick Franz ]
+   * Upload to unstable.
+ 
+  -- Patrick Franz <deltaone@debian.org>  Fri, 01 Apr 2022 22:08:57 +0200
+ 
+ akonadi (4:21.12.3-1) experimental; urgency=medium
+ 
+   [ Patrick Franz ]
+   * New upstream release (21.12.3).
+   * Update build-deps and deps with the info from cmake.
+   * Add myself to Uploaders.
+   * Refresh patches.
+ 
+  -- Patrick Franz <deltaone@debian.org>  Thu, 24 Mar 2022 22:22:11 +0100
  
  akonadi (4:21.08.1-1) unstable; urgency=medium