The following commit has been merged in the debian-experimental-3.4.0 branch:
commit ca11a99c95021463f1604815a344a836fb9d48ef
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 2308c2f..ea29e8a 100644
--- a/changelog
+++ b/changelog
@@ -2,8 +2,11 @@ libreoffice (1:3.4.1-3) UNRELEASED; urgency=low
* debian/patches/fix-bridges-cpp-uno-depends.diff: fix mising depends in
bridges' build.lst which can cause FTBFS on s390(x), arm, ia64, hppa, alpha
+
+ * debian/rules:
+ - also set ON_BUILDD=y if $(CURDIR) begins with /build/buildd-
- -- Rene Engelhard <r...@debian.org> Thu, 21 Jul 2011 16:24:14 +0000
+ -- Rene Engelhard <r...@debian.org> Fri, 22 Jul 2011 08:05:47 +0200
libreoffice (1:3.4.1-2) experimental; urgency=low
diff --git a/rules b/rules
index e63f8ed..64bf0d6 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/e1qk8xr-0002ko...@vasks.debian.org
