[libreoffice] 01/03: rework libreoffice metapackage "dependencies

[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 ad643db0efe3a43155c2cd33fd2035132e20e527
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Sep 12 23:55:14 2016 +0200

    rework libreoffice metapackage "dependencies
    
    - Recommend everything (except GNOME/KDE integration and similar) which
      the upstream .tar.gz contains.
    - make libreoffice only Recommend the fonts. Mention it recommends
      extra stuff like fonts to resemble a upstream install, thanks Fabian Greffrath
---
 changelog  | 21 ++++++++++++++++++---
 control    | 19 ++++++++++++++++---
 control.in | 15 +++++++++++++++
 3 files changed, 49 insertions(+), 6 deletions(-)

diff --git a/changelog b/changelog
index c29910b..0c41614 100644
--- a/changelog
+++ b/changelog
@@ -2,9 +2,24 @@ libreoffice (1:5.2.1-2) UNRELEASED; urgency=medium
 
   * debian/rules: install typesizes.h into
     usr/include/$(DEB_HOST_MULTIARCH)/libreoffice/sal/typesizes.h
-  * debian/control.in: remove
-    libreoffice-report-builder-bin [kfreebsd-i386 kfreebsd-amd64] Conflicts:
-    from -core, thanks Jon Boden (closes: #836887)
+  * debian/control.in:
+    - remove libreoffice-report-builder-bin [kfreebsd-i386 kfreebsd-amd64]
+      Conflicts: from -core, thanks Jon Boden (closes: #836887)
+    - rework libreoffice metapackage "dependencies":
+      + Recommend everything (except GNOME/KDE integration and similar) which
+        the upstream .tar.gz contains:
+         libreoffice-script-provider-bsh,
+         libreoffice-script-provider-js,
+         libreoffice-script-provider-python,
+         libreoffice-ogltrans,
+         libreoffice-librelogo,
+         libreoffice-nlpsolver,
+         libreoffice-pdfimport,
+         libreoffice-wiki-publisher
+         libreoffice-sdbc-postgresql
+      + make libreoffice only Recommend the fonts. Mention it recommends
+        extra stuff like fonts to resemble a upstream install, thanks
+        Fabian Greffrath (closes: #836416)
 
   * merge from Ubuntu:
     - uno-libs: Create the libuno_* symlinks in the multiarch libdir
diff --git a/control b/control
index d9fe230..fd2cab4 100644
--- a/control
+++ b/control
@@ -213,6 +213,19 @@ Depends: fonts-crosextra-caladea,
          ${java-common-depends},
          ${misc:Depends},
          ${pyuno-depends}
+Recommends: fonts-crosextra-caladea,
+            fonts-crosextra-carlito,
+            fonts-linuxlibertine,
+            fonts-sil-gentium-basic,
+            libreoffice-librelogo,
+            libreoffice-nlpsolver,
+            libreoffice-ogltrans,
+            libreoffice-pdfimport,
+            libreoffice-script-provider-bsh,
+            libreoffice-script-provider-js,
+            libreoffice-script-provider-python,
+            libreoffice-sdbc-postgresql,
+            libreoffice-wiki-publisher
 Suggests: cups-bsd,
           hunspell-dictionary,
           hyphen-hyphenation-patterns,
@@ -246,6 +259,8 @@ Description: office productivity suite (metapackage)
   * libreoffice-draw: Drawing
   * libreoffice-base: Database
   * libreoffice-math: Equation editor
+ It also recommends additional packages (e.g. fonts) in order to match an
+ upstream LibreOffice install as closely as possible.
  .
  You can extend the functionality of LibreOffice by installing these
  packages:
@@ -418,9 +433,7 @@ Breaks: cli-uno-bridge (<< 1:3.0.0~dev300m22),
         myspell-sw (<< 1:3.1.0-3),
         myspell-th (<< 1:3.1.0-3),
         myspell-tl (<< 0.4-0-5)
-Conflicts: cacao-oj6-jre,
-           libreoffice-filter-binfilter,
-           libreoffice-unbundled
+Conflicts: cacao-oj6-jre, libreoffice-filter-binfilter, libreoffice-unbundled
 Provides: libreoffice-bundled
 Replaces: libreoffice-calc (<< 1:3.3.2-5),
           libreoffice-common (<< 1:4.4.0~rc3-1),
diff --git a/control.in b/control.in
index 237b1de..078f70c 100644
--- a/control.in
+++ b/control.in
@@ -52,6 +52,19 @@ Depends: fonts-sil-gentium-basic,
          fonts-crosextra-caladea,
          fonts-crosextra-carlito,
          fonts-linuxlibertine
+Recommends: fonts-sil-gentium-basic,
+            fonts-crosextra-caladea,
+            fonts-crosextra-carlito,
+            fonts-linuxlibertine,
+            libreoffice-script-provider-bsh,
+            libreoffice-script-provider-js,
+            libreoffice-script-provider-python,
+            libreoffice-ogltrans,
+            libreoffice-librelogo,
+            libreoffice-nlpsolver,
+            libreoffice-pdfimport,
+            libreoffice-wiki-publisher, 
+            libreoffice-sdbc-postgresql
 Suggests: cups-bsd,
           hunspell-dictionary,
           hyphen-hyphenation-patterns,
@@ -84,6 +97,8 @@ Description: office productivity suite (metapackage)
   * libreoffice-draw: Drawing
   * libreoffice-base: Database
   * libreoffice-math: Equation editor
+ It also recommends additional packages (e.g. fonts) in order to match an
+ upstream LibreOffice install as closely as possible.
  .
  You can extend the functionality of LibreOffice by installing these
  packages:

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