[libreoffice] 01/01: oops, we need ENABLE_COLLADA=n as default..
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit 6986bb49c7a107996a2cc9908eb4b7699abf822f
Author: Rene Engelhard <rene@debian.org>
Date: Fri Jul 31 01:06:59 2015 +0200
oops, we need ENABLE_COLLADA=n as default..
---
changelog | 9 +++++++++
rules | 2 +-
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/changelog b/changelog
index 85ba475..8442425 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,12 @@
+libreoffice (1:4.4.5-2) unstable; urgency=medium
+
+ * Brown paper bag release.
+ * debian/rules:
+ - ENABLE_COLLADA=n as default (so on !i386/amd64), obviously as we
+ build-dep only on them on i386/amd64...
+
+ -- Rene Engelhard <rene@debian.org> Fri, 31 Jul 2015 01:00:57 +0200
+
libreoffice (1:4.4.5-1) unstable; urgency=medium
* New upstream release
diff --git a/rules b/rules
index 785ea6c..ff630a8 100755
--- a/rules
+++ b/rules
@@ -321,7 +321,7 @@ SYSTEM_STUFF += libgltf
# I think we should only enable it when we have BOTH system-opencollasa
# and system-collada2gltf working
ifeq "$(ENABLE_GLTF)" "y"
- ENABLE_COLLADA=y
+ ENABLE_COLLADA=n
# enable COLLADA (if any) only on i386/amd64 for now, rapidjson does seem
# to have alignment problems on other archs (e.g. arm*)
ifeq "$(DEB_HOST_ARCH)" "amd64"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: