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

diff --cc debian/changelog
index d45f1aace7e1bf7716860f3de772844b7534d2ad,0e6c9f3fd54d7d1fb5f4c5ee6f048a768b4513c6..941aa249d73901b47fe2798d10a97656f7d5b194
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,14 +1,21 @@@
- akonadi (4:20.08.3-1+rpi1) bullseye-staging; urgency=medium
++akonadi (4:20.08.3-3+rpi1) bullseye-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>  Sat, 19 Dec 2020 02:53:30 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 10 May 2021 08:06:38 +0000
++
+ akonadi (4:20.08.3-3) unstable; urgency=medium
+ 
+   * Handle mariadbd_akonadi with dh_apparmor (Closes: #986635).
+ 
+  -- Sandro Knauß <hefee@debian.org>  Tue, 13 Apr 2021 22:30:46 +0200
+ 
+ akonadi (4:20.08.3-2) unstable; urgency=medium
+ 
+   * Add patch to load local apparmor rules (Closes: #985080).
+ 
+  -- Sandro Knauß <hefee@debian.org>  Mon, 05 Apr 2021 13:09:40 +0200
  
  akonadi (4:20.08.3-1) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge