[libreoffice] 01/01: fix merge

[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 9dadaf4f8b51ebea0a2f0d004f9ac9278ff64948
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Feb 13 20:06:27 2017 +0100

    fix merge
---
 rules | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/rules b/rules
index cfdd30d..bf69904 100755
--- a/rules
+++ b/rules
@@ -424,22 +424,6 @@ LIBCMIS_MINVER=0.5.0-3
 else
 LIBCMIS_MINVER=0.5.0
 endif
-ifeq "$(DEB_VENDOR)" "Debian"
-  # chromium only available here.
-  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
-  endif
-  OOO_GDRIVE_ARCHS += i386 amd64 armhf arm64
-endif
 SYSTEM_STUFF += jpeg
 SYSTEM_STUFF += libxml
 SYSTEM_STUFF += expat

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