[SCM] LibreOffice packaging repository branch, debian-experimental-3.4.0, updated. libreoffice_3.4.1-3-6-gc2dffa4

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

The following commit has been merged in the debian-experimental-3.4.0 branch:
commit 5e5b9ae901fa02c84b772aa0b8518a8babc04277
Author: Rene Engelhard <rene@debian.org>
Date:   Wed Jul 27 18:14:38 2011 +0200

    don't statically check for /build/buildd- but use grep, which will catch also /build/buildd2- as on lucatelli2...

diff --git a/changelog b/changelog
index 9ad0a7a..edc973a 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,11 @@
+libreoffice (1:3.4.1-4) UNRELEASED; urgency=low
+
+  * debian/rules:
+    - don't statically check for /build/buildd- but use grep, which will
+      catch also /build/buildd2- as on lucatelli2... 
+
+ -- Rene Engelhard <rene@debian.org>  Wed, 27 Jul 2011 18:13:30 +0200
+
 libreoffice (1:3.4.1-3) experimental; urgency=low
 
   * debian/patches/fix-bridges-cpp-uno-depends.diff: fix mising depends in
diff --git a/rules b/rules
index ba6cf7a..841b5bf 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 -o "`echo $(CURDIR) | cut -d- -f1`" = "/build/buildd" ] && echo y || echo n)
+ON_BUILDD := $(shell if [ "`whoami`" = buildd -o -f /CurrentlyBuilding ] || echo $(CURDIR) | grep -q \/build\/buildd; then echo y; else echo n)
 
 PKGDIR:=debian/libreoffice$(VER)
 OODIRNAME=libreoffice$(VER)

-- 
LibreOffice packaging repository