[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 88d94f854827470b030f05be92a3fa44fb507284
Author: Rene Engelhard <rene@debian.org>
Date:   Wed Jul 27 19:58:01 2011 +0000

    fix logic again and move to sane place (thanks mrvn)

diff --git a/rules b/rules
index 973fe6c..759aabc 100755
--- a/rules
+++ b/rules
@@ -239,12 +239,8 @@ ENABLE_OPENGL=y
 SYSTEM_STUFF += openssl
 NEW_DPKG_SHLIBDEPS=y
 ifeq "$(ENABLE_JAVA)" "y"
-  ifeq ($(ARCH),$(findstring $(ARCH),$(OOO_OPENJDK_ARCHS)))
-    ENABLE_REPORTDESIGN=y
-    SYSTEM_STUFF += jfreereport
-  else
-    ENABLE_REPORTDESIGN=n
-  endif
+  ENABLE_REPORTDESIGN=y
+  SYSTEM_STUFF += jfreereport
   ENABLE_MEDIAWIKI=y
   SYSTEM_STUFF += apache-commons
   # if you change these, add something like disable-rhino.diff and/or remove it as long
@@ -405,6 +401,11 @@ ifeq (,$(filter $(ARCH),$(OOO_JAVA_ARCHS)))
 	ENABLE_MEDIAWIKI=n
 endif
 
+ifeq ($(ARCH),$(findstring $(ARCH),$(OOO_GCJ_JDK_ARCHS)))
+	ENABLE_REPORTDESIGN=n
+	SYSTEM_STUFF := $(filter-out jfreereport, $(SYSTEM_STUFF))
+endif
+
 ifeq "$(ENABLE_MONO)" "y"
 # mono
 # ppc fails (#412967), arm(el), too

-- 
LibreOffice packaging repository