[libreoffice] 02/02: use new libbsh-java instead of bsh
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit 786a04a9049566a9559ba8c55ac0180aec6198b9
Author: Rene Engelhard <rene@debian.org>
Date: Fri Nov 29 17:15:23 2013 +0100
use new libbsh-java instead of bsh
---
changelog | 6 ++++--
control | 8 ++++----
rules | 6 ++++++
3 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/changelog b/changelog
index cd06db0..cf78b67 100644
--- a/changelog
+++ b/changelog
@@ -1,9 +1,11 @@
-libreoffice (1:4.1.3-2) UNRELEASED; urgency=low
+libreoffice (1:4.1.3-2) UNRELEASED; urgency=medium
* debian/control:
- regen control with new default-jdk (aka use openjdk on kfreebsd)
+ * debian/rules:
+ - use new libbsh-java instead of bsh
- -- Rene Engelhard <rene@rene-engelhard.de> Sun, 24 Nov 2013 13:56:00 +0100
+ -- Rene Engelhard <rene@debian.org> Fri, 29 Nov 2013 17:13:33 +0100
libreoffice (1:4.1.3-1) unstable; urgency=low
diff --git a/control b/control
index 695b7c3..c0417be 100644
--- a/control
+++ b/control
@@ -122,12 +122,12 @@ Build-Depends: ant (>= 1.7.0),
xulrunner-dev,
zip,
zlib1g-dev
-Build-Depends-Indep: bsh (>= 2.0b4),
- doxygen,
+Build-Depends-Indep: doxygen,
fdupes,
fontforge,
imagemagick,
libbase-java [!hppa],
+ libbsh-java,
libcommons-codec-java,
libcommons-httpclient-java,
libcommons-lang-java,
@@ -170,7 +170,7 @@ XS-Python3-Version: 3.3
XS-Testsuite: autopkgtest
Vcs-Git: https://alioth.debian.org/anonscm/git/pkg-openoffice/libreoffice.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-openoffice/libreoffice.git
-Bugs:
+Bugs: mailto:debian-openoffice@lists.debian.org
Homepage: http://www.libreoffice.org
Package: libreoffice
@@ -4439,7 +4439,6 @@ Depends: ant (>= 1.7.0),
automake,
bc,
bison,
- bsh (>= 2.0b4),
bzip2,
cpp-4.7,
debhelper (>= 7.2.3~),
@@ -4464,6 +4463,7 @@ Depends: ant (>= 1.7.0),
libbluetooth-dev,
libboost-date-time-dev (>= 1.49.0-4),
libboost-dev (>= 1.49.0-4),
+ libbsh-java,
libcairo2-dev,
libcdr-dev,
libclucene-dev (>= 2.3.3.4-2),
diff --git a/rules b/rules
index 22cb116..a448609 100755
--- a/rules
+++ b/rules
@@ -1221,9 +1221,15 @@ ifeq "$(ENABLE_JAVA)" "y"
endif
ifeq "$(ENABLE_SCRIPT_PROVIDER_BSH)" "y"
ifneq (,$(filter beanshell, $(SYSTEM_STUFF)))
+ ifneq "$(WHEEZY_BACKPORT)" "y"
+ # -gcj is gone
+ BUILD_DEPS_INDEP += , libbsh-java
+ BSH_DEPENDS = libbsh-java
+ else
BUILD_DEPS_INDEP += , bsh (>= 2.0b4)$(OOO_NO_JAVA_ARCHS)
BSH_DEPENDS = bsh (>= 2.0b4)
JAVA_GCJ_DEPENDS += , bsh-gcj [$(OOO_GCJ_ARCHS)]
+ endif
endif
CONFIGURE_FLAGS += --enable-scripting-beanshell
else
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: