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

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

The following commit has been merged in the debian-experimental-4.0 branch:
commit 6e7fe7d8c17a106d4d028e880f31488a3c68ea4c
Author: Rene Engelhard <rene@debian.org>
Date:   Sat Mar 30 15:49:47 2013 +0100

    move boost 1.53 dep to BOOST_MINVER properly

diff --git a/rules b/rules
index 495f990..d5311eb 100755
--- a/rules
+++ b/rules
@@ -168,7 +168,12 @@ LIBHYPHEN_MINVER= (>= 2.4)
 SYSTEM_STUFF += boost
 BOOST_VERSION=default
 ifeq "$(BOOST_VERSION)" "default"
-  BOOST_MINVER= (>= 1.38)
+  ifeq "$(SYSTEM_GCC_VERSION)" "4.8"
+    # see 701310/695826
+    BOOST_MINVER= (>= 1.53)
+  else
+    BOOST_MINVER= (>= 1.38)
+  endif
 endif
 ifeq "$(BOOST_VERSION)" "1.39"
   BOOST_MINVER= (>= 1.39.0-2)
@@ -951,12 +956,7 @@ 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