[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.5.0_rc1-1-17-g34417ee
The following commit has been merged in the debian-experimental-3.5 branch:
commit 34417eeafa5df5cb5915e03423525a12659b5669
Author: Rene Engelhard <rene@debian.org>
Date: Tue Jan 24 02:29:12 2012 +0100
(re-)enable -scripting-js
diff --git a/changelog b/changelog
index 21dd491..6fafbdf 100644
--- a/changelog
+++ b/changelog
@@ -5,8 +5,9 @@ libreoffice (1:3.5.0~rc1-2) UNRELEASED; urgency=low
- fix merge errors: $(ARCH) -> $(DEB_HOST_ARCH)
- install full changelog only for packages with the same name in OOo
times; strip pre-libreoffice entries otherwise.
+ - (re-)enable -scripting-js
- -- Rene Engelhard <rene@debian.org> Sat, 21 Jan 2012 19:45:51 +0100
+ -- Rene Engelhard <rene@debian.org> Tue, 24 Jan 2012 01:51:15 +0100
libreoffice (1:3.5.0~rc1-1) experimental; urgency=low
diff --git a/rules b/rules
index c29f699..30fb993 100755
--- a/rules
+++ b/rules
@@ -223,14 +223,13 @@ ifeq "$(ENABLE_JAVA)" "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
- # as we have the gcj/ant multiarch braekage. See
- # http://lists.debian.org/debian-java/2011/06/msg00108.html and replies
ENABLE_SCRIPT_PROVIDER_BSH=y
- ENABLE_SCRIPT_PROVIDER_JS=n
+ ENABLE_SCRIPT_PROVIDER_JS=y
else
ENABLE_REPORTDESIGN=n
ENABLE_MEDIAWIKI=n
+ ENABLE_SCRIPT_PROVIDER_BSH=n
+ ENABLE_SCRIPT_PROVIDER_JS=n
endif
ENABLE_SDBC_POSTGRESQL=y
ENABLE_MINIMIZER=y
--
LibreOffice packaging repository
Reply to: