[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_4.0.3-2-6-gdcdd96d
The following commit has been merged in the master branch:
commit 6cef39ec2ed2cb375c631155911b50f615988eac
Author: Rene Engelhard <rene@debian.org>
Date: Mon May 13 23:48:33 2013 +0200
move comment about 701310/695826 more up...
diff --git a/rules b/rules
index e526a45..9822371 100755
--- a/rules
+++ b/rules
@@ -166,6 +166,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
@@ -173,7 +174,6 @@ else
endif
ifeq "$(BOOST_VERSION)" "default"
ifeq "$(SYSTEM_GCC_VERSION)" "4.8"
- # see 701310/695826
BOOST_MINVER= (>= 1.53)
else
BOOST_MINVER= (>= 1.38)
--
LibreOffice packaging repository
Reply to: