Merge version 17.2.4-1+rpi1 and 17.2.5-1 to produce 17.2.5-1+rpi1

diff --cc debian/changelog
index 97846f3b61041cfbe740e3d5d8b6e49861dea62e,a7cf535370af283667fae11c6a78b755f5ced68a..ca4d00133361530c9d6a2b54ac6e10bbf8359bd8
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,16 +1,25 @@@
- mesa (17.2.4-1+rpi1) buster-staging; urgency=medium
++mesa (17.2.5-1+rpi1) buster-staging; urgency=medium
 +
 +  [changes brought forward from 17.2.2-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Tue, 17 Oct 2017 23:01:04 +0000]
 +  * Add more debug output to configure.ac
 +  * Hardcode llvm soname, the code for auto-determining it seems to be misbehaving.
 +  * Add build conflicts on libunwind-dev, having it installed currently breaks the build.
 + 
-  -- Raspbian forward porter <root@raspbian.org>  Sun, 05 Nov 2017 15:06:02 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 22 Nov 2017 13:24:32 +0000
++
+ mesa (17.2.5-1) unstable; urgency=medium
+ 
+   [ Emilio Pozuelo Monfort ]
+   * Make mesa-va-drivers enhance libva2 rather than libva1 (Closes: #881374).
+ 
+   [ Timo Aaltonen ]
+   * libglx-mesa0.links.in: Add libGLX_indirect.so.0 to link against
+     libGLX_mesa so that GLX with a remote xserver works. (Closes: #881789)
+ 
+   [ Andreas Boll ]
+   * New upstream release.
+ 
+  -- Andreas Boll <andreas.boll.dev@gmail.com>  Fri, 17 Nov 2017 10:46:35 +0100
  
  mesa (17.2.4-1) unstable; urgency=medium
  

diff --cc debian/control
Simple merge