[libreoffice] 01/01: fix duplicate BOOST_MINVER setting causing a too lax build-dep
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit 9cd15ac1bec32bb113e0d8bef5dccea3fe2021ff
Author: Rene Engelhard <rene@debian.org>
Date: Sun Sep 14 22:38:07 2014 +0200
fix duplicate BOOST_MINVER setting causing a too lax build-dep
---
changelog | 4 +++-
control | 16 ++++++++--------
rules | 9 ++++-----
3 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/changelog b/changelog
index e99022e..5a0d5b7 100644
--- a/changelog
+++ b/changelog
@@ -18,8 +18,10 @@ libreoffice (1:4.3.2~rc1-1) unstable; urgency=low
- help arm64 by working around (yet) BD-Uninstallable packages:
- disabling kde, vlc and evolution
- using internal vigra
+ - fix duplicate BOOST_MINVER setting causing a too lax build-dep
+ (>= 1.49.0-4 instead of >= 1.53) for gcc >= 4.8...
- -- Rene Engelhard <rene@debian.org> Sun, 14 Sep 2014 13:53:07 +0200
+ -- Rene Engelhard <rene@debian.org> Sun, 14 Sep 2014 22:37:22 +0200
libreoffice (1:4.3.1-1) unstable; urgency=low
diff --git a/control b/control
index 8d1b640..9c60ca8 100644
--- a/control
+++ b/control
@@ -36,10 +36,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.53),
+ libboost-dev (>= 1.53),
+ libboost-iostreams-dev (>= 1.53),
+ libboost-system-dev (>= 1.53) [!arm64],
libc0.1 (>= 2.10.2-7) [kfreebsd-i386 kfreebsd-amd64],
libc6 (>= 2.17-6) [mips mipsel],
libcairo2-dev,
@@ -4500,10 +4500,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.53),
+ libboost-dev (>= 1.53),
+ libboost-iostreams-dev (>= 1.53),
+ libboost-system-dev (>= 1.53),
libbsh-java,
libcairo2-dev,
libcdr-dev (>= 0.1),
diff --git a/rules b/rules
index e5156dd..6dc82e6 100755
--- a/rules
+++ b/rules
@@ -184,12 +184,11 @@ ifeq "$(BOOST_VERSION)" "default"
ifeq "$(shell dpkg --compare-versions $(SYSTEM_GCC_VERSION) ge 4.8 && echo true)" "true"
BOOST_MINVER= (>= 1.53)
else
+ ifneq "$(WHEEZY_BACKPORT)" "y"
+ BOOST_MINVER= (>= 1.49.0-4)
+ else
BOOST_MINVER= (>= 1.47)
- endif
-endif
-ifneq "$(WHEEZY_BACKPORT)" "y"
- ifeq "$(BOOST_VERSION)" "default"
- BOOST_MINVER= (>= 1.49.0-4)
+ endif
endif
endif
SYSTEM_STUFF += mdds
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: