Merge tag '1%5.2.5-2' into stretch-working

diff --cc debian/changelog
index 99c32823ef82d2dff755ab2639272526f8bbe721,6d8fffe0b949c2f195b6523540206866c960ae24..018dd4762173dacac16707d7332b646247671035
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,21 +1,29 @@@
- libreoffice (1:5.2.5-1+rpi1) stretch-staging; urgency=medium
++libreoffice (1:5.2.5-2+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.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sat, 25 Feb 2017 06:28:44 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 02 Mar 2017 12:17:18 +0000
++
+ libreoffice (1:5.2.5-2) unstable; urgency=medium
+ 
+   * debian/libreoffice.maintscript: revert dir_to_symlink, add new
+     symlink_to_dir for stretch/sid upgrades
+   * debian/rules: ignore "libreoffice" for --link-doc
+   * debian/rules, debian/libreoffice-dev-doc.links, debian/lo*.in:
+     install SDK documentation into /usr/share/doc/libreoffice/sdk (and adapt
+     dev-docs symlinks/doc-base stuff). Remove extra license file (thanks
+     lintian) which otherwise would still install over the symlink.
+   * debian/control.sdk.in: update -devs libreoffice-dev-doc Conflicts to
+     (<< 1:5.2.5-2~) and add Conflicts: libreoffice (<< 1:5.2.5-2~) to both
+     -dev*- for safety
+   (closes: #854576)
+ 
+   * debian/rules: fix dh_installdocs calls to install copyright for
+     "libreoffice"
+ 
+  -- Rene Engelhard <rene@debian.org>  Mon, 13 Feb 2017 19:26:09 +0100
  
  libreoffice (1:5.2.5-1) unstable; urgency=medium
  

diff --cc debian/control
Simple merge