The following commit has been merged in the master branch:
commit b1d4feccca8eff3c285fb31d3b085881a97911e2
Author: Rene Engelhard <r...@debian.org>
Date: Fri Jul 22 08:08:16 2011 +0200
also set ON_BUILDD=y if $(CURDIR) begins with /build/buildd-
diff --git a/changelog b/changelog
index 3df01aa..420f822 100644
--- a/changelog
+++ b/changelog
@@ -12,6 +12,7 @@ libreoffice (1:3.4.1-2) experimental; urgency=low
- don't try to change libreoffice-base when we don't built it
- build-depend on javahelper (>= 0.37) and use -s
- fix build with make 3.82: remove space after, in $(call
+ - also set ON_BUILDD=y if $(CURDIR) begins with /build/buildd-
* debian/source.lintian-overrides:
- override new libreoffice source: dh_pycentral-is-obsolete line 3214
and libreoffice source: dh_python-is-obsolete line 3223
diff --git a/rules b/rules
index ec13e73..b6fa136 100755
--- a/rules
+++ b/rules
@@ -48,7 +48,7 @@ SHELL:=/bin/bash
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 [ "`whoami`" = buildd -o -f /CurrentlyBuilding ] && echo
y || echo n)
+ON_BUILDD := $(shell [ "`whoami`" = buildd -o -f /CurrentlyBuilding -o "`echo
$(CURDIR) | cut -d- -f1`" = "/build/buildd" ] && echo y || echo n)
PKGDIR:=debian/libreoffice$(VER)
OODIRNAME=libreoffice$(VER)
--
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/e1qk913-0003aa...@vasks.debian.org
