[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_4.0.3-1-3-g5b80de0
The following commit has been merged in the master branch:
commit dc95394e1e03e4bea98806a4eb5adb4c94ddd3cd
Author: Rene Engelhard <rene@debian.org>
Date: Thu May 9 22:24:41 2013 +0200
build with libboost1.53-dev to work around mdds-using sc unit tests failing to build with sids new gcc-4.7
diff --git a/changelog b/changelog
index cb07c23..f5ffe38 100644
--- a/changelog
+++ b/changelog
@@ -3,6 +3,9 @@ libreoffice (1:4.0.3-2) UNRELEASED; urgency=low
* debian/control.in:
- add Breaks: libjaxe-java (<= 3.5-2) for saxon9.jar disappearing from
-java-common
+ * debian/rules:
+ - build with libboost1.53-dev to work around mdds-using sc unit tests failing
+ to build with sids new gcc-4.7
-- Rene Engelhard <rene@debian.org> Fri, 10 May 2013 16:58:08 +0200
diff --git a/control b/control
index b854cf1..3d7cc94 100644
--- a/control
+++ b/control
@@ -27,8 +27,8 @@ Build-Depends: ant (>= 1.7.0),
kdelibs5-dev (>= 4:4.3.4),
libarchive-zip-perl,
libbluetooth-dev [!kfreebsd-amd64 !kfreebsd-i386],
- libboost-date-time-dev (>= 1.38),
- libboost-dev (>= 1.38),
+ libboost-date-time1.53-dev,
+ libboost1.53-dev,
libc0.1 (>= 2.10.2-7) [kfreebsd-i386 kfreebsd-amd64],
libcairo2-dev,
libcdr-dev,
@@ -164,7 +164,7 @@ XS-Python3-Version: 3.3
XS-Testsuite: autopkgtest
Vcs-Git: https://alioth.debian.org/anonscm/git/pkg-openoffice/libreoffice.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-openoffice/libreoffice.git
-Bugs:
+Bugs: mailto:debian-openoffice@lists.debian.org
Homepage: http://www.libreoffice.org
Package: libreoffice
@@ -4436,8 +4436,8 @@ Depends: ant (>= 1.7.0),
libarchive-zip-perl,
libbase-java,
libbluetooth-dev,
- libboost-date-time-dev (>= 1.38),
- libboost-dev (>= 1.38),
+ libboost-date-time1.53-dev,
+ libboost1.53-dev,
libcairo2-dev,
libcdr-dev,
libcmis-dev (>= 0.3.1),
diff --git a/rules b/rules
index 997f358..313db68 100755
--- a/rules
+++ b/rules
@@ -166,7 +166,11 @@ USE_LIBHYPHEN=y
LIBALTLINUXHYPH_MINVER= (>= 0.1.1-11)
LIBHYPHEN_MINVER= (>= 2.4)
SYSTEM_STUFF += boost
-BOOST_VERSION=default
+ifeq "$(WHEEZY_BACKPORT)" "y"
+ BOOST_VERSION=default
+else
+ BOOST_VERSION=1.53
+endif
ifeq "$(BOOST_VERSION)" "default"
ifeq "$(SYSTEM_GCC_VERSION)" "4.8"
# see 701310/695826
--
LibreOffice packaging repository
Reply to: