Merge version 6.4.2+dfsg-20+rpi1 and 6.4.2+dfsg-21 to produce 6.4.2+dfsg-21+rpi1

diff --cc debian/changelog
index c404bdbb765299416f4956c6cb53fcf94e757c45,3884ea9e421e76e665d90a74fcdf9147eb10f4f8..58ee1ec07b4d8779f497040e1f6251b191a2f5b1
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,16 @@@
- qt6-base (6.4.2+dfsg-20+rpi1) trixie-staging; urgency=medium
++qt6-base (6.4.2+dfsg-21+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 6.3.1+dfsg-8+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 25 Aug 2022 20:03:22 +0000]
 +  * Update symbols file for raspbian.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sat, 06 Jan 2024 10:43:18 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 07 Feb 2024 11:12:42 +0000
++
+ qt6-base (6.4.2+dfsg-21) unstable; urgency=medium
+ 
+   [ Patrick Franz ]
+   * Add patch to fix CVE-2023-51714.
+ 
+  -- Patrick Franz <deltaone@debian.org>  Sat, 13 Jan 2024 14:53:25 +0100
  
  qt6-base (6.4.2+dfsg-20) unstable; urgency=medium