[libreoffice] 02/02: Merge remote-tracking branch 'origin/master' into debian-experimental-5.2

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch debian-experimental-5.2
in repository libreoffice.

commit fcca4ecd81e5a9c784c4c503d7644168c591ad02
Merge: 4a1ff64 94c6ed9
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Jan 16 22:06:32 2017 +0100

    Merge remote-tracking branch 'origin/master' into debian-experimental-5.2

 changelog |  3 +++
 rules     | 39 ++++++++++++++++++++-------------------
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --cc changelog
index 5e17004,a039324..e586a07
--- a/changelog
+++ b/changelog
@@@ -1,8 -1,9 +1,11 @@@
 -libreoffice (1:5.2.4-3) UNRELEASED; urgency=medium
 +libreoffice (1:5.2.5~rc1-1) unstable; urgency=medium
 +
 +  * New upstream release candidate
  
+   * 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 at debian.org>  Wed, 04 Jan 2017 09:53:45 +0000
 + -- Rene Engelhard <rene at debian.org>  Thu, 12 Jan 2017 07:57:25 +0100
  
  libreoffice (1:5.2.4-2) unstable; urgency=medium
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git