Manual merge of version 1:5.2.4-2+rpi1 and 1:5.2.5-1 to produce 1:5.2.5-1+rpi1

diff --cc debian/changelog
index da88348d33cb017b62f1c1f257cddcd6c522aa0d,fab9a6ae6c8d3a1ac0d010d297fcd41fe681305b..99c32823ef82d2dff755ab2639272526f8bbe721
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,11 +1,19 @@@
- libreoffice (1:5.2.4-2+rpi1) stretch-staging; urgency=medium
++libreoffice (1:5.2.5-1+rpi1) stretch-staging; urgency=medium
 +
++  [changes brought forward from 1:5.2.4-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 07 Jan 2017 01:42:16 +0000]
 +  * Disable chromium stuff as we don't currently have chromium in the Raspbian
 +    repository.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Sat, 07 Jan 2017 01:42:16 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 25 Feb 2017 06:28:44 +0000
++
+ libreoffice (1:5.2.5-1) unstable; urgency=medium
+ 
+   * New upstream release
+ 
+   * move ENABLE_GDRIVE settings after the jessie-backports check as otherwise
+     JESSIE_BACKPORT=y isn't honoured and the build expects chromiums apikeys.. 
+ 
+  -- Rene Engelhard <rene@debian.org>  Thu, 12 Jan 2017 07:57:25 +0100
  
  libreoffice (1:5.2.4-2) unstable; urgency=medium