[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[libreoffice] 03/03: mention dae/kmz models if ENABLE_COLLADA=y



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

rene pushed a commit to branch debian-experimental-4.3
in repository libreoffice.

commit 683607b089754585c686757b52342265c4f03df7
Author: Rene Engelhard <rene@debian.org>
Date:   Sat Aug 9 20:19:54 2014 +0200

    mention dae/kmz models if ENABLE_COLLADA=y
---
 changelog | 1 +
 rules     | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/changelog b/changelog
index 29d63ca..719c565 100644
--- a/changelog
+++ b/changelog
@@ -10,6 +10,7 @@ libreoffice (1:4.3.1~rc1-1) experimental; urgency=low
   * debian/rules:
     - add conditional for system-libgltf, don't enable yet and add
       ENABLE/DISABLE_COLLADA
+    - mention dae/kmz models if ENABLE_COLLADA=y
 
  -- Rene Engelhard <rene@debian.org>  Wed, 06 Aug 2014 19:29:17 +0200
 
diff --git a/rules b/rules
index dcafa91..cfbe2ec 100755
--- a/rules
+++ b/rules
@@ -1835,6 +1835,9 @@ ifeq "$(PACKAGE_LIBRELOGO)" "y"
 endif
 ifeq "$(ENABLE_GLTF)" "y"
 	cat debian/control.gltf.in >> debian/control
+ifeq "$(ENABLE_COLLADA)" "y"
+	perl -pi -e 's/3D models/and dae\/kmz 3D models/' debian/control
+endif
 endif
 
 	perl -pi -e "s,%OOO_ARCHS%,$(OOO_ARCHS),g" debian/control

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


Reply to: