[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

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



The following commit has been merged in the debian-experimental-3.4.0 branch:
commit a039baa6d8e996b763eab017c1e123d7f162b99d
Author: Rene Engelhard <rene@debian.org>
Date:   Wed Jul 27 20:06:40 2011 +0000

    another fix

diff --git a/rules b/rules
index 759aabc..a469baf 100755
--- a/rules
+++ b/rules
@@ -402,8 +402,10 @@ ifeq (,$(filter $(ARCH),$(OOO_JAVA_ARCHS)))
 endif
 
 ifeq ($(ARCH),$(findstring $(ARCH),$(OOO_GCJ_JDK_ARCHS)))
+  ifneq ($(ARCH),$(findstring $(ARCH),$(OOO_OPENJDK_ARCHS)))
 	ENABLE_REPORTDESIGN=n
 	SYSTEM_STUFF := $(filter-out jfreereport, $(SYSTEM_STUFF))
+  endif
 endif
 
 ifeq "$(ENABLE_MONO)" "y"

-- 
LibreOffice packaging repository


Reply to: