Merge version 0~20150328-17+rpi1 and 0~20150328-18 to produce 0~20150328-18+rpi1

diff --cc debian/changelog
index d1557c8314fdb5141d6fde271b703e0109e0321f,f35c9ee6808fa0bcf8126639e6d16bc31c5d873d..095c7571ee32a2a268c1896300bd491fc4238037
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,16 @@@
- primus (0~20150328-17+rpi1) trixie-staging; urgency=medium
++primus (0~20150328-18+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 0~20150328-11+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 20 Jun 2020 02:48:48 +0000]
 +  * Disable primus-nvidia package.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Tue, 19 Nov 2024 15:47:19 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 21 Mar 2025 23:30:47 +0000
++
+ primus (0~20150328-18) unstable; urgency=medium
+ 
+   * In MESA 25, libglapi.so.0 is gone.  (Closes: #1099264)
+   * Bump Standards-Version to 4.7.2, no changes needed.
+ 
+  -- Andreas Beckmann <anbe@debian.org>  Tue, 11 Mar 2025 02:55:55 +0100
  
  primus (0~20150328-17) unstable; urgency=medium
  

diff --cc debian/control
Simple merge