[libreoffice] 01/01: ENABLE_GDRIVE=y again on armhf and arm64

[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 190bde7ed7e0e0ea6a6c6d945fbf14378d0d7fbb
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Dec 19 07:42:18 2016 +0100

    ENABLE_GDRIVE=y again on armhf and arm64
    
    This reverts commit 3e3f83fe78b548dbdf5efccb5a7da7813192256f.
---
 changelog |  1 +
 control   |  2 +-
 rules     | 14 ++++++++++----
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/changelog b/changelog
index 851e998..760b805 100644
--- a/changelog
+++ b/changelog
@@ -14,6 +14,7 @@ libreoffice (1:5.3.0~rc1~git20161218-1) UNRELEASED; urgency=medium
     - change glew conditionals/build-deps to epoxy
     - temporarily use internal libgltf until libgltf 0.1.0 (using epoxy)
       is out of NEW...
+    - ENABLE_GDRIVE=y again on armhf and arm64
 
  -- Rene Engelhard <rene at debian.org>  Sun, 11 Dec 2016 13:35:52 +0100
 
diff --git a/control b/control
index 22d6203..63128e0 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 arm64],
                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 aff6096..edf84c6 100755
--- a/rules
+++ b/rules
@@ -424,14 +424,20 @@ 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
+  endif
   ifeq "$(DEB_HOST_ARCH)" "i386"
-      ENABLE_GDRIVE=y
+    ENABLE_GDRIVE=y
   endif
-  ifeq "$(DEB_HOST_ARCH)" "amd64"
+  ifeq "$(DEB_HOST_ARCH)" "arm64"
+    ENABLE_GDRIVE=y
+  endif
+  ifeq "$(DEB_HOST_ARCH)" "armhf"
     ENABLE_GDRIVE=y
   endif
-  OOO_GDRIVE_ARCHS += i386 amd64
+  OOO_GDRIVE_ARCHS += i386 amd64 armhf arm64
 endif
 SYSTEM_STUFF += jpeg
 SYSTEM_STUFF += libxml

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