[libreoffice] 10/13: use ${java-runtime-depends} for -nlpsolver
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.2
in repository libreoffice.
commit b827d965307c625fd39451adc9d983b602fdf3b4
Author: Rene Engelhard <rene@debian.org>
Date: Sat Jun 18 17:41:30 2016 +0200
use ${java-runtime-depends} for -nlpsolver
---
control.nlpsolver.in | 2 +-
rules | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/control.nlpsolver.in b/control.nlpsolver.in
index 5e8129e..69a0a5f 100644
--- a/control.nlpsolver.in
+++ b/control.nlpsolver.in
@@ -1,6 +1,6 @@
Package: libreoffice-nlpsolver
Architecture: all
-Depends: ${misc:Depends}, libreoffice-calc (>= 1:3.0~), libreoffice-core (>= 1:3.3~), libreoffice-java-common, default-jre-headless | java5-runtime | java6-runtime
+Depends: ${misc:Depends}, libreoffice-calc (>= 1:3.0~), libreoffice-core (>= 1:3.3~), libreoffice-java-common, ${java-runtime-depends}
Description: "Solver for Nonlinear Programming" extension for LibreOffice
By default LibreOffice Calc ships with a solver engine for linear
programming only. This allows the optimization of models to a certain degree.
diff --git a/rules b/rules
index 7a49b83..5e512e4 100755
--- a/rules
+++ b/rules
@@ -3572,6 +3572,7 @@ ifeq "$(ENABLE_MEDIAWIKI)" "y"
endif
ifeq "$(ENABLE_NLPSOLVER)" "y"
dh_gencontrol -plibreoffice-nlpsolver -- \
+ -V'java-runtime-depends=$(JAVA_RUNTIME_DEPENDS)' \
-v$(shell grep "<version" $(SOURCE_TREE)/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/description.xml | perl -pi -e 's,<version value=\"(.*)\"/>,\1,; s/^\s+//')+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
endif
ifeq "$(ENABLE_REPORTDESIGN)" "y"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: