Merge version 15.0.0-2+rpi1 and 15.0.0-6 to produce 15.0.0-6+rpi1

diff --cc debian/changelog
index bc790b3b99c8ea227389ed9322e616d5af0b9232,01b4d8be4b5f493f187e686a99dc7097772fa067..bbbab3cb48e39c97ff339013dcd4cd220ba28d97
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,33 +1,40 @@@
- spirv-llvm-translator-15 (15.0.0-2+rpi1) bookworm-staging; urgency=medium
++spirv-llvm-translator-15 (15.0.0-6+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 15.0.0-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 01 Dec 2022 20:11:16 +0000]
 +  * Update symbols file for raspbian.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sat, 03 Jun 2023 19:15:49 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 17 Feb 2024 20:02:01 +0000
++
+ spirv-llvm-translator-15 (15.0.0-6) unstable; urgency=medium
+ 
+   * Add build-needed autopkgtest for spirv-headers compat check.
+   * Update from llvm_release_150 branch.
+   * Bump spirv-headers dependency to 1.6.1+1.3.275.0.
+ 
+  -- Andreas Beckmann <anbe@debian.org>  Thu, 08 Feb 2024 22:48:18 +0100
+ 
+ spirv-llvm-translator-15 (15.0.0-5) unstable; urgency=medium
+ 
+   * Update .symbols control file.
+ 
+  -- Andreas Beckmann <anbe@debian.org>  Fri, 29 Sep 2023 13:48:15 +0200
+ 
+ spirv-llvm-translator-15 (15.0.0-4) unstable; urgency=medium
+ 
+   [ Andreas Beckmann ]
+   * Update .symbols control file for gcc-13 builds.
+ 
+   [ Gianfranco Costamagna ]
+   * Mark some more symbols as optional as they don't appear on Ubuntu (LTO?).
+     (Closes: #1042819)
+ 
+  -- Andreas Beckmann <anbe@debian.org>  Thu, 03 Aug 2023 11:46:40 +0200
+ 
+ spirv-llvm-translator-15 (15.0.0-3) unstable; urgency=medium
+ 
+   * Fix compatibility with newer spirv-as.  (Closes: #1040056)
+ 
+  -- Andreas Beckmann <anbe@debian.org>  Tue, 11 Jul 2023 15:05:17 +0200
  
  spirv-llvm-translator-15 (15.0.0-2) unstable; urgency=medium
  

diff --cc debian/libllvmspirvlib15.symbols
index 54961524dee7442712e56bbd05eb3c348a7cecbe,582f86d39b07118d6581c34f6f3a2c0a58b77118..d6c641ba1e4f5c36816d5981589f54a555857408
--- 1/debian/libllvmspirvlib15.symbols
--- 2/debian/libllvmspirvlib15.symbols
+++ b/debian/libllvmspirvlib15.symbols
@@@ -431,12 -445,12 +445,12 @@@ libLLVMSPIRVLib.so.15 #PACKAGE# #MINVER
   _ZTINSt8__detail15_BracketMatcherINSt7__cxx1112regex_traitsIcEELb1ELb0EEE@Base 13
   _ZTINSt8__detail15_BracketMatcherINSt7__cxx1112regex_traitsIcEELb1ELb1EEE@Base 13
   (arch=armel riscv64)_ZTISt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE1EE@Base 13
 - (arch=!armel !riscv64)_ZTISt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 13
 + (optional=notarmelandprobabllynotraspbian !riscv64)_ZTISt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 13
   (arch=armel riscv64)_ZTISt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE1EE@Base 13
 - (arch=!armel !riscv64)_ZTISt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 13
 + (optional=notarmelandprobabllynotraspbian !riscv64)_ZTISt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 13
   (arch=armel armhf)_ZTISt19_Sp_make_shared_tag@Base 13
-  (arch=armel riscv64)_ZTISt23_Sp_counted_ptr_inplaceINSt8__detail4_NFAINSt7__cxx1112regex_traitsIcEEEESaIvELN9__gnu_cxx12_Lock_policyE1EE@Base 13
+  (optional=templinst|arch=armel riscv64)_ZTISt23_Sp_counted_ptr_inplaceINSt8__detail4_NFAINSt7__cxx1112regex_traitsIcEEEESaIvELN9__gnu_cxx12_Lock_policyE1EE@Base 13
 - (optional=templinst|arch=!armel !riscv64)_ZTISt23_Sp_counted_ptr_inplaceINSt8__detail4_NFAINSt7__cxx1112regex_traitsIcEEEESaIvELN9__gnu_cxx12_Lock_policyE2EE@Base 13
 + (optional=notarmelandprobabllynotraspbian !riscv64)_ZTISt23_Sp_counted_ptr_inplaceINSt8__detail4_NFAINSt7__cxx1112regex_traitsIcEEEESaIvELN9__gnu_cxx12_Lock_policyE2EE@Base 13
   (arch=armel riscv64)_ZTSN9__gnu_cxx7__mutexE@Base 13
   _ZTSNSt8__detail11_AnyMatcherINSt7__cxx1112regex_traitsIcEELb0ELb0ELb0EEE@Base 13
   _ZTSNSt8__detail11_AnyMatcherINSt7__cxx1112regex_traitsIcEELb0ELb0ELb1EEE@Base 13
@@@ -455,14 -469,14 +469,14 @@@
   _ZTSNSt8__detail15_BracketMatcherINSt7__cxx1112regex_traitsIcEELb1ELb0EEE@Base 13
   _ZTSNSt8__detail15_BracketMatcherINSt7__cxx1112regex_traitsIcEELb1ELb1EEE@Base 13
   (arch=armel riscv64)_ZTSSt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE1EE@Base 13
 - (arch=!armel !riscv64)_ZTSSt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 13
 + (optional=notarmelandprobabllynotraspbian !riscv64)_ZTSSt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 13
   (arch=armel riscv64)_ZTSSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE1EE@Base 13
 - (arch=!armel !riscv64)_ZTSSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 13
 + (optional=notarmelandprobabllynotraspbian !riscv64)_ZTSSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 13
   _ZTSSt19_Sp_make_shared_tag@Base 13
-  (arch=armel riscv64)_ZTSSt23_Sp_counted_ptr_inplaceINSt8__detail4_NFAINSt7__cxx1112regex_traitsIcEEEESaIvELN9__gnu_cxx12_Lock_policyE1EE@Base 13
+  (optional=templinst|arch=armel riscv64)_ZTSSt23_Sp_counted_ptr_inplaceINSt8__detail4_NFAINSt7__cxx1112regex_traitsIcEEEESaIvELN9__gnu_cxx12_Lock_policyE1EE@Base 13
 - (optional=templinst|arch=!armel !riscv64)_ZTSSt23_Sp_counted_ptr_inplaceINSt8__detail4_NFAINSt7__cxx1112regex_traitsIcEEEESaIvELN9__gnu_cxx12_Lock_policyE2EE@Base 13
 + (optional=notarmelandprobabllynotraspbian !riscv64)_ZTSSt23_Sp_counted_ptr_inplaceINSt8__detail4_NFAINSt7__cxx1112regex_traitsIcEEEESaIvELN9__gnu_cxx12_Lock_policyE2EE@Base 13
-  (arch=armel riscv64)_ZTVSt23_Sp_counted_ptr_inplaceINSt8__detail4_NFAINSt7__cxx1112regex_traitsIcEEEESaIvELN9__gnu_cxx12_Lock_policyE1EE@Base 0
+  (optional=templinst|arch=armel riscv64)_ZTVSt23_Sp_counted_ptr_inplaceINSt8__detail4_NFAINSt7__cxx1112regex_traitsIcEEEESaIvELN9__gnu_cxx12_Lock_policyE1EE@Base 0
 - (optional=templinst|arch=!armel !riscv64)_ZTVSt23_Sp_counted_ptr_inplaceINSt8__detail4_NFAINSt7__cxx1112regex_traitsIcEEEESaIvELN9__gnu_cxx12_Lock_policyE2EE@Base 0
 + (optional=notarmelandprobabllynotraspbian !riscv64)_ZTVSt23_Sp_counted_ptr_inplaceINSt8__detail4_NFAINSt7__cxx1112regex_traitsIcEEEESaIvELN9__gnu_cxx12_Lock_policyE2EE@Base 0
   (optional=templinst)_ZZNKSt7__cxx1112regex_traitsIcE16lookup_classnameIPKcEENS1_10_RegexMaskET_S6_bE12__classnames@Base 0
   (optional=templinst)_ZZNKSt7__cxx1112regex_traitsIcE18lookup_collatenameIPKcEENS_12basic_stringIcSt11char_traitsIcESaIcEEET_SA_E14__collatenames@Base 0
   (optional=templinst)_ZZNKSt8__detail11_AnyMatcherINSt7__cxx1112regex_traitsIcEELb0ELb0ELb0EEclEcE5__nul@Base 0