[libreoffice] 06/06: make libreoffice meta-package only recommend libreoffice-java-common (closes: #858655)

[Rene Engelhard]

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

rene pushed a commit to branch debian-experimental-5.3
in repository libreoffice.

commit 953d1736ec68890e0f8f26f8315ad0f106b55604
Author: Rene Engelhard <rene at debian.org>
Date:   Wed Mar 29 12:49:42 2017 +0200

    make libreoffice meta-package only recommend libreoffice-java-common (closes: #858655)
---
 changelog  | 5 ++++-
 control    | 4 ++--
 control.in | 4 ++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/changelog b/changelog
index 6b57391..868546b 100644
--- a/changelog
+++ b/changelog
@@ -15,8 +15,11 @@ libreoffice (1:5.3.2~rc1-1) UNRELEASED; urgency=medium
   * debian/control.mediawiki.in:
     - add missing JRE depends
   (thanks to Daniel Richard G. for those two, see #858655)
+  * debian/control.in:
+   - make libreoffice meta-package only recommend libreoffice-java-common
+     (closes: #858655)
 
- -- Rene Engelhard <rene at debian.org>  Mon, 27 Mar 2017 15:03:46 +0200
+ -- Rene Engelhard <rene at debian.org>  Wed, 29 Mar 2017 12:48:44 +0200
 
 libreoffice (1:5.3.1-1) experimental; urgency=medium
 
diff --git a/control b/control
index 3fcba89..d969c6a 100644
--- a/control
+++ b/control
@@ -203,7 +203,6 @@ Depends: libreoffice-base [!hppa !ia64 !mips64 !s390 !sparc],
          libreoffice-writer,
          ${avmedia-be-depends},
          ${dejavu-depends},
-         ${java-common-depends},
          ${misc:Depends},
          ${pyuno-depends}
 Recommends: fonts-crosextra-caladea,
@@ -219,7 +218,8 @@ Recommends: fonts-crosextra-caladea,
             libreoffice-script-provider-js,
             libreoffice-script-provider-python,
             libreoffice-sdbc-postgresql,
-            libreoffice-wiki-publisher
+            libreoffice-wiki-publisher,
+            ${java-common-depends}
 Suggests: cups-bsd,
           hunspell-dictionary,
           hyphen-hyphenation-patterns,
diff --git a/control.in b/control.in
index ac5d168..ee35844 100644
--- a/control.in
+++ b/control.in
@@ -42,10 +42,10 @@ Depends: libreoffice-base%OOO_NO_BASE_ARCHS%,
          libreoffice-writer,
          ${avmedia-be-depends},
          ${dejavu-depends},
-         ${java-common-depends},
          ${misc:Depends},
          ${pyuno-depends}
-Recommends: fonts-sil-gentium-basic,
+Recommends: ${java-common-depends},
+            fonts-sil-gentium-basic,
             fonts-crosextra-caladea,
             fonts-crosextra-carlito,
             fonts-linuxlibertine,

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