[libreoffice] 02/02: git update; add conditional for libstaroffice
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 41f3671138c8b7ce77a33ef3110fe0bfadbaf4b4
Author: Rene Engelhard <rene@debian.org>
Date: Thu Aug 11 20:58:03 2016 +0200
git update; add conditional for libstaroffice
---
changelog | 2 +-
control | 1 +
rules | 4 ++++
tests/control | 2 +-
4 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/changelog b/changelog
index 02d4eb3..858f905 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:5.3.0~alpha0~git20160805-1) UNRELEASED; urgency=medium
+libreoffice (1:5.3.0~alpha0~git20160811-1) UNRELEASED; urgency=medium
* New upstream snapshot
diff --git a/control b/control
index 1089c93..27dd4a1 100644
--- a/control
+++ b/control
@@ -115,6 +115,7 @@ Build-Depends: ant (>= 1.7.0) [!mips64],
libsane-dev,
libsm-dev,
libssl-dev (>= 0.9.8),
+ libstaroffice-dev,
libsuitesparse-dev (>= 1:3.4.0),
libvisio-dev (>= 0.1),
libvlc5,
diff --git a/rules b/rules
index ff66c9b..fd0e980 100755
--- a/rules
+++ b/rules
@@ -187,6 +187,7 @@ SYSTEM_STUFF += libebook
SYSTEM_STUFF += libabw
SYSTEM_STUFF += libpagemaker
SYSTEM_STUFF += libzmf
+SYSTEM_STUFF += libstaroffice
BUILD_CAIROCANVAS=y
SYSTEM_STUFF += cairo
CAIRO_FONTS_PATCH=y
@@ -1237,6 +1238,9 @@ ifeq "$(USE_EXTERNAL_CXXLIBS)" "y"
ifneq (,$(filter libzmf, $(SYSTEM_STUFF)))
BUILD_DEPS += , libzmf-dev
endif
+ ifneq (,$(filter libstaroffice, $(SYSTEM_STUFF)))
+ BUILD_DEPS += , libstaroffice-dev
+ endif
ifneq (,$(filter libebook, $(SYSTEM_STUFF)))
BUILD_DEPS += , libe-book-dev
endif
diff --git a/tests/control b/tests/control
index 6c259ac..a3e4436 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: