[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 9e547c3f3bd262f61b52b32aa2a78966db29adc1
Author: Rene Engelhard <rene@debian.org>
Date:   Wed Jul 27 21:14:47 2011 +0200

    reverse conditional to not build reportbuilder

diff --git a/changelog b/changelog
index edc973a..5c24d62 100644
--- a/changelog
+++ b/changelog
@@ -3,8 +3,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... 
+    - reverse conditional to not build reportbuilder to really disable
+      its build on gcj archs (apparently ant and envvars still broken due
+      to multiarch)
 
- -- Rene Engelhard <rene@debian.org>  Wed, 27 Jul 2011 18:13:30 +0200
+ -- Rene Engelhard <rene@debian.org>  Wed, 27 Jul 2011 21:10:36 +0200
 
 libreoffice (1:3.4.1-3) experimental; urgency=low
 
diff --git a/rules b/rules
index 841b5bf..973fe6c 100755
--- a/rules
+++ b/rules
@@ -239,7 +239,7 @@ ENABLE_OPENGL=y
 SYSTEM_STUFF += openssl
 NEW_DPKG_SHLIBDEPS=y
 ifeq "$(ENABLE_JAVA)" "y"
-  ifeq (,$(findstring $(ARCH),$(OOO_GCJ_JDK_ARCHS)))
+  ifeq ($(ARCH),$(findstring $(ARCH),$(OOO_OPENJDK_ARCHS)))
     ENABLE_REPORTDESIGN=y
     SYSTEM_STUFF += jfreereport
   else

-- 
LibreOffice packaging repository