[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[libreoffice] 01/01: bump build-dep for boost to >= 1.55



This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch debian-experimental-4.4
in repository libreoffice.

commit deb2a6dff35f7a8eefc757bc7b831c311de34309
Author: Rene Engelhard <rene@debian.org>
Date:   Sun Sep 14 22:19:27 2014 +0200

    bump build-dep for boost to >= 1.55
---
 control | 16 ++++++++--------
 rules   |  9 +--------
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/control b/control
index 8857931..011ca35 100644
--- a/control
+++ b/control
@@ -37,10 +37,10 @@ Build-Depends: ant (>= 1.7.0),
                libabw-dev (>= 0.1),
                libarchive-zip-perl,
                libbluetooth-dev [!kfreebsd-amd64 !kfreebsd-i386],
-               libboost-date-time-dev (>= 1.49.0-4),
-               libboost-dev (>= 1.49.0-4),
-               libboost-iostreams-dev (>= 1.49.0-4),
-               libboost-system-dev (>= 1.49.0-4) [!arm64],
+               libboost-date-time-dev (>= 1.55),
+               libboost-dev (>= 1.55),
+               libboost-iostreams-dev (>= 1.55),
+               libboost-system-dev (>= 1.55) [!arm64],
                libc0.1 (>= 2.10.2-7) [kfreebsd-i386 kfreebsd-amd64],
                libc6 (>= 2.17-6) [mips mipsel],
                libcairo2-dev,
@@ -4377,10 +4377,10 @@ Depends: ant (>= 1.7.0),
          libabw-dev (>= 0.1),
          libarchive-zip-perl,
          libbluetooth-dev,
-         libboost-date-time-dev (>= 1.49.0-4),
-         libboost-dev (>= 1.49.0-4),
-         libboost-iostreams-dev (>= 1.49.0-4),
-         libboost-system-dev (>= 1.49.0-4),
+         libboost-date-time-dev (>= 1.55),
+         libboost-dev (>= 1.55),
+         libboost-iostreams-dev (>= 1.55),
+         libboost-system-dev (>= 1.55),
          libbsh-java,
          libcairo2-dev,
          libcdr-dev (>= 0.1),
diff --git a/rules b/rules
index 3e60b3e..fc2b80b 100755
--- a/rules
+++ b/rules
@@ -162,14 +162,7 @@ LIBHYPHEN_MINVER= (>= 2.4)
 SYSTEM_STUFF += boost
 BOOST_VERSION=default
 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.47)
-  endif
-endif
-ifeq "$(BOOST_VERSION)" "default"
-  BOOST_MINVER= (>= 1.49.0-4)
+    BOOST_MINVER= (>= 1.55)
 endif
 SYSTEM_STUFF += mdds
 SYSTEM_STUFF += vigra

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git


Reply to: