[libreoffice] 03/03: 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 master
in repository libreoffice.

commit a3f4a4f0f8e6693924e812f3a643d01417cdd744
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Dec 19 07:42:18 2016 +0100

    ENABLE_GDRIVE=y also on armhf and arm64 as we've chromium there now, too
---
 changelog |  9 +++++++++
 control   |  2 +-
 rules     | 14 ++++++++++----
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/changelog b/changelog
index 3514f65..4780a1f 100644
--- a/changelog
+++ b/changelog
@@ -9,11 +9,20 @@ libreoffice (1:5.2.4~rc2-1) UNRELEASED; urgency=medium
 
   * debian/rules:
     - MYSQL_FLAVOUR=mysql on jessie-backports
+    - ENABLE_GDRIVE=y also on armhf and arm64 as we've chromium there now, too
   * debian/control.ogltrans.in:
     - add Conflicts: libreoffice-gtk3 (<< 1:5.2.4~rc2)
 
  -- Rene Engelhard <rene at debian.org>  Sun, 11 Dec 2016 13:31:35 +0100
 
+libreoffice (1:5.3.0~beta2-1) experimental; urgency=medium
+
+  * New upstream beta release
+
+  * debian/patches/m68k-alignment.diff: add patch from John Paul Adrian
+    Glaubitz to fix m68k alignment
+>>>>>>> 190bde7e... ENABLE_GDRIVE=y again on armhf and arm64
+
 libreoffice (1:5.2.4~rc1-1) unstable; urgency=low
 
   * New upstream release candidate
diff --git a/control b/control
index 829bfb1..3a70dc8 100644
--- a/control
+++ b/control
@@ -11,7 +11,7 @@ Build-Depends: ant (>= 1.7.0) [!mips64],
                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 a93e9b4..13362c2 100755
--- a/rules
+++ b/rules
@@ -441,14 +441,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