[libreoffice] 01/02: remove artificial disabling of glTF for armel and mips(el)
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit 7df94f80a2bb8f0b845d6638eabbbc0de0418819
Author: Rene Engelhard <rene@debian.org>
Date: Sat Apr 2 13:07:20 2016 +0200
remove artificial disabling of glTF for armel and mips(el)
---
changelog | 5 ++++-
control | 6 ++----
rules | 8 +-------
3 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/changelog b/changelog
index e371c4e..63b8fda 100644
--- a/changelog
+++ b/changelog
@@ -26,8 +26,11 @@ libreoffice (1:5.1.2~rc2-1) UNRELEASED; urgency=medium
there
- speed up check target: run $(MAKE) check in parallel and only if failing
the second run without parallelism
+ - remove artificial disabling of glTF for armel and mips(el). Probably
+ still don't make sense but enable it for consistency (and because we
+ enable other stuff there which don't make sense that much either)
- -- Rene Engelhard <rene@debian.org> Tue, 29 Mar 2016 19:32:03 +0200
+ -- Rene Engelhard <rene@debian.org> Sat, 02 Apr 2016 12:48:35 +0200
libreoffice (1:5.1.2~rc1-1) unstable; urgency=medium
diff --git a/control b/control
index 75ab7e7..7b67e01 100644
--- a/control
+++ b/control
@@ -73,7 +73,7 @@ Build-Depends: ant (>= 1.7.0) [!mips64],
libglew-dev,
libglib2.0-dev (>= 2.15.0),
libglm-dev (>= 0.9.6.3),
- libgltf-dev (>= 0.0.2-4) [!armel !mips !mipsel],
+ libgltf-dev (>= 0.0.2-4),
libgraphite2-dev (>= 0.9.3),
libgstreamer-plugins-base1.0-dev,
libgstreamer1.0-dev,
@@ -4432,9 +4432,7 @@ Description: office productivity suite -- GTK+ 3.0 integration
Package: gir1.2-lokdocview-0.1
Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 m68k mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390 s390x sparc
Section: introspection
-Depends: libreoffice-gtk3 (= ${binary:Version}),
- ${gir:Depends},
- ${misc:Depends}
+Depends: libreoffice-gtk3 (= ${binary:Version}), ${gir:Depends}, ${misc:Depends}
Description: GTK3 widget wrapping LibreOffice functionality - introspection
LOKDocView is the GTK3 widget that wraps the libreoffice functionality and
exposes a simple API for applications to use this widget.
diff --git a/rules b/rules
index b379c7c..fa2a91f 100755
--- a/rules
+++ b/rules
@@ -559,12 +559,6 @@ endef
PLATFORMID := $(shell grep PLATFORMID debian/vars.$(DEB_HOST_ARCH) | cut -d"=" -f2)
ifeq "$(ENABLE_GLTF)" "y"
- # doesn't make that much sense on armel and mips(el), does it? :)
- OOO_GLTF_ARCHS = $(filter-out armel mips mipsel, $(OOO_ARCHS))
- ifeq (,$(filter $(DEB_HOST_ARCH),$(OOO_GLTF_ARCHS)))
- ENABLE_GLTF=n
- endif
- $(eval $(call gen_no_archs,OOO_GLTF_ARCHS))
OOO_COLLADA_ARCHS=amd64 i386
$(eval $(call gen_no_archs,OOO_COLLADA_ARCHS))
endif
@@ -770,7 +764,7 @@ ifneq "$(ENABLE_GLTF)" "y"
CONFIGURE_FLAGS += --disable-gltf
else
ifneq (,$(findstring libgltf,$(SYSTEM_STUFF)))
- BUILD_DEPS += , libgltf-dev (>= $(LIBGLTF_MINVER))$(OOO_NO_GLTF_ARCHS)
+ BUILD_DEPS += , libgltf-dev (>= $(LIBGLTF_MINVER))
endif
ifneq "$(ENABLE_COLLADA)" "y"
CONFIGURE_FLAGS += --disable-collada
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: