[libreoffice] 01/01: ENABLE_GDRIVE=n for jessie-backports on armhf/arm64 as we don't have chromium there yet...
Rene Engelhard
rene at moszumanska.debian.org
Fri Dec 23 18:13:11 UTC 2016
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit 524c18a9d99e8fa9d97fe8997f83611d31d49e63
Author: Rene Engelhard <rene at debian.org>
Date: Fri Dec 23 19:12:51 2016 +0100
ENABLE_GDRIVE=n for jessie-backports on armhf/arm64 as we don't have chromium there yet...
---
changelog | 7 +++++++
rules | 15 +++++++++------
2 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/changelog b/changelog
index 21f8d80..ce84a95 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,10 @@
+libreoffice (1:5.2.4-2) UNRELEASED; urgency=medium
+
+ * ENABLE_GDRIVE=n for jessie-backports on armhf/arm64 as we don't have
+ chromium there yet...
+
+ -- Rene Engelhard <rene at debian.org> Fri, 23 Dec 2016 19:05:43 +0100
+
libreoffice (1:5.2.4-1) unstable; urgency=medium
* New upstream release
diff --git a/rules b/rules
index dec6be4..581fb85 100755
--- a/rules
+++ b/rules
@@ -448,13 +448,16 @@ ifeq "$(DEB_VENDOR)" "Debian"
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
+ 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
- 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
More information about the Pkg-openoffice-commits
mailing list