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

diff --cc debian/changelog
index bc98bb7d9e3a8de918ec42662f85062b58fdd867,eb9105cbad842ffd9b763f014610e0a3081980f7..5a5e012074577015f6ddaf08582ed7aed238d990
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,17 +1,27 @@@
- pocl (3.0-4+rpi1) bookworm-staging; urgency=medium
++pocl (3.0-6+rpi1) bookworm-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.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Sun, 03 Jul 2022 11:56:05 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 09 Aug 2022 19:04:47 +0000
++
+ pocl (3.0-6) unstable; urgency=medium
+ 
+   * Update symbols file.
+ 
+  -- Andreas Beckmann <anbe@debian.org>  Thu, 04 Aug 2022 01:54:01 +0200
+ 
+ pocl (3.0-5) unstable; urgency=medium
+ 
+   * Rebuild with GCC 12.  (Closes: #1016294)
+   * Add some patches to use -latomic if needed.
+   * Drop redundant pie flags to make blhc happy.
+   * Update symbols file for amd64 and i386.
+ 
+  -- Andreas Beckmann <anbe@debian.org>  Wed, 03 Aug 2022 07:26:39 +0200
  
  pocl (3.0-4) unstable; urgency=medium
  

diff --cc debian/libpocl2.symbols
index 7e1cd7e07a57e4ee292d1bcc08d544b745859b69,c55cb23ac1090f6c4984a3ce789e367902134faa..ac16a15cc972f8a4c4a70483170ca99d2785f3c3
--- 1/debian/libpocl2.symbols
--- 2/debian/libpocl2.symbols
+++ b/debian/libpocl2.symbols
@@@ -3,10 -3,10 +3,8 @@@ libpocl-devices-basic.so #PACKAGE# #MIN
  * Build-Depends-Package: libpocl-dev
   pocl_basic_init_device_ops@Base 1.6
  libpocl-devices-pthread.so #PACKAGE# #MINVER#
--* Build-Depends-Package: libpocl-dev
   pocl_pthread_init_device_ops@Base 1.6
  libpocl.so.2 #PACKAGE# #MINVER#
--* Build-Depends-Package: libpocl-dev
  #MISSING: 0.11# Header@Base 0.10
  #MISSING: 0.11# KernelName@Base 0.10
   POclGetExtensionFunctionAddress@Base 3.0
@@@ -86,12 -86,14 +84,14 @@@
   _ZTSNSt8__detail15_BracketMatcherINSt7__cxx1112regex_traitsIcEELb1ELb0EEE@Base 3.0
   _ZTSNSt8__detail15_BracketMatcherINSt7__cxx1112regex_traitsIcEELb1ELb1EEE@Base 3.0
   (arch=armel riscv64)_ZTSSt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE1EE@Base 0.10
 - (arch=!armel !riscv64)_ZTSSt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 0.10
 + (optional=notarmelnotriscvandprobabllynotraspbian)_ZTSSt11_Mutex_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 0.10
   (arch=armel riscv64)_ZTSSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE1EE@Base 0.10
 - (arch=!armel !riscv64)_ZTSSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 0.10
 + (optional=notarmelnotriscvandprobabllynotraspbian)_ZTSSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE@Base 0.10
   _ZTSSt19_Sp_make_shared_tag@Base 0.10
-  (arch=armel riscv64)_ZTSSt23_Sp_counted_ptr_inplaceINSt8__detail4_NFAINSt7__cxx1112regex_traitsIcEEEESaIS5_ELN9__gnu_cxx12_Lock_policyE1EE@Base 3.0
-  (optional=notarmelnotriscvandprobabllynotraspbian)_ZTSSt23_Sp_counted_ptr_inplaceINSt8__detail4_NFAINSt7__cxx1112regex_traitsIcEEEESaIS5_ELN9__gnu_cxx12_Lock_policyE2EE@Base 3.0
+ #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_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