This is an automated email from the git hooks/post-receive script. rene pushed a commit to branch debian-unstable-4.3.1 in repository libreoffice.
commit 86f6ecc290307455728df18456b68c73fa5cc7cc Author: Rene Engelhard <[email protected]> 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 a2c09c6..34b1c74 100644 --- a/changelog +++ b/changelog @@ -16,8 +16,10 @@ libreoffice (1:4.3.1-2) UNRELEASED; 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 <[email protected]> Sun, 14 Sep 2014 13:53:07 +0200 + -- Rene Engelhard <[email protected]> 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 45232f3..22a50ce 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 -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: https://lists.debian.org/[email protected]
