Merge version 6.2.4+dfsg-6+rpi1 and 6.3.1+dfsg-3 to produce 6.3.1+dfsg-3+rpi1

diff --cc debian/changelog
index 56f15fbcafdc7c48801fe36a2884fc80caa5d406,912b3bc13befc20cff59ecf1b8db4f43de1dc397..cf82cae36527fa9ca7800323b83f45592317cd56
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,59 +1,66 @@@
- qt6-declarative (6.2.4+dfsg-6+rpi1) bookworm-staging; urgency=medium
++qt6-declarative (6.3.1+dfsg-3+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 6.2.2+dfsg-4+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 24 Mar 2022 17:37:51 +0000]
 +  * Update symbols files for raspbian.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Mon, 04 Jul 2022 06:01:46 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 31 Aug 2022 19:05:21 +0000
++
+ qt6-declarative (6.3.1+dfsg-3) unstable; urgency=medium
+ 
+   [ Patrick Franz ]
+   * Update symbols from buildlogs.
+ 
+  -- Patrick Franz <deltaone@debian.org>  Tue, 16 Aug 2022 11:59:08 +0200
+ 
+ qt6-declarative (6.3.1+dfsg-2) unstable; urgency=medium
+ 
+   [ Patrick Franz ]
+   * Update symbols from buildlogs (Closes: #1013022).
+ 
+  -- Patrick Franz <deltaone@debian.org>  Mon, 15 Aug 2022 19:03:28 +0200
+ 
+ qt6-declarative (6.3.1+dfsg-1) experimental; urgency=medium
+ 
+   [ Pino Toscano ]
+   * Update symbols files from the logs of buildds.
+   * Enable qmlls, the QML Language Server:
+     - add the qt6-languageserver-private-dev build dependency
+     - backport upstream commit 95665d84fbe3f0a8ef47458bfbd7a3b8837869bc to look
+       for the proper CMake module; patch
+       upstream_CMake-Look-for-QtLanguageServerPrivate.patch
+     - install qmlls in qt6-declarative-dev-tools
+ 
+   [ Patrick Franz ]
+   * Merge changes from 6.2.4+dfsg-6.
+   * New upstream release (6.3.1).
+   * Bump Qt B-Ds to 6.3.1.
+   * Bump Standards-Version to 4.6.1 (no changes needed).
+   * Update ABI to 6.3.1.
+   * Remove upstream_CMake-Look-for-QtLanguageServerPrivate.patch as it
+     has been applied upstream.
+   * Update list of installed files.
+   * Update symbols from buildlogs.
+   * Update lintian-overrides.
+ 
+  -- Patrick Franz <deltaone@debian.org>  Sat, 16 Jul 2022 12:23:37 +0200
+ 
+ qt6-declarative (6.3.0+dfsg-2) experimental; urgency=medium
+ 
+   [ Patrick Franz ]
+   * Update symbols from buildlogs.
+ 
+  -- Patrick Franz <deltaone@debian.org>  Fri, 27 May 2022 17:33:58 +0200
+ 
+ qt6-declarative (6.3.0+dfsg-1) experimental; urgency=medium
+ 
+   [ Patrick Franz ]
+   * New upstream release (6.3.0).
+   * Bump Qt B-Ds to 6.3.0.
+   * Update ABI to 6.3.0.
+   * Update list of installed files.
+   * Update symbols from buildlogs.
+ 
+  -- Patrick Franz <deltaone@debian.org>  Thu, 26 May 2022 14:28:18 +0200
  
  qt6-declarative (6.2.4+dfsg-6) unstable; urgency=medium
  

diff --cc debian/libqt6qml6.symbols
index 1f2aa0a65bd542b0c891143cd5a2a6e7beebd6ed,0b3c9ad51adbdc687aa499c26d7317ce1fcea353..db263588875e20c2c72be936c40f513ae6bb0ba7
--- 1/debian/libqt6qml6.symbols
--- 2/debian/libqt6qml6.symbols
+++ b/debian/libqt6qml6.symbols
@@@ -3587,12 -3584,12 +3584,12 @@@ libQt6Qml.so.6 libqt6qml6 #MINVER
   (arch=armel riscv64)_ZTIN9__gnu_cxx7__mutexE@Base 6.2.0
   _ZTIPFP7QObjectP10QQmlEngineP9QJSEngineE@Base 6.2.0
   (arch=armel riscv64)_ZTISt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE1EE@Base 6.2.0
 - (arch=!armel !riscv64)_ZTISt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 6.2.0
 + (optional=notarmelandprobabllynotraspbian)_ZTISt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 6.2.0
   (arch=armel riscv64)_ZTISt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE1EE@Base 6.2.0
 - (arch=!armel !riscv64)_ZTISt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 6.2.0
 + (optional=notarmelandprobabllynotraspbian)_ZTISt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 6.2.0
   (arch=armel armhf)_ZTISt19_Sp_make_shared_tag@Base 6.2.0
-  (arch=armel riscv64)_ZTISt23_Sp_counted_ptr_inplaceIN14QQmlTypeLoader4Blob13PendingImportESaIS2_ELN9__gnu_cxx12_Lock_policyE1EE@Base 6.2.0
-  (optional=notarmelandprobabllynotraspbian)_ZTISt23_Sp_counted_ptr_inplaceIN14QQmlTypeLoader4Blob13PendingImportESaIS2_ELN9__gnu_cxx12_Lock_policyE2EE@Base 6.2.0
+  (arch=armel)_ZTISt23_Sp_counted_ptr_inplaceIN14QQmlTypeLoader4Blob13PendingImportESaIvELN9__gnu_cxx12_Lock_policyE1EE@Base 6.3.1
+  (arch=!armel)_ZTISt23_Sp_counted_ptr_inplaceIN14QQmlTypeLoader4Blob13PendingImportESaIvELN9__gnu_cxx12_Lock_policyE2EE@Base 6.3.1
   _ZTIZN3QV48Compiler7Codegen29VolatileMemoryLocationScanner18collectIdentifiersER5QListI11QStringViewEPN6QQmlJS3AST4NodeEE9Collector@Base 6.2.0
   (subst)_ZTIZN9QMetaType17registerConverterI5QHashI{quintptr}N12QQmlProfiler8LocationEE9QIterableI16QMetaAssociationEN9QtPrivate34QAssociativeIterableConvertFunctorIS4_EEEEbT1_EUlPKvPvE_@Base 6.2.0
   (subst)_ZTIZN9QMetaType17registerConverterI5QHashI{quintptr}N3QV49Profiling16FunctionLocationEE9QIterableI16QMetaAssociationEN9QtPrivate34QAssociativeIterableConvertFunctorIS5_EEEEbT1_EUlPKvPvE_@Base 6.2.0
@@@ -3851,12 -3850,12 +3850,12 @@@
   (arch=armel riscv64)_ZTSN9__gnu_cxx7__mutexE@Base 6.2.0
   _ZTSPFP7QObjectP10QQmlEngineP9QJSEngineE@Base 6.2.0
   (arch=armel riscv64)_ZTSSt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE1EE@Base 6.2.0
 - (arch=!armel !riscv64)_ZTSSt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 6.2.0
 + (optional=notarmelandprobabllynotraspbian)_ZTSSt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 6.2.0
   (arch=armel riscv64)_ZTSSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE1EE@Base 6.2.0
 - (arch=!armel !riscv64)_ZTSSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 6.2.0
 + (optional=notarmelandprobabllynotraspbian)_ZTSSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 6.2.0
   _ZTSSt19_Sp_make_shared_tag@Base 6.2.0
-  (arch=armel riscv64)_ZTSSt23_Sp_counted_ptr_inplaceIN14QQmlTypeLoader4Blob13PendingImportESaIS2_ELN9__gnu_cxx12_Lock_policyE1EE@Base 6.2.0
-  (optional=notarmelandprobabllynotraspbian)_ZTSSt23_Sp_counted_ptr_inplaceIN14QQmlTypeLoader4Blob13PendingImportESaIS2_ELN9__gnu_cxx12_Lock_policyE2EE@Base 6.2.0
+  (arch=armel)_ZTSSt23_Sp_counted_ptr_inplaceIN14QQmlTypeLoader4Blob13PendingImportESaIvELN9__gnu_cxx12_Lock_policyE1EE@Base 6.3.1
+  (arch=!armel)_ZTSSt23_Sp_counted_ptr_inplaceIN14QQmlTypeLoader4Blob13PendingImportESaIvELN9__gnu_cxx12_Lock_policyE2EE@Base 6.3.1
   _ZTSZN3QV48Compiler7Codegen29VolatileMemoryLocationScanner18collectIdentifiersER5QListI11QStringViewEPN6QQmlJS3AST4NodeEE9Collector@Base 6.2.0
   (subst)_ZTSZN9QMetaType17registerConverterI5QHashI{quintptr}N12QQmlProfiler8LocationEE9QIterableI16QMetaAssociationEN9QtPrivate34QAssociativeIterableConvertFunctorIS4_EEEEbT1_EUlPKvPvE_@Base 6.2.0
   (subst)_ZTSZN9QMetaType17registerConverterI5QHashI{quintptr}N3QV49Profiling16FunctionLocationEE9QIterableI16QMetaAssociationEN9QtPrivate34QAssociativeIterableConvertFunctorIS5_EEEEbT1_EUlPKvPvE_@Base 6.2.0

diff --cc debian/libqt6quick6.symbols
index 23379cbf455d0ba77d3899a5f8fb7879a7fabad6,50ec562162b47fb1d1817b9fb87a7bd848b15305..3e78176ae9b8b6cbe1d632bc8918a928ddaa9b12
--- 1/debian/libqt6quick6.symbols
--- 2/debian/libqt6quick6.symbols
+++ b/debian/libqt6quick6.symbols
@@@ -7020,12 -7108,12 +7108,12 @@@ libQt6Quick.so.6 libqt6quick6 #MINVER
   (arch=armel riscv64)_ZTIN9__gnu_cxx7__mutexE@Base 6.2.0
   _ZTIPFP7QObjectP10QQmlEngineP9QJSEngineE@Base 6.2.0
   (arch=armel riscv64)_ZTISt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE1EE@Base 6.2.0
 - (arch=!armel !riscv64)_ZTISt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 6.2.0
 + (optional=notarmelandprobabllynotraspbian)_ZTISt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 6.2.0
   (arch=armel riscv64)_ZTISt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE1EE@Base 6.2.0
 - (arch=!armel !riscv64)_ZTISt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 6.2.0
 + (optional=notarmelandprobabllynotraspbian)_ZTISt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 6.2.0
   (arch=armel armhf)_ZTISt19_Sp_make_shared_tag@Base 6.2.0
-  (arch=armel riscv64)_ZTISt23_Sp_counted_ptr_inplaceI26QQuickPaletteColorProviderSaIS0_ELN9__gnu_cxx12_Lock_policyE1EE@Base 6.2.0
-  (optional=notarmelandprobabllynotraspbian)_ZTISt23_Sp_counted_ptr_inplaceI26QQuickPaletteColorProviderSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE@Base 6.2.0
+  (arch=armel)_ZTISt23_Sp_counted_ptr_inplaceI26QQuickPaletteColorProviderSaIvELN9__gnu_cxx12_Lock_policyE1EE@Base 6.3.1
+  (arch=amd64)_ZTISt23_Sp_counted_ptr_inplaceI26QQuickPaletteColorProviderSaIvELN9__gnu_cxx12_Lock_policyE2EE@Base 6.3.1
   _ZTIZN9QMetaType17registerConverterI5QListI4QUrlE9QIterableI13QMetaSequenceEN9QtPrivate33QSequentialIterableConvertFunctorIS3_EEEEbT1_EUlPKvPvE_@Base 6.2.0
   _ZTIZN9QMetaType17registerConverterI5QListI7QPointFE9QIterableI13QMetaSequenceEN9QtPrivate33QSequentialIterableConvertFunctorIS3_EEEEbT1_EUlPKvPvE_@Base 6.2.0
   _ZTIZN9QMetaType17registerConverterI5QListI9QPolygonFE9QIterableI13QMetaSequenceEN9QtPrivate33QSequentialIterableConvertFunctorIS3_EEEEbT1_EUlPKvPvE_@Base 6.2.0
@@@ -7329,12 -7421,12 +7421,12 @@@
   (arch=armel riscv64)_ZTSN9__gnu_cxx7__mutexE@Base 6.2.0
   _ZTSPFP7QObjectP10QQmlEngineP9QJSEngineE@Base 6.2.0
   (arch=armel riscv64)_ZTSSt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE1EE@Base 6.2.0
 - (arch=!armel !riscv64)_ZTSSt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 6.2.0
 + (optional=notarmelandprobabllynotraspbian)_ZTSSt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 6.2.0
   (arch=armel riscv64)_ZTSSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE1EE@Base 6.2.0
 - (arch=!armel !riscv64)_ZTSSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 6.2.0
 + (optional=notarmelandprobabllynotraspbian)_ZTSSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 6.2.0
   _ZTSSt19_Sp_make_shared_tag@Base 6.2.0
-  (arch=armel riscv64)_ZTSSt23_Sp_counted_ptr_inplaceI26QQuickPaletteColorProviderSaIS0_ELN9__gnu_cxx12_Lock_policyE1EE@Base 6.2.0
-  (optional=notarmelandprobabllynotraspbian)_ZTSSt23_Sp_counted_ptr_inplaceI26QQuickPaletteColorProviderSaIS0_ELN9__gnu_cxx12_Lock_policyE2EE@Base 6.2.0
+  (arch=armel)_ZTSSt23_Sp_counted_ptr_inplaceI26QQuickPaletteColorProviderSaIvELN9__gnu_cxx12_Lock_policyE1EE@Base 6.3.1
+  (arch=amd64)_ZTSSt23_Sp_counted_ptr_inplaceI26QQuickPaletteColorProviderSaIvELN9__gnu_cxx12_Lock_policyE2EE@Base 6.3.1
   _ZTSZN9QMetaType17registerConverterI5QListI4QUrlE9QIterableI13QMetaSequenceEN9QtPrivate33QSequentialIterableConvertFunctorIS3_EEEEbT1_EUlPKvPvE_@Base 6.2.0
   _ZTSZN9QMetaType17registerConverterI5QListI7QPointFE9QIterableI13QMetaSequenceEN9QtPrivate33QSequentialIterableConvertFunctorIS3_EEEEbT1_EUlPKvPvE_@Base 6.2.0
   _ZTSZN9QMetaType17registerConverterI5QListI9QPolygonFE9QIterableI13QMetaSequenceEN9QtPrivate33QSequentialIterableConvertFunctorIS3_EEEEbT1_EUlPKvPvE_@Base 6.2.0