Merge version 6.3.1+dfsg-10+rpi1 and 6.4.2+dfsg~rc1-3 to produce 6.4.2+dfsg~rc1-3...

diff --cc debian/changelog
index 4e7bc18e5fcbcb1657507e40c6bb5e582480b30c,ce14253247b5f734a8389c44f3ef6cc563bb7947..a95fdd841f61542577b313dcd4376ed3a33ce9fc
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,80 +1,87 @@@
- qt6-base (6.3.1+dfsg-10+rpi1) bookworm-staging; urgency=medium
++qt6-base (6.4.2+dfsg~rc1-3+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>  Mon, 10 Oct 2022 00:29:38 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 07 Jan 2023 11:24:58 +0000
++
+ qt6-base (6.4.2+dfsg~rc1-3) unstable; urgency=medium
+ 
+   [ Patrick Franz ]
+   * Upload to unstable.
+ 
+  -- Patrick Franz <deltaone@debian.org>  Fri, 30 Dec 2022 16:58:05 +0100
+ 
+ qt6-base (6.4.2+dfsg~rc1-2) experimental; urgency=medium
+ 
+   [ Patrick Franz ]
+   * Update symbols from buildlogs.
+ 
+  -- Patrick Franz <deltaone@debian.org>  Wed, 28 Dec 2022 14:19:02 +0100
+ 
+ qt6-base (6.4.2+dfsg~rc1-1) experimental; urgency=medium
+ 
+   [ Patrick Franz ]
+   * Enable link time optimization (Closes: #1015617).
+   * Update ABI to 6.4.2.
+   * Update excluded files from tarball.
+   * Bump Standards-Version to 4.6.2 (no changes needed).
+ 
+  -- Patrick Franz <deltaone@debian.org>  Tue, 27 Dec 2022 22:26:09 +0100
+ 
+ qt6-base (6.4.1+dfsg-1) experimental; urgency=medium
+ 
+   [ Patrick Franz ]
+   * Make cmake a suggestion of qt6-base-dev-tools instead of a hard
+     dependency (Closes: #1019870).
+   * New upstream release (6.4.1).
+   * Update ABI to 6.4.1.
+   * Update symbols from buildlogs.
+ 
+  -- Patrick Franz <deltaone@debian.org>  Tue, 15 Nov 2022 18:30:46 +0100
+ 
+ qt6-base (6.4.0+dfsg-5) experimental; urgency=medium
+ 
+   * Team upload.
+   * Update symbols files from the logs of buildds.
+ 
+  -- Pino Toscano <pino@debian.org>  Sun, 16 Oct 2022 18:06:33 +0200
+ 
+ qt6-base (6.4.0+dfsg-4) experimental; urgency=medium
+ 
+   * Team upload.
+   * Backport upstream commit e81cba0cd33339c2e5f5e3c670741605264b21c2 to support
+     HPPA; patch upstream_Add-HPPA-detection.patch. (Closes: #1021404)
+   * Backport upstream commit ac17a394a5701174c705050640e26c9cb95d289b to support
+     M68k; patch upstream_Add-M68k-detection.patch.
+ 
+  -- Pino Toscano <pino@debian.org>  Sat, 15 Oct 2022 07:43:54 +0200
+ 
+ qt6-base (6.4.0+dfsg-3) experimental; urgency=medium
+ 
+   [ Patrick Franz ]
+   * Do not install cmake-files for various plugins.
+ 
+  -- Patrick Franz <deltaone@debian.org>  Sun, 02 Oct 2022 11:20:53 +0200
+ 
+ qt6-base (6.4.0+dfsg-2) experimental; urgency=medium
+ 
+   * Team upload.
+   * Update symbols files from the logs of buildds.
+ 
+  -- Pino Toscano <pino@debian.org>  Sun, 02 Oct 2022 08:19:09 +0200
+ 
+ qt6-base (6.4.0+dfsg-1) experimental; urgency=medium
+ 
+   [ Patrick Franz ]
+   * New upstream release (6.4.0).
+   * Update ABI to 6.4.0.
+   * Remove some patches as they have been applied upstream.
+   * Update list of installed files.
+   * Update symbols from buildlogs.
+   * Update lintian-overrides.
+ 
+  -- Patrick Franz <deltaone@debian.org>  Sat, 01 Oct 2022 20:35:52 +0200
  
  qt6-base (6.3.1+dfsg-10) unstable; urgency=medium
  

diff --cc debian/libqt6core6.symbols
Simple merge

diff --cc debian/libqt6gui6.symbols
Simple merge

diff --cc debian/libqt6network6.symbols
index 1c76abccb2351ea08451083f98afa3eb9be90f30,a716bbf8466eb9fba0cb6d22fd28b1ec65a8b679..7080b9714a2146ae3cb877a7c45c7290d1b8a1d4
--- 1/debian/libqt6network6.symbols
--- 2/debian/libqt6network6.symbols
+++ b/debian/libqt6network6.symbols
@@@ -1360,10 -1708,10 +1708,10 @@@ libQt6Network.so.6 libqt6network6 #MINV
   _ZTI5QDtls@Qt_6 6.1.2
   (arch=armel riscv64)_ZTIN9__gnu_cxx7__mutexE@Qt_6 6.3.0
   (arch=armel riscv64)_ZTISt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE1EE@Qt_6 6.3.0
 - (arch=!armel !riscv64)_ZTISt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE2EE@Qt_6 6.3.0
 + (optional=notarmelnotriscvandprobabllynotraspbian)_ZTISt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE2EE@Qt_6 6.3.0
   (arch=armel riscv64)_ZTISt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE1EE@Qt_6 6.3.0
 - (arch=!armel !riscv64)_ZTISt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE@Qt_6 6.3.0
 + (optional=notarmelnotriscvandprobabllynotraspbian)_ZTISt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE@Qt_6 6.3.0
-  (arch=armel armhf)_ZTISt19_Sp_make_shared_tag@Qt_6 6.3.0
+  _ZTISt19_Sp_make_shared_tag@Qt_6 6.4.2
   _ZTIZN9QMetaType17registerConverterI5QListI14QNetworkCookieE9QIterableI13QMetaSequenceEN9QtPrivate33QSequentialIterableConvertFunctorIS3_EEEEbT1_EUlPKvPvE_@Qt_6 6.1.2
   _ZTIZN9QMetaType17registerConverterI5QListI9QSslErrorE9QIterableI13QMetaSequenceEN9QtPrivate33QSequentialIterableConvertFunctorIS3_EEEEbT1_EUlPKvPvE_@Qt_6 6.1.2
   _ZTIZN9QMetaType17registerConverterI5QListISt4pairI10QByteArrayS3_EE9QIterableI13QMetaSequenceEN9QtPrivate33QSequentialIterableConvertFunctorIS5_EEEEbT1_EUlPKvPvE_@Qt_6 6.1.2
@@@ -1393,10 -1742,12 +1742,12 @@@
   _ZTS5QDtls@Qt_6 6.1.2
   (arch=armel riscv64)_ZTSN9__gnu_cxx7__mutexE@Qt_6 6.3.0
   (arch=armel riscv64)_ZTSSt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE1EE@Qt_6 6.3.0
 - (arch=!armel !riscv64)_ZTSSt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE2EE@Qt_6 6.3.0
 + (optional=notarmelnotriscvandprobabllynotraspbian)_ZTSSt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE2EE@Qt_6 6.3.0
   (arch=armel riscv64)_ZTSSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE1EE@Qt_6 6.3.0
 - (arch=!armel !riscv64)_ZTSSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE@Qt_6 6.3.0
 + (optional=notarmelnotriscvandprobabllynotraspbian)_ZTSSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE@Qt_6 6.3.0
   _ZTSSt19_Sp_make_shared_tag@Qt_6 6.3.0
+  (arch=armel riscv64)_ZTSSt23_Sp_counted_ptr_inplaceI6QTimerSaIvELN9__gnu_cxx12_Lock_policyE1EE@Qt_6 6.4.0
+  (arch=!armel !riscv64)_ZTSSt23_Sp_counted_ptr_inplaceI6QTimerSaIvELN9__gnu_cxx12_Lock_policyE2EE@Qt_6 6.4.0
   _ZTSZN9QMetaType17registerConverterI5QListI14QNetworkCookieE9QIterableI13QMetaSequenceEN9QtPrivate33QSequentialIterableConvertFunctorIS3_EEEEbT1_EUlPKvPvE_@Qt_6 6.1.2
   _ZTSZN9QMetaType17registerConverterI5QListI9QSslErrorE9QIterableI13QMetaSequenceEN9QtPrivate33QSequentialIterableConvertFunctorIS3_EEEEbT1_EUlPKvPvE_@Qt_6 6.1.2
   _ZTSZN9QMetaType17registerConverterI5QListISt4pairI10QByteArrayS3_EE9QIterableI13QMetaSequenceEN9QtPrivate33QSequentialIterableConvertFunctorIS5_EEEEbT1_EUlPKvPvE_@Qt_6 6.1.2