[libreoffice] 29/36: reenable bsh/js providers, reverts 7236163c
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 4beef7b53a81764b3daedf38aa0abfd549d4177b
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Thu Jun 12 19:32:11 2014 +0200
reenable bsh/js providers, reverts 7236163c
---
changelog | 5 ++---
rules | 2 --
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/changelog b/changelog
index 6da9add..144c002 100644
--- a/changelog
+++ b/changelog
@@ -1,11 +1,10 @@
-libreoffice (1:4.3.0~beta1-1ubuntu1~utopic7) utopic; urgency=medium
+libreoffice (1:4.3.0~beta1-1ubuntu1~utopic8) 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
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Thu, 12 Jun 2014 19:33:37 +0200
libreoffice (1:4.3.0~beta1-1ubuntu1~utopic1) utopic; urgency=medium
diff --git a/rules b/rules
index 8614c72..69f095e 100755
--- a/rules
+++ b/rules
@@ -667,8 +667,6 @@ 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
Reply to: