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

diff --cc debian/changelog
index 6108bbff99e47a89768f8c95cf9c388070dd6bf5,c2770399157ecfac24d2e37699da859b95e11ce7..bb50f35a338e49710962d30ee4c0aeceb4acf1fa
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,37 +1,44 @@@
- akonadi (4:20.04.1-2+rpi1) bullseye-staging; urgency=medium
++akonadi (4:20.08.2-2+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.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Sun, 07 Jun 2020 20:57:50 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 28 Oct 2020 04:35:43 +0000
++
+ akonadi (4:20.08.2-2) unstable; urgency=medium
+ 
+   * Team upload to unstable.
+ 
+  -- Sandro Knauß <hefee@debian.org>  Tue, 20 Oct 2020 00:07:40 +0200
+ 
+ akonadi (4:20.08.2-1) experimental; urgency=medium
+ 
+   [ Sandro Knauß ]
+   * New upstream release (20.08.2).
+   * Update build-deps and deps with the info from cmake.
+   * Update Homepage link to point to new invent.kde.org
+   * Update field Source in debian/copyright to invent.kde.org move.
+   * Update repository related entries to metadata file.
+   * Add Bug-* entries to metadata file.
+   * Update patch hunks.
+   * Remove backported patch.
+   * Update copyright file for 20.08.
+ 
+  -- Sandro Knauß <hefee@debian.org>  Fri, 16 Oct 2020 00:51:55 +0200
+ 
+ akonadi (4:20.04.1-4) unstable; urgency=medium
+ 
+   [ Sandro Knauß ]
+   * Fix AppArmor profile patch for Mariadb 10.5.
+ 
+  -- Sandro Knauß <hefee@debian.org>  Wed, 30 Sep 2020 13:04:52 +0200
+ 
+ akonadi (4:20.04.1-3) unstable; urgency=medium
+ 
+   [ Sandro Knauß ]
+   * Fix AppArmor profile for Mariadb 10.5.
+ 
+  -- Sandro Knauß <hefee@debian.org>  Tue, 29 Sep 2020 12:49:10 +0200
  
  akonadi (4:20.04.1-2) unstable; urgency=medium