[SCM] LibreOffice packaging repository branch, debian-experimental-4.0, updated. libreoffice_4.0.2_rc2-1-9-g1b3b0ce

["Rene Engelhard" <rene@debian.org>]

The following commit has been merged in the debian-experimental-4.0 branch:
commit 65c694e7aa130d7469e1dc4162fa0451843fb78e
Author: Rene Engelhard <rene@debian.org>
Date:   Fri Mar 29 16:04:16 2013 +0100

    build-depend on libboost-dev 1.53 when building with gcc 4.8, see 701310/695826

diff --git a/changelog b/changelog
index db6275b..d01f1a6 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,11 @@
+libreoffice (1:4.0.2~rc2-2) UNRELEASED; urgency=low
+
+  * debian/rules:
+    - build-depend on libboost-dev 1.53 when building with gcc 4.8,
+      see 701310/695826 (closes: #701310)
+
+ -- Rene Engelhard <rene@debian.org>  Fri, 29 Mar 2013 15:45:09 +0100
+
 libreoffice (1:4.0.2~rc2-1) experimental; urgency=low
 
   * new upstream release candidate
diff --git a/rules b/rules
index a89731e..c6e4bb3 100755
--- a/rules
+++ b/rules
@@ -948,7 +948,12 @@ ifneq (,$(filter boost, $(SYSTEM_STUFF)))
 	BUILD_DEPS += , libboost$(BOOST_VERSION)-dev $(BOOST_MINVER), libboost-date-time$(BOOST_VERSION)-dev $(BOOST_MINVER)
 	#BUILD_DEPS += , libboost-thread$(BOOST_VERSION)-dev, libboost-program-options$(BOOST_VERSION)-dev
     else
+      # see 701310/695826
+      ifeq "$(SYSTEM_GCC_VERSION)" "4.8"
+	BUILD_DEPS += , libboost-dev (>= 1.53), libboost-date-time-dev (>= 1.53)
+      else
 	BUILD_DEPS += , libboost-dev $(BOOST_MINVER), libboost-date-time-dev $(BOOST_MINVER)
+      endif
 	#BUILD_DEPS += , libboost-thread-dev, libboost-program-options-dev
     endif
   endif

-- 
LibreOffice packaging repository