Merge version 21.08.0-1+rpi1 and 21.12.3-1 to produce 21.12.3-1+rpi1

diff --cc debian/changelog
index b97ebd2e85d202323282522ca472d631d2b41095,6d6acf28aab28b9a77401810bf912af7d26faa38..344eea5a8d6e0ec0d1e807c69c882235d383b247
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,19 +1,26 @@@
- ktorrent (21.08.0-1+rpi1) bookworm-staging; urgency=medium
++ktorrent (21.12.3-1+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 5.2.0-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 16 Aug 2020 14:14:40 +0000]
 +  * Remove armhf from architecture list for qtwebengine build-dependency.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Tue, 26 Oct 2021 23:13:19 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 15 Jul 2022 01:25:59 +0000
++
+ ktorrent (21.12.3-1) unstable; urgency=medium
+ 
+   [ Aurélien COUDERC ]
+   * New upstream release (21.12.3).
+   * Removed Modestas Vainius from the uploaders, thanks for your work on
+     the package!
+   * Added myself to the uploaders.
+   * Build with hardening=+all build hardening flag.
+   * Avoid explicitly specifying -Wl,--as-needed linker flag.
+   * Drop deprecated lintian override.
+   * Complete upstream metadata.
+   * Change maintainer to Debian Qt/KDE Maintainers now that ktorrent is part
+     of the Gear set.
+   * Bump Standards-Version to 4.6.0, no changes required.
+ 
+  -- Aurélien COUDERC <coucouf@debian.org>  Wed, 09 Mar 2022 22:04:43 +0100
  
  ktorrent (21.08.0-1) unstable; urgency=medium
  

diff --cc debian/control
index f12adf90adcdde402545b93872830f4a3edb8210,eb9292f4cd28d28ae3e9c00979a21286ddb517b3..712ad51f203af2d364716f3676e1dc197aa19c7e
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -1,14 -1,12 +1,14 @@@
  Source: ktorrent
  Section: net
  Priority: optional
- Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
- Uploaders: Modestas Vainius <modax@debian.org>
+ Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
+ Uploaders: Aurélien COUDERC <coucouf@debian.org>,
  Build-Depends: cmake (>= 3.16~),
                 debhelper-compat (= 13),
 -               extra-cmake-modules (>= 5.82~),
 +               pkg-kde-tools (>= 0.15.16),
                 gettext,
 +               pkg-config,
 +               extra-cmake-modules (>= 5.82~),
                 kross-dev (>= 5.82~),
                 libboost-dev (>= 1.71.0~),
                 libgeoip-dev,
@@@ -42,8 -35,15 +42,8 @@@
                 libkf5windowsystem-dev (>= 5.82~),
                 libkf5xmlgui-dev (>= 5.82~),
                 libktorrent-dev (>= 20.11.70~),
 -               libphonon4qt5-dev,
 -               libphonon4qt5experimental-dev,
                 libtag1-dev,
- Standards-Version: 4.5.0
 -               pkg-config,
 -               pkg-kde-tools (>= 0.15.16),
 -               qtbase5-dev (>= 5.15.0~),
 -               qtscript5-dev (>= 5.7.0),
 -               qtwebengine5-dev (>= 5.15.0~) [amd64 arm64 armhf i386 mipsel],
+ Standards-Version: 4.6.0
  Rules-Requires-Root: no
  Homepage: https://www.kde.org/applications/internet/ktorrent/
  Vcs-Git: https://salsa.debian.org/qt-kde-team/extras/ktorrent.git