[libreoffice] 01/01: add missing -java-common Depends: to -script-provider-{bsh, js} and add missing JRE depends to -wiki-publisher

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch master
in repository libreoffice.

commit 6a02b4d4a2e245f8df57a421ef39e53174d782fd
Author: Rene Engelhard <rene at debian.org>
Date:   Sun Mar 26 10:21:23 2017 +0200

    add missing -java-common Depends: to -script-provider-{bsh,js} and add missing JRE depends to -wiki-publisher
---
 changelog            | 10 ++++++++++
 control              |  7 +++++--
 control.in           |  2 ++
 control.mediawiki.in |  3 ++-
 control.nlpsolver.in |  2 +-
 5 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/changelog b/changelog
index b0e40ec..41de89b 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,13 @@
+libreoffice (1:5.2.6-3) UNRELEASED; urgency=medium
+
+  * debian/control.in:
+    - add missing -java-common Depends: to -script-provider-{bsh,js}
+  * debian/control.mediawiki.in:
+    - add missing JRE depends
+  (thanks to Daniel Richard G. for those two, see #858655)
+
+ -- Rene Engelhard <rene at debian.org>  Sun, 26 Mar 2017 00:47:55 +0100
+
 libreoffice (1:5.2.6-2) unstable; urgency=medium
 
   * debian/rules:
diff --git a/control b/control
index 52398b1..b433caa 100644
--- a/control
+++ b/control
@@ -797,6 +797,7 @@ Section: java
 Pre-Depends: ${misc:Pre-Depends}
 Depends: libreoffice-common (>= 1:3.5.0~alpha0~),
          libreoffice-core (>= 1:3.5.0~alpha0~),
+         ${java-common-depends},
          ${java-runtime-depends},
          ${java:Depends},
          ${misc:Depends}
@@ -819,6 +820,7 @@ Replaces: libreoffice-common (<< 1:3.4~)
 Pre-Depends: ${misc:Pre-Depends}
 Depends: libreoffice-common (>= 1:3.5.0~alpha0~),
          libreoffice-core (>= 1:3.5.0~alpha0~),
+         ${java-common-depends},
          ${java-runtime-depends},
          ${java:Depends},
          ${misc:Depends}
@@ -4275,7 +4277,8 @@ Section: misc
 Architecture: all
 Pre-Depends: ${java-runtime-depends}
 Depends: libreoffice-core (>= 1:3.4~),
-         libreoffice-java-common,
+         ${java-common-depends},
+         ${java-runtime-depends},
          ${java:Depends},
          ${misc:Depends}
 Enhances: libreoffice-writer
@@ -4332,7 +4335,7 @@ Package: libreoffice-nlpsolver
 Architecture: all
 Depends: libreoffice-calc (>= 1:3.0~),
          libreoffice-core (>= 1:3.3~),
-         libreoffice-java-common,
+         ${java-common-depends},
          ${java-runtime-depends},
          ${misc:Depends}
 Section: math
diff --git a/control.in b/control.in
index 5495424..7342424 100644
--- a/control.in
+++ b/control.in
@@ -631,6 +631,7 @@ Section: java
 Pre-Depends: ${misc:Pre-Depends}
 Depends: libreoffice-common (>= 1:3.5.0~alpha0~),
          libreoffice-core (>= 1:3.5.0~alpha0~),
+         ${java-common-depends},
          ${java:Depends},
          ${java-runtime-depends},
          ${misc:Depends}
@@ -653,6 +654,7 @@ Replaces: libreoffice-common (<< 1:3.4~)
 Pre-Depends: ${misc:Pre-Depends}
 Depends: libreoffice-common (>= 1:3.5.0~alpha0~),
          libreoffice-core (>= 1:3.5.0~alpha0~),
+         ${java-common-depends},
          ${java:Depends},
          ${java-runtime-depends},
          ${misc:Depends}
diff --git a/control.mediawiki.in b/control.mediawiki.in
index a6c5af5..31a5f91 100644
--- a/control.mediawiki.in
+++ b/control.mediawiki.in
@@ -3,8 +3,9 @@ Section: misc
 Architecture: all
 Pre-Depends: ${java-runtime-depends}
 Depends: libreoffice-core (>= 1:3.4~),
-         libreoffice-java-common,
+         ${java-common-depends},
          ${java:Depends},
+         ${java-runtime-depends},
          ${misc:Depends}
 Enhances: libreoffice-writer
 Conflicts: libreoffice-common (<< 1:3.5~),
diff --git a/control.nlpsolver.in b/control.nlpsolver.in
index f0e4bb8..ff92f25 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, ${java-runtime-depends}
+Depends: ${misc:Depends}, libreoffice-calc (>= 1:3.0~), libreoffice-core (>= 1:3.3~), ${java-common-depends}, ${java-runtime-depends}
 Section: math
 Priority: extra
 Description: "Solver for Nonlinear Programming" extension for LibreOffice

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git