Merge version 6.4.2+dfsg-1+rpi1 and 6.4.2+dfsg-7 to produce 6.4.2+dfsg-7+rpi1

diff --cc debian/changelog
index cad8d67ef664aa6fda5e2189e6072153a95983da,b117abd33af7b58d09067ae231fc730f5ae16598..ac79d5d098349eca49d423dd416a9ab13ceed1aa
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,48 +1,55 @@@
- qt6-base (6.4.2+dfsg-1+rpi1) bookworm-staging; urgency=medium
++qt6-base (6.4.2+dfsg-7+rpi1) bookworm-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>  Fri, 10 Feb 2023 10:10:53 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 12 Mar 2023 14:00:56 +0000
++
+ qt6-base (6.4.2+dfsg-7) unstable; urgency=medium
+ 
+   [ Patrick Franz ]
+   * Update patch for CVE-2023-24607.
+ 
+  -- Patrick Franz <deltaone@debian.org>  Tue, 28 Feb 2023 23:22:10 +0100
+ 
+ qt6-base (6.4.2+dfsg-6) unstable; urgency=medium
+ 
+   [ Patrick Franz ]
+   * Add patch to fix CVE-2023-24607 (Closes: #1031871).
+ 
+  -- Patrick Franz <deltaone@debian.org>  Fri, 24 Feb 2023 22:31:24 +0100
+ 
+ qt6-base (6.4.2+dfsg-5) unstable; urgency=medium
+ 
+   [ Patrick Franz ]
+   * Fix path for <triplet>-qmake6 cross wrapper.
+ 
+  -- Patrick Franz <deltaone@debian.org>  Tue, 21 Feb 2023 16:14:43 +0100
+ 
+ qt6-base (6.4.2+dfsg-4) unstable; urgency=medium
+ 
+   * Team upload.
+   * Workaround wrong path in CMake file, Qt6::qmake IMPORTED_LOCATION by
+     modifying the path (Closes: #1030895).
+     Thanks Helmut Grohne and Dmitry Shachnev for the bug and solution.
+ 
+  -- Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org>  Mon, 20 Feb 2023 16:54:52 -0300
+ 
+ qt6-base (6.4.2+dfsg-3) unstable; urgency=medium
+ 
+   * Team upload.
+   * Remove symbols related to libzstd. They where there because of the static
+     library.
+ 
+  -- Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org>  Mon, 06 Feb 2023 16:47:48 -0300
+ 
+ qt6-base (6.4.2+dfsg-2) unstable; urgency=medium
+ 
+   * Team upload.
+   * Update symbols files with buildd's logs.
+   * Force the usage of the shared version of libzstd (Closes: #1030546).
+ 
+  -- Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org>  Mon, 06 Feb 2023 15:50:58 -0300
  
  qt6-base (6.4.2+dfsg-1) unstable; urgency=medium
  

diff --cc debian/libqt6core6.symbols
Simple merge

diff --cc debian/libqt6network6.symbols
Simple merge