[libreoffice] 02/04: add conditional for libzmf
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.3
in repository libreoffice.
commit 6c5af74811ee42f80eece13bc9cf89b8b49a486a
Author: Rene Engelhard <rene@debian.org>
Date: Thu Jul 14 18:45:33 2016 +0200
add conditional for libzmf
---
control | 1 +
rules | 4 ++++
tests/control | 2 +-
3 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/control b/control
index f35d66b..6eb96fa 100644
--- a/control
+++ b/control
@@ -132,6 +132,7 @@ Build-Depends: ant (>= 1.7.0) [!mips64],
libxslt1-dev,
libxt-dev,
libxtst-dev,
+ libzmf-dev,
lp-solve (>= 5.5.0.13-5+b1),
make (>= 3.81-8.2),
maven-repo-helper,
diff --git a/rules b/rules
index aca5acd..cc45414 100755
--- a/rules
+++ b/rules
@@ -186,6 +186,7 @@ SYSTEM_STUFF += libfreehand
SYSTEM_STUFF += libebook
SYSTEM_STUFF += libabw
SYSTEM_STUFF += libpagemaker
+SYSTEM_STUFF += libzmf
BUILD_CAIROCANVAS=y
SYSTEM_STUFF += cairo
CAIRO_FONTS_PATCH=y
@@ -1218,6 +1219,9 @@ ifeq "$(USE_EXTERNAL_CXXLIBS)" "y"
ifneq (,$(filter libpagemaker, $(SYSTEM_STUFF)))
BUILD_DEPS += , libpagemaker-dev
endif
+ ifneq (,$(filter libzmf, $(SYSTEM_STUFF)))
+ BUILD_DEPS += , libzmf-dev
+ endif
ifneq (,$(filter libebook, $(SYSTEM_STUFF)))
BUILD_DEPS += , libe-book-dev
endif
diff --git a/tests/control b/tests/control
index 4b22362..9269d44 100644
--- a/tests/control
+++ b/tests/control
@@ -1,5 +1,5 @@
Tests: junit-subsequentcheck
-Depends: libreoffice, libreoffice-subsequentcheckbase, libreoffice-sdbc-hsqldb, autoconf, automake, bc, bison, bzip2, fastjar, flex (>= 2.3.35), gperf, libcups2-dev, libfontconfig1-dev, libfreetype6-dev (>= 2.2.0), libice-dev, libsm-dev, libx11-dev, libxaw7-dev, libxext-dev, libxinerama-dev, libxkbfile-dev, libxrender-dev, libxt-dev, libxtst-dev, pkg-config, unzip, x11proto-render-dev, xsltproc, zip, zlib1g-dev , libgltf-dev (>= 0.0.2-4) , opencollada-dev (>= 0.1.0~20140703.ddf8f47+dfsg1 [...]
+Depends: libreoffice, libreoffice-subsequentcheckbase, libreoffice-sdbc-hsqldb, autoconf, automake, bc, bison, bzip2, fastjar, flex (>= 2.3.35), gperf, libcups2-dev, libfontconfig1-dev, libfreetype6-dev (>= 2.2.0), libice-dev, libsm-dev, libx11-dev, libxaw7-dev, libxext-dev, libxinerama-dev, libxkbfile-dev, libxrender-dev, libxt-dev, libxtst-dev, pkg-config, unzip, x11proto-render-dev, xsltproc, zip, zlib1g-dev , libgltf-dev (>= 0.0.2-4) , opencollada-dev (>= 0.1.0~20140703.ddf8f47+dfsg1 [...]
Tests: pyuno-import
Depends: python3-uno
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: