This is an automated email from the git hooks/post-receive script.
sweetshark-guest pushed a commit to branch ubuntu-utopic-4.3
in repository libreoffice.
commit 7236163cb161da17b3df2fa543dbe8cc2cca2ddc
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Tue Jun 10 16:41:36 2014 +0200
disable bsh and js for now
---
changelog | 3 ++-
rules | 2 ++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/changelog b/changelog
index 2eb5bfc..6da9add 100644
--- a/changelog
+++ b/changelog
@@ -1,8 +1,9 @@
-libreoffice (1:4.3.0~beta1-1ubuntu1~utopic6) utopic; urgency=medium
+libreoffice (1:4.3.0~beta1-1ubuntu1~utopic7) utopic; urgency=medium
* disable all tests for now: works in local pbuilder, but apparently not in
the PPA one
* update and bring back lp-1296715.diff, which is not yet upstreamed
+ * disable bsh and js script providers for now
-- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Tue, 03 Jun 2014 01:04:10 +0200
diff --git a/rules b/rules
index 69f095e..8614c72 100755
--- a/rules
+++ b/rules
@@ -667,6 +667,8 @@ ifeq "$(DEB_VENDOR)" "Ubuntu"
ifneq (,$(filter armel armhf,$(DEB_HOST_ARCH)))
ENABLE_HELP=n
endif
+ ENABLE_SCRIPT_PROVIDER_BSH=n
+ ENABLE_SCRIPT_PROVIDER_JS=n
endif
CONFIGURE_FLAGS += $(foreach i, $(SYSTEM_STUFF),--with-system-$(i))
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git