[libreoffice] 02/03: move where it belongs now

[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 2dbbfabb9c7ba6e404b4548d95449d7b2c29d97b
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Sun Aug 6 21:52:27 2017 +0000

    move  where it belongs now
---
 control | 2 +-
 rules   | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/control b/control
index 9e3e555..2fe6b81 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) [amd64 arm64 armhf i386],
                coinor-libcoinmp-dev (>= 1.7.6+dfsg1-2),
                coinor-libcoinutils-dev (>= 2.9.15-3.1),
                debhelper (>= 10),
diff --git a/rules b/rules
index e1a5219..e8738ce 100755
--- a/rules
+++ b/rules
@@ -377,6 +377,7 @@ ifeq "$(ENABLE_GLTF)" "y"
   # enable COLLADA (if any) only on i386/amd64 for now, rapidjson does seem
   # to have alignment problems on other archs (e.g. arm*)
   OOO_COLLADA_ARCHS=amd64 i386
+  $(eval $(call gen_no_archs,OOO_COLLADA_ARCHS))
   ifneq (,$(findstring $(DEB_HOST_ARCH),$(OOO_COLLADA_ARCHS)))
     ENABLE_COLLADA=y
   endif
@@ -592,9 +593,6 @@ endef
 
 PLATFORMID := $(shell grep PLATFORMID debian/vars.$(DEB_HOST_ARCH) | cut -d"=" -f2)
 
-ifeq "$(ENABLE_GLTF)" "y"
-  $(eval $(call gen_no_archs,OOO_COLLADA_ARCHS))
-endif
 
 # let's do this only on archs where we have chromium, which is supposedly even only the archs
 # where alsp pdfium is supported.

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