[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.3.4-2-1-gb0d9439
The following commit has been merged in the master branch:
commit b0d9439d2746bbc7f8b25b4e30375a4cc88b71fd
Author: Rene Engelhard <rene@debian.org>
Date: Sun Aug 28 19:46:59 2011 +0200
fix SYSTEM_STUFF for ENABLE_JAVA=n
diff --git a/changelog b/changelog
index 33667c1..6575f5f 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,10 @@
+libreoffice (1:3.3.4-3) UNRELEASED; urgency=low
+
+ * debian/rules:
+ - fix SYSTEM_STUFF for ENABLE_JAVA=n
+
+ -- Rene Engelhard <rene@debian.org> Sun, 28 Aug 2011 19:46:28 +0200
+
libreoffice (1:3.3.4-2) unstable; urgency=medium
* debian/patches/mipsel-jfw-plugin-arch.diff: fix JFW_PLUGIN_ARCH
diff --git a/rules b/rules
index 499ccd5..7db316a 100755
--- a/rules
+++ b/rules
@@ -180,20 +180,22 @@ ENABLE_KDEAB=n
QT_MINVER= (>= 4.5)
KDELIBS_MINVER= (>= 4:4.3.4)
BUILD_DBG_PACKAGE=y
-# NOTE: If you change this while gcj/ant multiarch combo is still broken
-# you need to disable bsh scripting engine completely (see disable-rhino.diff)
-# See http://lists.debian.org/debian-java/2011/06/msg00108.html and replies
-SYSTEM_STUFF += beanshell
-SYSTEM_STUFF += hsqldb
-HSQLDB_MINVER= (>> 1.8.0.10)
-HSQLDB_TOONEWVER=1.8.1
-# disabled because system-saxon breaks all kinds exports using XSLT transforms
-# (e.g. M$ Word/Excel 2003 XML, Mediawiki, XHTML, UOF, ...)
-# It does *NOT* fail with _plain_ saxon 9.0.0.8 built with OOos build.xml
-# for UOF, but still for e.g. M$.
-#SYSTEM_STUFF += saxon
-SYSTEM_STUFF += lucene
-SYSTEM_STUFF += lpsolve
+ifeq "$(ENABLE_JAVA)" "y"
+ # NOTE: If you change this while gcj/ant multiarch combo is still broken
+ # you need to disable bsh scripting engine completely (see disable-rhino.diff)
+ # See http://lists.debian.org/debian-java/2011/06/msg00108.html and replies
+ SYSTEM_STUFF += beanshell
+ SYSTEM_STUFF += hsqldb
+ HSQLDB_MINVER= (>> 1.8.0.10)
+ HSQLDB_TOONEWVER=1.8.1
+ # disabled because system-saxon breaks all kinds exports using XSLT transforms
+ # (e.g. M$ Word/Excel 2003 XML, Mediawiki, XHTML, UOF, ...)
+ # It does *NOT* fail with _plain_ saxon 9.0.0.8 built with OOos build.xml
+ # for UOF, but still for e.g. M$.
+ #SYSTEM_STUFF += saxon
+ SYSTEM_STUFF += lucene
+endif
+YSTEM_STUFF += lpsolve
USE_SHARED_LPSOLVE=y
LPSOLVE_MIN_VERSION= (>= 5.5.0.13-5+b1)
USE_DBUS=y
--
LibreOffice packaging repository
Reply to: