[libreoffice] 05/05: make -sdbc-hsqldb also depend on ${java-runtime-depends}
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit 00f0cbb0c27fa3878c24545580a56945a7e46d36
Author: Rene Engelhard <rene@debian.org>
Date: Thu Mar 31 20:03:46 2016 +0200
make -sdbc-hsqldb also depend on ${java-runtime-depends}
---
changelog | 1 +
control | 1 +
control.in | 2 +-
3 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/changelog b/changelog
index dc2a170..fa2cffe 100644
--- a/changelog
+++ b/changelog
@@ -11,6 +11,7 @@ libreoffice (1:5.1.2~rc2-1) UNRELEASED; urgency=medium
upgrades.
* debian/control[,.subsequentcheckbase}.in: remove hardcoded Java depends,
use ${java:Depends}
+ * debian/control.in: make -sdbc-hsqldb also depend on ${java-runtime-depends}
* debian/libreoffice-{core,sdbc-firebird}.bug-script.in: fix; LO still uses
/4 in the profile
* debian/ure.bug-script: add, run javaldx
diff --git a/control b/control
index 1e96c0a..75ab7e7 100644
--- a/control
+++ b/control
@@ -897,6 +897,7 @@ Package: libreoffice-sdbc-hsqldb
Pre-Depends: ${misc:Pre-Depends}
Depends: libreoffice-core,
${java-common-depends},
+ ${java-runtime-depends},
${java:Depends},
${misc:Depends},
${shlibs:Depends}
diff --git a/control.in b/control.in
index 4c5c333..dbc4d1c 100644
--- a/control.in
+++ b/control.in
@@ -723,7 +723,7 @@ Description: Firebird SDBC driver for LibreOffice
Package: libreoffice-sdbc-hsqldb
Pre-Depends: ${misc:Pre-Depends}
-Depends: libreoffice-core, ${java-common-depends}, ${java:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Depends: libreoffice-core, ${java-common-depends}, ${java:Depends}, ${java-runtime-depends}, ${shlibs:Depends}, ${misc:Depends}
Replaces: libreoffice-base (<< 1:4.2~)
Architecture: %OOO_JAVA_ARCHS%
Section: database
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: