Merge version 20.08.0.1+rpi1 and 21.08.0.1 to produce 21.08.0.1+rpi1

diff --cc debian/changelog
index 899e5c4e3cfa0de04d72d9090f4ec67abc733a48,372e199f4936b506ba36b8e708a8745defc55bbc..1671956b897601cd65f3000ed84330d5144b3881
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,18 @@@
- meta-kde-telepathy (20.08.0.1+rpi1) bullseye-staging; urgency=medium
++meta-kde-telepathy (21.08.0.1+rpi1) bookworm-staging; urgency=medium
 +
++  [changes brought forward from 20.08.0.1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Fri, 22 Jan 2021 00:03:15 +0000]
 +  * Remove armhf from kde-telepathy-text-ui dependency architecture list
 +    because raspbian does not have qtwebengine.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Fri, 22 Jan 2021 00:03:15 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 06 Sep 2021 04:17:16 +0000
++
+ meta-kde-telepathy (21.08.0.1) unstable; urgency=medium
+ 
+   * Team upload.
+   * Bump to Telepathy KDE 21.08.0.
+   * Bump Standards-Version to 4.6.0, no changes required.
+ 
+  -- Pino Toscano <pino@debian.org>  Sun, 22 Aug 2021 10:25:20 +0200
  
  meta-kde-telepathy (20.08.0.1) unstable; urgency=medium
  

diff --cc debian/control
Simple merge