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

diff --cc debian/changelog
index 9f2891d73180f1b754ad0ab00ca3fa460243c7e2,d21c8e3e996c275721c41d36daedbdfb69c7a753..4a64bd982e085f1f44da9e71bd09fabc801655f5
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,9 +1,22 @@@
- pocl (6.0-6+rpi1) trixie-staging; urgency=medium
++pocl (6.0-7+rpi1) forky-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, 17 Apr 2025 11:47:59 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 22 May 2026 23:38:18 +0000
++
+ pocl (6.0-7) unstable; urgency=medium
+ 
+   * Build with -DENABLE_CONFORMANCE=ON.
+   * Build with g++-14.  (Closes: #1097627)
+ 
+  -- Andreas Beckmann <anbe@debian.org>  Fri, 05 Sep 2025 16:31:05 +0200
  
  pocl (6.0-6) unstable; urgency=medium