[libreoffice] 03/03: cleanup; build-depend on libssl-dev (>= 0.9.8) and require at least 1.47 of boost
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-4.2
in repository libreoffice.
commit 8b24fb0c3e638317bf43071f4adffb56b40b5aec
Author: Rene Engelhard <rene@debian.org>
Date: Thu Aug 29 20:46:39 2013 +0200
cleanup; build-depend on libssl-dev (>= 0.9.8) and require at least 1.47 of boost
---
control | 4 ++--
rules | 33 +++++++++++----------------------
2 files changed, 13 insertions(+), 24 deletions(-)
diff --git a/control b/control
index 594e141..50240c0 100644
--- a/control
+++ b/control
@@ -91,7 +91,7 @@ Build-Depends: ant (>= 1.7.0),
librdf0-dev (>= 1.0.16),
libsane-dev,
libsm-dev,
- libssl-dev,
+ libssl-dev (>= 0.9.8),
libsuitesparse-dev (>= 1:3.4.0),
libvigraimpex-dev,
libvisio-dev,
@@ -4618,7 +4618,7 @@ Depends: ant (>= 1.7.0),
libserializer-java (>= 1.1.6),
libservlet3.0-java,
libsm-dev,
- libssl-dev,
+ libssl-dev (>= 0.9.8),
libsuitesparse-dev (>= 1:3.4.0),
libvigraimpex-dev,
libvisio-dev,
diff --git a/rules b/rules
index 4ac3b91..a126dbf 100755
--- a/rules
+++ b/rules
@@ -177,7 +177,7 @@ ifeq "$(BOOST_VERSION)" "default"
ifeq "$(shell dpkg --compare-versions $(SYSTEM_GCC_VERSION) ge 4.8 && echo true)" "true"
BOOST_MINVER= (>= 1.53)
else
- BOOST_MINVER= (>= 1.38)
+ BOOST_MINVER= (>= 1.47)
endif
endif
ifneq "$(WHEEZY_BACKPORT)" "y"
@@ -662,7 +662,7 @@ ifeq (,$(filter curl, $(SYSTEM_STUFF)))
endif
ifneq (,$(filter openssl, $(SYSTEM_STUFF)))
- BUILD_DEPS += , libssl-dev
+ BUILD_DEPS += , libssl-dev (>= 0.9.8)
DBG_DBG_SUGGESTS += , libssl$(shell readlink /usr/lib/$(DEB_HOST_MULTIARCH)/libssl.so | cut -d"." -f3,4,5)-dbg
endif
ifeq "$(USE_OPENCL)" "y"
@@ -980,34 +980,23 @@ endif
CONFIGURE_FLAGS += --with-external-hyph-dir=$(HYPH_DIR)
ifneq (,$(filter boost, $(SYSTEM_STUFF)))
- ifeq "$(BOOST_VERSION)" "1.34"
- ifeq "$(SYSTEM_GCC_VERSION)" "4.4"
- BUILD_DEPS += , libboost-dev (>= 1.34.1-15), libboost-date-time-dev (>= 1.34.1-15)
- else
- BUILD_DEPS += , libboost-dev, libboost-date-time-dev
- endif
- ifeq "$(SYSTEM_GCC_VERSION)" "4.6"
- BUILD_DEPS += , g++-4.6 (>= 4.6.2-12)
- endif
- else
- ifneq "$(BOOST_VERSION)" "default"
+ ifneq "$(BOOST_VERSION)" "default"
BUILD_DEPS += , libboost$(BOOST_VERSION)-dev $(BOOST_MINVER), libboost-date-time$(BOOST_VERSION)-dev $(BOOST_MINVER)
#BUILD_DEPS += , libboost-thread$(BOOST_VERSION)-dev, libboost-program-options$(BOOST_VERSION)-dev
- ifeq (,$(filter orcus, $(SYSTEM_STUFF)))
+ ifeq (,$(filter orcus, $(SYSTEM_STUFF)))
BUILD_DEPS += , libboost-system$(BOOST_VERSION)-dev $(BOOST_MINVER)
- endif
- ifeq ($USE_VLC),y)
+ endif
+ ifeq ($USE_VLC),y)
BUILD_DEPS += , libboost-system$(BOOST_VERSION)-dev $(BOOST_MINVER)
- endif
- else
+ endif
+ else
BUILD_DEPS += , libboost-dev $(BOOST_MINVER), libboost-date-time-dev $(BOOST_MINVER)
#BUILD_DEPS += , libboost-thread-dev, libboost-program-options-dev
- ifeq (,$(filter orcus, $(SYSTEM_STUFF)))
+ ifeq (,$(filter orcus, $(SYSTEM_STUFF)))
BUILD_DEPS += , libboost-system-dev $(BOOST_MINVER)
- endif
- ifeq ($(USE_VLC),y)
+ endif
+ ifeq ($(USE_VLC),y)
BUILD_DEPS += , libboost-system-dev $(BOOST_MINVER)
- endif
endif
endif
ifeq "$(shell if [ -e /usr/lib/$(DEB_HOST_MULTIARCH)/libboost_date_time.so ]; then echo true; fi)" "true"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: