[SCM] LibreOffice packaging repository branch, debian-experimental-3.4.0, updated. libreoffice_3.3.3-1-102-g6e193ca

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

The following commit has been merged in the debian-experimental-3.4.0 branch:
commit fd7555a6c4d0c8f98b70bb12b448b48c6ee91565
Author: Rene Engelhard <rene@debian.org>
Date:   Wed Jun 29 01:53:50 2011 +0200

    reportdesign doesn't build with gcj now, too...

diff --git a/rules b/rules
index 5b02d54..406205d 100755
--- a/rules
+++ b/rules
@@ -234,9 +234,14 @@ ENABLE_OPENGL=y
 SYSTEM_STUFF += openssl
 NEW_DPKG_SHLIBDEPS=y
 ifeq "$(ENABLE_JAVA)" "y"
-  ENABLE_REPORTDESIGN=y
+  ifeq (,$(findstring $(ARCH),$(OOO_GCJ_JDK_ARCHS)))
+    ENABLE_REPORTDESIGN=y
+    SYSTEM_STUFF += jfreereport
+  else
+    ENABLE_REPORTDESIGN=n
+  endif
   ENABLE_MEDIAWIKI=y
-  SYSTEM_STUFF += jfreereport apache-commons
+  SYSTEM_STUFF += apache-commons
 else
   ENABLE_REPORTDESIGN=n
   ENABLE_MEDIAWIKI=n

-- 
LibreOffice packaging repository