[libreoffice] 09/152: disable collada, gltf and coinmp on xenial

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to tag libreoffice_3.5.0_rc3-0ubuntu2
in repository libreoffice.

commit 3d9c888b38a35b39f282e6aedfd4ad6d447faf0b
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Tue Oct 27 01:01:10 2015 +0100

    disable collada, gltf and coinmp on xenial
---
 changelog | 6 ++++++
 rules     | 8 +++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/changelog b/changelog
index 0ba8645..c572134 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+libreoffice (1:5.0.2-0ubuntu4) xenial; urgency=medium
+
+  * disable collada, gltf and coinmp on xenial
+
+ -- Bjoern Michaelsen <bjoern.michaelsen at canonical.com>  Tue, 27 Oct 2015 00:59:27 +0100
+
 libreoffice (1:5.0.2-0ubuntu3) wily; urgency=medium
 
   * fall back to SYSTEM_GCC_VERSION, when SYSTEM_GCJ_VERSION is empty
diff --git a/rules b/rules
index e822f34..e7a01fb 100755
--- a/rules
+++ b/rules
@@ -722,11 +722,9 @@ ifeq "$(DEB_VENDOR)" "Ubuntu"
   ENABLE_EVO2:=n
   #SYSTEM_STUFF := $(filter-out orcus, $(SYSTEM_STUFF))
 
-  # libgltf-dev (0.0.2-2)   is in vivid/universe, needs MIR, was shipped with LibreOffice 4.4 in vivid
-  # libcoinor-libcoinmp-dev is in vivid/universe, needs MIR, was shipped with LibreOffice 4.4 in vivid
-  SYSTEM_STUFF := $(filter-out libgltf coinmp, $(SYSTEM_STUFF))
-
-  SYSTEM_STUFF := $(filter-out opencollada collada2gltf, $(SYSTEM_STUFF))
+  ENABLE_COLLADA := n
+  ENABLE_GLTF := n
+  ENABLE_COINMP := n
 
   ifneq (,$(filter armel armhf,$(DEB_HOST_ARCH)))
     ENABLE_HELP=n

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