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

[SCM] LibreOffice packaging repository branch, debian-experimental-4.0, updated. libreoffice_3.6.4-1-175-gb2b34d5



The following commit has been merged in the debian-experimental-4.0 branch:
commit 2c599cd34fc6d17ec5085ad0de036979a83f2998
Author: Rene Engelhard <rene@debian.org>
Date:   Sat Dec 8 18:38:38 2012 +0100

    fix help/clucene conditional on arm*

diff --git a/rules b/rules
index 416e2cd..3b71e5d 100755
--- a/rules
+++ b/rules
@@ -124,11 +124,6 @@ ifeq "$(ENABLE_PYTHON2)" "y"
 endif
 PACKAGE_TTF_OPENSYMBOL=y
 BUILD_ONLY_EN_US=y
-ifeq (,$(filter armel armhf,$(DEB_HOST_ARCH)))
-    ENABLE_HELP=y
-else
-    ENABLE_HELP=y
-endif
 ENABLE_JAVA=y
 ifeq "$(ENABLE_JAVA)" "y"
   JDK=default
@@ -313,6 +308,15 @@ SYSTEM_STUFF += poppler
 SYSTEM_STUFF += libpng
 SYSTEM_STUFF += nss
 SYSTEM_STUFF += clucene
+ifneq (,$(filter clucene, $(SYSTEM_STUFF)))
+  ENABLE_HELP=y
+else
+  ifeq (,$(filter armel armhf,$(DEB_HOST_ARCH)))
+    ENABLE_HELP=n
+  else
+    ENABLE_HELP=y
+  endif
+endif
 SYSTEM_STUFF += lcms2
 SYSTEM_STUFF += openldap
 PACKAGE_UNOWINREG_DLL=y

-- 
LibreOffice packaging repository


Reply to: