[libreoffice] 02/02: boost-filesystem is checked also for system-orcus
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.2
in repository libreoffice.
commit 6f356c5956d7d72964f90370e986a0b019303a8f
Author: Rene Engelhard <rene@debian.org>
Date: Thu Mar 17 16:14:16 2016 +0100
boost-filesystem is checked also for system-orcus
---
control | 1 +
rules | 4 ++--
tests/control | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/control b/control
index a234114..cbfa3a7 100644
--- a/control
+++ b/control
@@ -45,6 +45,7 @@ Build-Depends: ant (>= 1.7.0) [!mips64],
libbluetooth-dev [!kfreebsd-amd64 !kfreebsd-i386],
libboost-date-time-dev (>= 1.58),
libboost-dev (>= 1.58),
+ libboost-filesystem-dev (>= 1.58),
libboost-iostreams-dev (>= 1.58),
libboost-system-dev (>= 1.58),
libc0.1 (>= 2.10.2-7) [kfreebsd-i386 kfreebsd-amd64],
diff --git a/rules b/rules
index ee10e7d..d178290 100755
--- a/rules
+++ b/rules
@@ -1131,7 +1131,7 @@ endif
ifneq (,$(filter boost, $(SYSTEM_STUFF)))
ifneq "$(BOOST_VERSION)" "default"
- BUILD_DEPS += , libboost$(BOOST_VERSION)-dev $(BOOST_MINVER), libboost-date-time$(BOOST_VERSION)-dev $(BOOST_MINVER), libboost-iostreams$(BOOST_VERSION)-dev
+ BUILD_DEPS += , libboost$(BOOST_VERSION)-dev $(BOOST_MINVER), libboost-date-time$(BOOST_VERSION)-dev $(BOOST_MINVER), libboost-iostreams$(BOOST_VERSION)-dev, libboost$(BOOST_VERSION)-filesystem-dev
#BUILD_DEPS += , libboost-thread$(BOOST_VERSION)-dev, libboost-program-options$(BOOST_VERSION)-dev
ifeq "$(ENABLE_ORCUS)" "y"
ifeq (,$(filter orcus, $(SYSTEM_STUFF)))
@@ -1142,7 +1142,7 @@ ifneq (,$(filter boost, $(SYSTEM_STUFF)))
BUILD_DEPS += , libboost-system$(BOOST_VERSION)-dev $(BOOST_MINVER)
endif
else
- BUILD_DEPS += , libboost-dev $(BOOST_MINVER), libboost-date-time-dev $(BOOST_MINVER), libboost-iostreams-dev $(BOOST_MINVER)
+ BUILD_DEPS += , libboost-dev $(BOOST_MINVER), libboost-date-time-dev $(BOOST_MINVER), libboost-iostreams-dev $(BOOST_MINVER), libboost-filesystem-dev $(BOOST_MINVER)
#BUILD_DEPS += , libboost-thread-dev, libboost-program-options-dev
ifeq (,$(filter orcus, $(SYSTEM_STUFF)))
BUILD_DEPS += , libboost-system-dev $(BOOST_MINVER), libboost-iostreams-dev $(BOOST_MINVER), libboost-program-options-dev $(BOOST_MINVER), libboost-filesystem-dev $(BOOST_MINVER)
diff --git a/tests/control b/tests/control
index 176845a..eb28c38 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, libarchive-zip-perl, 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~2 [...]
+Depends: libreoffice, libreoffice-subsequentcheckbase, libreoffice-sdbc-hsqldb, autoconf, automake, bc, bison, bzip2, fastjar, flex (>= 2.3.35), gperf, libarchive-zip-perl, 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~2 [...]
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: