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

diff --cc debian/changelog
index f70c217aa82730401b552c8f254fda7a22226c00,816c39a68bf0abf62dd81fb2e65ce5913c90c7c7..9cecf0ca52cf39e2dc65d8a9aff3ebef74a22af9
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,43 +1,50 @@@
- akonadi-calendar-tools (4:20.08.3-1+rpi1) bullseye-staging; urgency=medium
++akonadi-calendar-tools (4:21.08.1-1+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 4:17.08.3-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 24 Jan 2018 08:22:49 +0000]
 +  * Remove armhf from architecture list for kdepim-runtime dependency.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 31 Dec 2020 00:58:09 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 01 Oct 2021 15:07:10 +0000
++
+ akonadi-calendar-tools (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:17:59 +0900
+ 
+ akonadi-calendar-tools (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:40:39 +0900
+ 
+ akonadi-calendar-tools (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:30:41 +0900
+ 
+ akonadi-calendar-tools (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:07:17 +0900
+ 
+ akonadi-calendar-tools (4:21.04.0-1) experimental; urgency=medium
+ 
+   [ Norbert Preining ]
+   * New upstream release (21.04.0).
+   * Borrow minimal upstream signing key from k3b.
+   * Drop Kubuntu from maintainer name.
+   * Removed Eshat Cakar, George Kiagiadakis, Maximiliano Curia, Modestas
+     Vainius from the uploaders, thanks for your work on the package!
+   * Added myself to the uploaders.
+ 
+  -- Norbert Preining <norbert@preining.info>  Thu, 13 May 2021 09:45:47 +0900
  
  akonadi-calendar-tools (4:20.08.3-1) unstable; urgency=medium
  

diff --cc debian/control
index e85e2533944960c02ecc9d5b0083a90b989659c6,d7042b2ee41981f4071f6130ab2de36961a39884..319327768d67d61974a335ab6a0bf09b11fe0200
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -32,9 -29,9 +29,9 @@@ Rules-Requires-Root: n
  
  Package: konsolekalendar
  Architecture: any
 -Depends: kdepim-runtime [amd64 arm64 armhf i386 mipsel],
 +Depends: kdepim-runtime [amd64 arm64 i386 mipsel],
           ${misc:Depends},
-          ${shlibs:Depends}
+          ${shlibs:Depends},
  Description: konsole personal organizer
   KonsoleKalendar is a command-line interface to KDE calendars.
   KonsoleKalendar complements KOrganizer by providing a console