Merge version 3.1-3+deb12u1+rpi1 and 4.0-3 to produce 4.0-3+rpi1

diff --cc debian/changelog
index e753863148261bd47533c6e477b113ee5fbf1572,94d217b49840069a1b2c2542a7ba7bacf4c8d7c7..b78aec72eaf6a1b0728faaa76533dbc3a90db2ca
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,34 +1,47 @@@
- pocl (3.1-3+deb12u1+rpi1) bookworm-staging; urgency=medium
++pocl (4.0-3+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>  Sun, 14 May 2023 21:46:42 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 19 Dec 2023 23:55:43 +0000
++
+ pocl (4.0-3) unstable; urgency=medium
+ 
+   * Perform a distro build for i386, too.
+ 
+  -- Andreas Beckmann <anbe@debian.org>  Tue, 12 Dec 2023 16:33:19 +0100
+ 
+ pocl (4.0-2) unstable; urgency=medium
+ 
+   * Rebuild with GCC 13.
+   * Update symbols file for amd64 and i386.
+   * Upload to unstable.
+ 
+  -- Andreas Beckmann <anbe@debian.org>  Mon, 14 Aug 2023 15:53:17 +0200
+ 
+ pocl (4.0-1) experimental; urgency=medium
+ 
+   * New upstream release.
+   * Refresh patches.
+   * Fix virtual package pocl-source-$version in case of ~rc versions.
+ 
+  -- Andreas Beckmann <anbe@debian.org>  Mon, 26 Jun 2023 17:08:19 +0200
+ 
+ pocl (4.0~rc1-1) experimental; urgency=medium
+ 
+   * New upstream release candidate.
+   * Refresh patches.
+   * Fix FTBFS on i386.
+   * Update symbols file for amd64 and i386.
+   * Upload to experimental.
+ 
+  -- Andreas Beckmann <anbe@debian.org>  Wed, 14 Jun 2023 14:31:23 +0200
  
  pocl (3.1-3+deb12u1) bookworm; urgency=medium
  

diff --cc debian/libpocl2.symbols
index b0f5dfd379e3bba0714a47e1623c3348db70c65a,f9d3362ab8cafe9cc2e2cef9789ba9ca3efe3006..16bcda70c3997ac4a978073da348fd109accd9a6
--- 1/debian/libpocl2.symbols
--- 2/debian/libpocl2.symbols
+++ b/debian/libpocl2.symbols
@@@ -90,8 -106,8 +104,8 @@@ libpocl.so.2 #PACKAGE# #MINVER
   _ZTSSt19_Sp_make_shared_tag@Base 0.10
  #MISSING: 3.0-5~gcc12# (arch=armel riscv64)_ZTSSt23_Sp_counted_ptr_inplaceINSt8__detail4_NFAINSt7__cxx1112regex_traitsIcEEEESaIS5_ELN9__gnu_cxx12_Lock_policyE1EE@Base 3.0
  #MISSING: 3.0-5~gcc12# (arch=!armel !riscv64)_ZTSSt23_Sp_counted_ptr_inplaceINSt8__detail4_NFAINSt7__cxx1112regex_traitsIcEEEESaIS5_ELN9__gnu_cxx12_Lock_policyE2EE@Base 3.0
-  (arch=armel)_ZTSSt23_Sp_counted_ptr_inplaceINSt8__detail4_NFAINSt7__cxx1112regex_traitsIcEEEESaIvELN9__gnu_cxx12_Lock_policyE1EE@Base 3.0-5~gcc12
+  (arch=armel riscv64)_ZTSSt23_Sp_counted_ptr_inplaceINSt8__detail4_NFAINSt7__cxx1112regex_traitsIcEEEESaIvELN9__gnu_cxx12_Lock_policyE1EE@Base 3.0-5~gcc12
 - (arch=!armel !riscv64)_ZTSSt23_Sp_counted_ptr_inplaceINSt8__detail4_NFAINSt7__cxx1112regex_traitsIcEEEESaIvELN9__gnu_cxx12_Lock_policyE2EE@Base 3.0-5~gcc12
 + (optional=notarmelnotriscvandprobabllynotraspbian)_ZTSSt23_Sp_counted_ptr_inplaceINSt8__detail4_NFAINSt7__cxx1112regex_traitsIcEEEESaIvELN9__gnu_cxx12_Lock_policyE2EE@Base 3.0-5~gcc12
   (optional=templinst)_ZZNKSt7__cxx1112regex_traitsIcE16lookup_classnameIPKcEENS1_10_RegexMaskET_S6_bE12__classnames@Base 3.0
   (optional=templinst)_ZZNKSt7__cxx1112regex_traitsIcE18lookup_collatenameIPKcEENS_12basic_stringIcSt11char_traitsIcESaIcEEET_SA_E14__collatenames@Base 3.0
   (optional=templinst)_ZZNKSt8__detail11_AnyMatcherINSt7__cxx1112regex_traitsIcEELb0ELb0ELb0EEclEcE5__nul@Base 3.0