The following commit has been merged in the master branch:
commit 1f046fcd2ee7913733aa748a249bc895f66c7cd8
Author: Rene Engelhard <r...@rene-engelhard.de>
Date: Sat Jun 15 13:20:33 2013 +0200
build --enable-verbose everyhwere, also on the buildds
diff --git a/changelog b/changelog
index 6d19957..7034380 100644
--- a/changelog
+++ b/changelog
@@ -8,6 +8,8 @@ libreoffice (1:4.0.3-4) UNRELEASED; urgency=low
- temporarily force gcc-4.6(!) (instead of build-conflicting
against gcc (>< 4:4.7~) on all archs except *i386/*amd64 until
all bridges are ported to the new gcc 4.7+ behaviour
+ - remove last buildd special-caing: build --enable-verbose everyhwere,
+ also on the buildds
-- Rene Engelhard <r...@debian.org> Thu, 13 Jun 2013 21:19:31 +0200
diff --git a/rules b/rules
index f48b32f..e275ec1 100755
--- a/rules
+++ b/rules
@@ -37,9 +37,6 @@ export gb_SHELL:=$(SHELL)
SYSTEM_GCC_VERSION = $(shell gcc --version | sed -n
'/^gcc/s/.*\(.\..\)\..$$/\1/p')
-# Debian buildds run as user `buildd', other are using /CurrentlyBuilding
-ON_BUILDD := $(shell if [ "`whoami`" = buildd -o -f /CurrentlyBuilding ] ||
echo $(CURDIR) | grep -q \/build\/buildd; then echo y; else echo n; fi)
-
PKGDIR:=debian/libreoffice
OODIRNAME=libreoffice
OODIR:=usr/lib/$(OODIRNAME)
@@ -393,9 +390,7 @@ ifeq "$(shell echo $(DEB_VERSION_UPSTREAM) | grep -E
'(alpha|beta)'; echo $$?)"
CONFIGURE_FLAGS += --enable-release-build
endif
-ifneq ($(ON_BUILDD),y)
CONFIGURE_FLAGS += --enable-verbose
-endif
CONFIGURE_FLAGS += --with-alloc=$(ALLOC)
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1unoy4-0002ms...@vasks.debian.org
