[libreoffice] 08/19: use internal collada for now

[Bjoern Michaelsen <sweetshark-guest@moszumanska.debian.org>]

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

sweetshark-guest pushed a commit to branch ubuntu-wily-5.0
in repository libreoffice.

commit 2eae68977b621f3033a484291572b1fe31ac12d2
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date:   Fri Aug 7 12:51:43 2015 +0200

    use internal collada for now
---
 rules | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rules b/rules
index cb3ddb6..de16d4f 100755
--- a/rules
+++ b/rules
@@ -719,6 +719,7 @@ ifeq "$(DEB_VENDOR)" "Ubuntu"
   # libwps 0.4-4 is not yet in wily/main, no MIR needed, needs sync from debian experimental
   SYSTEM_STUFF := $(filter-out libwps, $(SYSTEM_STUFF))
 
+  SYSTEM_STUFF := $(filter-out opencollada collada2gltf, $(SYSTEM_STUFF))
   ifneq (,$(filter armel armhf,$(DEB_HOST_ARCH)))
     ENABLE_HELP=n
   endif

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