[libreoffice] 01/04: we now also need libboost-locale-dev
Rene Engelhard
rene at moszumanska.debian.org
Sun Apr 30 09:35:15 UTC 2017
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.4
in repository libreoffice.
commit 1fa4537e42b7598d3413c0a6fd69227dfa542394
Author: Rene Engelhard <rene at debian.org>
Date: Sun Apr 30 11:32:16 2017 +0200
we now also need libboost-locale-dev
---
control | 1 +
rules | 4 ++--
tests/control | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/control b/control
index f23f2d4..6607290 100644
--- a/control
+++ b/control
@@ -46,6 +46,7 @@ Build-Depends: ant (>= 1.7.0) [!hppa !ia64 !mips64 !s390 !sparc],
libboost-dev (>= 1.58),
libboost-filesystem-dev (>= 1.58),
libboost-iostreams-dev (>= 1.58),
+ libboost-locale-dev (>= 1.58),
libboost-system-dev (>= 1.58),
libbz2-dev,
libc0.1 (>= 2.10.2-7) [kfreebsd-any],
diff --git a/rules b/rules
index cf37ccb..4f70e40 100755
--- a/rules
+++ b/rules
@@ -1115,7 +1115,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, libboost$(BOOST_VERSION)-filesystem-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, libboost$(BOOST_VERSION)-locale-dev
#BUILD_DEPS += , libboost-thread$(BOOST_VERSION)-dev, libboost-program-options$(BOOST_VERSION)-dev
ifeq (,$(filter orcus, $(SYSTEM_STUFF)))
BUILD_DEPS += , libboost-system$(BOOST_VERSION)-dev $(BOOST_MINVER), libboost-iostreams$(BOOST_VERSION)-dev $(BOOST_MINVER), libboost-program-options$(BOOST_VERSION)-dev $(BOOST_MINVER), libboost-filesystem$(BOOST_VERSION)-dev $(BOOST_MINVER)
@@ -1124,7 +1124,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), libboost-filesystem-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), libboost-locale-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 dd43221..41e80bf 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), libgl1-mesa-dev, 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.1.0) , opencollada-dev (>= 0.1.0~2014070 [...]
+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), libgl1-mesa-dev, 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.1.0) , opencollada-dev (>= 0.1.0~2014070 [...]
Tests: pyuno-import
Depends: python3-uno
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
More information about the Pkg-openoffice-commits
mailing list