From: Peter Michael Green <plugwash@raspbian.org>
Date: Sat, 25 Feb 2017 14:11:26 +0000 (+0000)
Subject: Manual merge of version 1:5.2.4-2+rpi1 and 1:5.2.5-1 to produce 1:5.2.5-1+rpi1
X-Git-Tag: archive/raspbian/1%5.2.5-2+rpi1~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=17e0505f0d87597d846f108f2ff62053e3ecf05e;p=libreoffice.git

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

17e0505f0d87597d846f108f2ff62053e3ecf05e
diff --cc debian/changelog
index da88348d33c,fab9a6ae6c8..99c32823ef8
--- a/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