This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-4.1
in repository libreoffice.
commit 6a3dfeeea9ea12f22854db88bc29d2febb2023f2
Author: Rene Engelhard <r...@debian.org>
Date: Tue Aug 20 13:58:59 2013 +0200
use default boost (1.54) again
---
changelog | 1 +
control | 8 ++++----
rules | 7 +------
3 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/changelog b/changelog
index d363b5e..532b284 100644
--- a/changelog
+++ b/changelog
@@ -14,6 +14,7 @@ libreoffice (1:4.1.1~rc1-2) UNRELEASED; urgency=low
is taken)
- "fix" to also ignore check failures on kfreebsd-{i386,amd64} (assuming
openjdk use)
+ - use default boost (1.54) again
* debian/libreoffice-dev-doc.links: add api -> docs symlink as Javadocs
should be in api/
* debian/libreoffice-script-provider-python.bug-script: remove, obsolete;
diff --git a/control b/control
index dc6d0c4..b1e79b1 100644
--- a/control
+++ b/control
@@ -32,8 +32,8 @@ Build-Depends: ant (>= 1.7.0),
kdelibs5-dev (>= 4:4.3.4),
libarchive-zip-perl,
libbluetooth-dev [!kfreebsd-amd64 !kfreebsd-i386],
- libboost-date-time1.53-dev,
- libboost1.53-dev,
+ libboost-date-time-dev,
+ libboost-dev,
libc0.1 (>= 2.10.2-7) [kfreebsd-i386 kfreebsd-amd64],
libc6 (>= 2.17-6) [mips mipsel],
libcairo2-dev,
@@ -4464,8 +4464,8 @@ Depends: ant (>= 1.7.0),
libarchive-zip-perl,
libbase-java,
libbluetooth-dev,
- libboost-date-time1.53-dev,
- libboost1.53-dev,
+ libboost-date-time-dev,
+ libboost-dev,
libcairo2-dev,
libcdr-dev,
libclucene-dev (>= 2.3.3.4-2),
diff --git a/rules b/rules
index d62798f..ff4c7b7 100755
--- a/rules
+++ b/rules
@@ -171,12 +171,7 @@ USE_LIBHYPHEN=y
LIBALTLINUXHYPH_MINVER= (>= 0.1.1-11)
LIBHYPHEN_MINVER= (>= 2.4)
SYSTEM_STUFF += boost
-# see 701310/695826. Also happens with sids new gcc 4.7.3
-ifeq "$(WHEEZY_BACKPORT)" "y"
- BOOST_VERSION=default
-else
- BOOST_VERSION=1.53
-endif
+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)
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-openoffice/libreoffice.git
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1vboyw-0005sh...@vasks.debian.org
