[libreoffice] 12/152: reduce delta

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to tag libreoffice_3.5.0_rc3-0ubuntu2
in repository libreoffice.

commit 60d94b71f1249b1ad105957f465fc4b411e34374
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Fri Nov 13 02:37:47 2015 +0100

    reduce delta
---
 rules | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/rules b/rules
index a7eb51b..a108a86 100755
--- a/rules
+++ b/rules
@@ -70,7 +70,7 @@ ifeq "$(USE_GIT_TARBALLS)" "y"
 GIT_BASEURL:=git://anongit.freedesktop.org/libreoffice
 # bootstraping this from the source tree is breaking get-orig-source
 #lo_sources_ver=$(shell grep AC_INIT $(SOURCE_TREE)/configure.ac | grep documentfoundation | cut -d, -f2 | sed -e 's,\[,,' -e 's,\],,')
-lo_sources_ver=5.0.2.2
+lo_sources_ver=libreoffice-5.1.0.0.alpha1-buildfix1
 # NOT in proper libreoffice-3-6 branch
 # use ./g checkout -b tag-libreoffice-3.6.2.1 libreoffice-3.6.2.1
 GIT_TAG=libreoffice-$(lo_sources_ver)
@@ -482,8 +482,6 @@ USE_UCPP=y
 ifeq "$(USE_UCPP)" "y"
   SYSTEM_STUFF += ucpp
 endif
-ENABLE_MERGELIBS=n
-ENABLE_LTO=n
 ifeq (,$(findstring kfreebsd,$(DEB_HOST_ARCH)))
 ENABLE_MERGELIBS=y
 endif
@@ -888,7 +886,6 @@ ifneq ($(ENABLE_COINMP),y)
 else
 	BUILD_DEPS += , coinor-libcoinmp-dev $(COINMP_MINVER), coinor-libcoinutils-dev $(COINUTILS_MINVER)
 endif
-endif
 
 ifneq (,$(filter openssl, $(SYSTEM_STUFF)))
 	BUILD_DEPS += , libssl-dev (>= 0.9.8)
@@ -974,7 +971,7 @@ ifeq "$(RUN_MAKE_CHECK)" "y"
 	CONFIGURE_FLAGS += --without-junit
   endif
 else
-  CONFIGURE_FLAGS += --without-junit
+   CONFIGURE_FLAGS += --without-junit
 endif
 
 ifneq "$(BUILD_ONLY_EN_US)" "y"
@@ -1753,12 +1750,14 @@ endif
 	perl -pi -e "s,%OOO_REPORTDESIGN_ARCHS%,$(OOO_REPORTDESIGN_ARCHS),g" debian/control
 	perl -pi -e "s,%OOO_NO_REPORTDESIGN_ARCHS%,$(OOO_NO_REPORTDESIGN_ARCHS),g" debian/control
 	perl -pi -e "s#%BUILD_DEPS%#$(strip $(BUILD_DEPS))#g" debian/control
+ifeq "$(BUILD_TEST_PACKAGE)" "y"
 	# we want the build deps as dep on subsequentcheckbase, but strip the arch
 	# specifics as we are arch-all
 	# for now we filter out the arch-specific libc* and ia64, which is ugly,
 	# but better than manual bookkeeping. Also filter out the mips(el)-only
 	# binutils build-dep...
 	perl -pi -e "s#%BUILD_DEPS_ARCH_ALL%#$(strip $(shell echo '$(BUILD_DEPS), $(BUILD_DEPS_INDEP)'|sed -e 's/,/,\n /g'|grep -v libc0.1| grep -v libc6| grep -v ia64|grep -v binutils|grep -v gcj-jdk|grep -v gcj-native-helper|grep -v libgcj-common|grep -v openjdk-6-jdk|grep -v g++-|grep -v gcc-|sed -e 's/\[[^]]*\]//g'))#g" debian/control
+endif
 ifeq "$(BUILD_KDE)" "y"
 	perl -pi -e 's/%LO-DESKTOP-INTEGRATION%/libreoffice-gnome | libreoffice-kde/' debian/control
 else

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git