[libreoffice] 01/03: Merge remote-tracking branch 'origin/master' into debian-experimental-5.3

[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 58b2c957d333dfba3e4e79a93a4381f18653e58e
Merge: 6c5f85f 00cf755
Author: Rene Engelhard <rene at debian.org>
Date:   Fri Dec 23 20:15:52 2016 +0100

    Merge remote-tracking branch 'origin/master' into debian-experimental-5.3

 rules                       | 1 +
 tests/junit-subsequentcheck | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --cc rules
index d51bd40,581fb85..5734841
--- a/rules
+++ b/rules
@@@ -431,13 -448,16 +431,14 @@@ ifeq "$(DEB_VENDOR)" "Debian
    ifeq "$(DEB_HOST_ARCH)" "i386"
      ENABLE_GDRIVE=y
    endif
 -  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
 +  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
  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