[libreoffice] 01/02: ENABLE_GDRIVE=y also on armhf and arm64 as we've chromium there now, too

[Rene Engelhard]

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

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

commit bf2e7a638c2bc91acb7260765da38973a76d7167
Author: Rene Engelhard <rene at debian.org>
Date:   Thu Nov 10 19:49:36 2016 +0100

    ENABLE_GDRIVE=y also on armhf and arm64 as we've chromium there now, too
---
 changelog |  1 +
 control   |  2 +-
 rules     | 17 +++++++++++------
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/changelog b/changelog
index ab0b88d..7b1f2af 100644
--- a/changelog
+++ b/changelog
@@ -15,6 +15,7 @@ libreoffice (1:5.3.0~beta1~git20161101-1) UNRELEASED; urgency=medium
   * debian/rules:
     - don't install ChangeLog (now done automatically by dh compat >= 7) as
       it doubles -common/-core size and increases font-opensymbol *by 10* 
+    - ENABLE_GDRIVE=y also on armhf and arm64 as we've chromium there now, too
 
  -- Rene Engelhard <rene at debian.org>  Mon, 24 Oct 2016 23:06:23 +0200
 
diff --git a/control b/control
index 8e4404d..39cc77b 100644
--- a/control
+++ b/control
@@ -11,7 +11,7 @@ Build-Depends: ant (>= 1.7.0) [!hppa !ia64 !mips64 !s390 !sparc],
                binutils (>= 2.23) [mips mipsel],
                bison,
                bzip2,
-               chromium (>= 39.0.2171.71-1) [i386 amd64],
+               chromium (>= 39.0.2171.71-1) [i386 amd64 armhf amd64],
                coinor-libcoinmp-dev (>= 1.7.6+dfsg1-2),
                coinor-libcoinutils-dev (>= 2.9.15-3.1),
                debhelper (>= 9.20160114),
diff --git a/rules b/rules
index e4dd02b..d5762f4 100755
--- a/rules
+++ b/rules
@@ -428,13 +428,18 @@ else
 LIBCMIS_MINVER=0.5.0
 endif
 ifeq "$(DEB_VENDOR)" "Debian"
-  # chromium only available on i386/amd64...
+  # chromium only available here.
   ifeq "$(DEB_HOST_ARCH)" "amd64"
     ENABLE_GDRIVE=y
-  else
-    ifeq "$(DEB_HOST_ARCH)" "i386"
-      ENABLE_GDRIVE=y
-    endif
+  endif
+  ifeq "$(DEB_HOST_ARCH)" "i386"
+    ENABLE_GDRIVE=y
+  endif
+  ifeq "$(DEB_HOST_ARCH)" "arm64"
+    ENABLE_GDRIVE=y
+  endif
+  ifeq "$(DEB_HOST_ARCH)" "armhf"
+    ENABLE_GDRIVE=y
   endif
 endif
 SYSTEM_STUFF += jpeg
@@ -1159,7 +1164,7 @@ endif
 
 ifeq "$(ENABLE_GDRIVE)" "y"
   # Google API stuff for GDrive access
-  BUILD_DEPS += , chromium (>= 39.0.2171.71-1) [i386 amd64]
+  BUILD_DEPS += , chromium (>= 39.0.2171.71-1) [i386 amd64 armhf amd64]
   include /etc/chromium.d/apikeys
   CONFIGURE_FLAGS += --with-gdrive-client-id=$(GOOGLE_DEFAULT_CLIENT_ID) --with-gdrive-client-secret=$(GOOGLE_DEFAULT_CLIENT_SECRET)
 endif

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