[libreoffice] 01/01: move ENABLE_GDRIVE settings after the jessie-backports check

[Rene Engelhard]

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

rene pushed a commit to branch master
in repository libreoffice.

commit eb75d5894ede315f4a665a580b314507c1d6cc0a
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Jan 16 22:03:06 2017 +0100

    move ENABLE_GDRIVE settings after the jessie-backports check
---
 changelog |  7 +++++++
 rules     | 39 ++++++++++++++++++++-------------------
 2 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/changelog b/changelog
index 0537919..639edf2 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,10 @@
+libreoffice (1:5.2.4-3) UNRELEASED; urgency=medium
+
+  * move ENABLE_GDRIVE settings after the jessie-backports check as otherwise
+    JESSIE_BACKPORT=y isn't honoured ans the build expects chromiums apikeys.. 
+
+ -- Rene Engelhard <rene at debian.org>  Wed, 04 Jan 2017 09:53:45 +0000
+
 libreoffice (1:5.2.4-2) unstable; urgency=medium
 
   * debian/tests/junit-subsequentcheck:
diff --git a/rules b/rules
index 581fb85..a6d0e75 100755
--- a/rules
+++ b/rules
@@ -440,25 +440,6 @@ LIBCMIS_MINVER=0.5.0-3
 else
 LIBCMIS_MINVER=0.5.0
 endif
-ifeq "$(DEB_VENDOR)" "Debian"
-  # chromium only available here.
-  ifeq "$(DEB_HOST_ARCH)" "amd64"
-    ENABLE_GDRIVE=y
-  endif
-  ifeq "$(DEB_HOST_ARCH)" "i386"
-    ENABLE_GDRIVE=y
-  endif
-  OOO_GDRIVE_ARCHS += i386 amd64
-  ifneq "$(JESSIE_BACKPORT)" "y"
-    ifeq "$(DEB_HOST_ARCH)" "arm64"
-      ENABLE_GDRIVE=y
-    endif
-    ifeq "$(DEB_HOST_ARCH)" "armhf"
-      ENABLE_GDRIVE=y
-    endif
-      OOO_GDRIVE_ARCHS += armhf arm64
-  endif
-endif
 SYSTEM_STUFF += jpeg
 SYSTEM_STUFF += libxml
 SYSTEM_STUFF += expat
@@ -731,6 +712,26 @@ ifeq "$(shell dpkg-parsechangelog | grep Distribution | awk '{ print $$2 }')" "U
   BUGS=mailto:debian-openoffice at lists.debian.org
 endif
 
+ifeq "$(DEB_VENDOR)" "Debian"
+  # chromium only available here.
+  ifeq "$(DEB_HOST_ARCH)" "amd64"
+    ENABLE_GDRIVE=y
+  endif
+  ifeq "$(DEB_HOST_ARCH)" "i386"
+    ENABLE_GDRIVE=y
+  endif
+  OOO_GDRIVE_ARCHS += i386 amd64
+  ifneq "$(JESSIE_BACKPORT)" "y"
+    ifeq "$(DEB_HOST_ARCH)" "arm64"
+      ENABLE_GDRIVE=y
+    endif
+    ifeq "$(DEB_HOST_ARCH)" "armhf"
+      ENABLE_GDRIVE=y
+    endif
+      OOO_GDRIVE_ARCHS += armhf arm64
+  endif
+endif
+
 ifeq "$(BUILD_DBGSYM_PACKAGES)" "y"
 UNO_LIBS_DBG=uno-libs3-dbgsym
 URE_DBG=ure-dbgsym

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