Merge version 6.0-4+rpi1 and 6.0-6 to produce 6.0-6+rpi1

diff --cc debian/changelog
index bead6842eaa12b3787f32517a84693647b34709b,c7dee8d8f096ee6f55d869d61a9ee392e2dbd7f1..9f2891d73180f1b754ad0ab00ca3fa460243c7e2
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,19 +1,32 @@@
- pocl (6.0-4+rpi1) trixie-staging; urgency=medium
++pocl (6.0-6+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 1.5-6+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 26 Dec 2020 20:26:31 +0000]
 +  * Update symbols file for raspbian.
 + 
 +  [changes introduced in 3.0-4+rpi1 by Peter Michael Green]
 +  * Mark another symbol that does not appear in Raspbian as optional.
 +
 +  [changes introduced in 3.0-6+rpi1 by Peter Michael Green]
 +  * Mark another symbol that does not appear in Raspbian as optional.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 16 Jan 2025 18:06:36 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 17 Apr 2025 11:47:59 +0000
++
+ pocl (6.0-6) unstable; urgency=medium
+ 
+   * Add runtime dependency on llvm-spirv.
+   * Expect the spirv tests to fail on 32-bit architectures. (Closes: #1101871)
+ 
+  -- Andreas Beckmann <anbe@debian.org>  Tue, 08 Apr 2025 07:32:27 +0200
+ 
+ pocl (6.0-5) unstable; urgency=medium
+ 
+   * Update symbols file.  (Closes: #1097326)
+   * Build with libllvmspirvlib-18-dev and llvm-spirv-18.
+   * Build with libze-dev and -DENABLE_LEVEL0=ON.
+   * libpocl-devices-level0: New package for the Level Zero device library.
+   * Bump Standards-Version to 4.7.2, no changes needed.
+ 
+  -- Andreas Beckmann <anbe@debian.org>  Sat, 01 Mar 2025 02:58:05 +0100
  
  pocl (6.0-4) unstable; urgency=medium
  

diff --cc debian/libpocl2t64.symbols
index b847cf3ec17399faf982735e8b163ce6773c6af1,75eb364c84a81e0e9cc39c11e58cdfc114fd7f68..04482110b008e54e61f5a1051d9d3a3a325249d2
--- 1/debian/libpocl2t64.symbols
--- 2/debian/libpocl2t64.symbols
+++ b/debian/libpocl2t64.symbols
@@@ -88,10 -90,10 +88,10 @@@ libpocl.so.2 #PACKAGE# #MINVER
   _ZTINSt8__detail15_BracketMatcherINSt7__cxx1112regex_traitsIcEELb1ELb0EEE@Base 3.0
   _ZTINSt8__detail15_BracketMatcherINSt7__cxx1112regex_traitsIcEELb1ELb1EEE@Base 3.0
   (arch=armel riscv64)_ZTISt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE1EE@Base 0.10
 - (arch=!armel !riscv64)_ZTISt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 0.10
 + (optional=notarmelnotriscvandprobabllynotraspbian)_ZTISt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 0.10
   (arch=armel riscv64)_ZTISt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE1EE@Base 0.10
 - (arch=!armel !riscv64)_ZTISt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 0.10
 + (optional=notarmelnotriscvandprobabllynotraspbian)_ZTISt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 0.10
-  (arch=any-i386 armel armhf powerpc)_ZTISt19_Sp_make_shared_tag@Base 6.0-3~llvm18
+  (arch=armel armhf powerpc)_ZTISt19_Sp_make_shared_tag@Base 6.0-3~llvm18
   (optional=lto)_ZTSN4llvm3Any11StorageBaseE@Base 5.0-2~llvm16
   (optional=lto)_ZTSN4llvm3Any11StorageImplIPKNS_6ModuleEEE@Base 5.0-2~llvm16
   (arch=armel riscv64)_ZTSN9__gnu_cxx7__mutexE@Base 1.0