Merge version 4:20.08.2-2+rpi1 and 4:20.08.2-3 to produce 4:20.08.2-3+rpi1

diff --cc debian/changelog
index bb50f35a338e49710962d30ee4c0aeceb4acf1fa,9fe02267c6547edbe3752cc95a88fca18d80b1bf..52650d9ffd6fc0a869fb0d138ef4166f54297cec
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,12 +1,19 @@@
- akonadi (4:20.08.2-2+rpi1) bullseye-staging; urgency=medium
++akonadi (4:20.08.2-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>  Wed, 28 Oct 2020 04:35:43 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 06 Nov 2020 19:22:15 +0000
++
+ akonadi (4:20.08.2-3) unstable; urgency=medium
+ 
+   * Team upload.
+   * Unregister the old /etc/xdg/akonadi.categories, and
+     /etc/xdg/akonadi.renamecategories conffiles. (Closes: #946512)
+   * Explicitly add the gettext build dependency.
+   * Minimize the upstream GPG signing key.
+ 
+  -- Pino Toscano <pino@debian.org>  Wed, 28 Oct 2020 10:24:03 +0100
  
  akonadi (4:20.08.2-2) unstable; urgency=medium