[libreoffice] 01/01: Revert "ENABLE_GDRIVE=y also on armhf and arm64 as we've chromium there now, too"
Rene Engelhard
rene at moszumanska.debian.org
Tue Nov 29 17:37:09 UTC 2016
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 3e3f83fe78b548dbdf5efccb5a7da7813192256f
Author: Rene Engelhard <rene at debian.org>
Date: Tue Nov 29 10:39:30 2016 +0100
Revert "ENABLE_GDRIVE=y also on armhf and arm64 as we've chromium there now, too"
This reverts commit 0f682d1cce2166190e32685b6b67bfbccfc3bf89.
This reverts commit bf2e7a638c2bc91acb7260765da38973a76d7167.
Conflicts:
changelog
---
changelog | 4 ++--
control | 2 +-
rules | 17 ++++++-----------
3 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/changelog b/changelog
index 4f1ce26..c87d8d1 100644
--- a/changelog
+++ b/changelog
@@ -2,10 +2,10 @@ libreoffice (1:5.3.0~beta2~git20161128-1) UNRELEASED; urgency=medium
* New upstream snapshot
- * debian/rules:
- - fix typo in chromium build-deps: s/amd64/arm64/
* debian/libreoffice-sdbc-firebird.NEWS: add NEWS entry about the format
incompatibility
+ * debian/rules: revert ENABLE_GDRIVE=y on arm* as chromium got uploaded
+ without it to sid and it's gone from experimental again on those
-- Rene Engelhard <rene at debian.org> Thu, 24 Nov 2016 07:27:55 +0100
diff --git a/control b/control
index 86da66b..3488e77 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 armhf arm64],
+ chromium (>= 39.0.2171.71-1) [i386 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 c29af67..0c0e89e 100755
--- a/rules
+++ b/rules
@@ -428,18 +428,13 @@ else
LIBCMIS_MINVER=0.5.0
endif
ifeq "$(DEB_VENDOR)" "Debian"
- # chromium only available here.
+ # chromium only available on i386/amd64...
ifeq "$(DEB_HOST_ARCH)" "amd64"
ENABLE_GDRIVE=y
- 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
+ else
+ ifeq "$(DEB_HOST_ARCH)" "i386"
+ ENABLE_GDRIVE=y
+ endif
endif
endif
SYSTEM_STUFF += jpeg
@@ -1164,7 +1159,7 @@ endif
ifeq "$(ENABLE_GDRIVE)" "y"
# Google API stuff for GDrive access
- BUILD_DEPS += , chromium (>= 39.0.2171.71-1) [i386 amd64 armhf arm64]
+ BUILD_DEPS += , chromium (>= 39.0.2171.71-1) [i386 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
More information about the Pkg-openoffice-commits
mailing list