[debian-edu-commits] debian-edu/ 02/06: tasks/desktop-*: Re-arrange installation of libreoffice non-l10n packages. Basically, install libreoffice via the desktop-other task.

[Mike Gabriel]

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

sunweaver pushed a commit to branch master
in repository debian-edu.

commit 5709f3128a465e4a407142ef848d9b67bce79e2c
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Aug 13 17:40:58 2017 -0400

    tasks/desktop-*: Re-arrange installation of libreoffice non-l10n packages. Basically, install libreoffice via the desktop-other task.
---
 debian/changelog    |  2 ++
 tasks/desktop-gnome |  6 ------
 tasks/desktop-kde   |  5 +++--
 tasks/desktop-mate  | 10 +---------
 tasks/desktop-other |  6 ++++--
 5 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2ad700c..d9aacb4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -64,6 +64,8 @@ debian-edu (1.925) UNRELEASED; urgency=medium
     packages get pulled in via task desktop-other. (Closes: #871836).
   * tasks/desktop-gnome: De-promote libreoffice related packages and the
     mediaplayer packages from Depends: to Recommends:.
+  * tasks/desktop-*: Re-arrange installation of libreoffice non-l10n packages.
+    Basically, install libreoffice via the desktop-other task.
 
   [ Holger Levsen ]
   * Add sources.list.buster and make sources.list.UNRELEASED symlink point to
diff --git a/tasks/desktop-gnome b/tasks/desktop-gnome
index 0ca5ba2..e967dad 100644
--- a/tasks/desktop-gnome
+++ b/tasks/desktop-gnome
@@ -28,12 +28,6 @@ Avoid:
 Recommends:
  libreoffice-gnome,
  libreoffice-gtk3,
- libreoffice-writer,
- libreoffice-calc,
- libreoffice-impress,
- libreoffice-draw,
- libreoffice-math,
- libreoffice-base,
  libreoffice-filter-binfilter,
  libreoffice-java-common,
 
diff --git a/tasks/desktop-kde b/tasks/desktop-kde
index 45e4374..abee041 100644
--- a/tasks/desktop-kde
+++ b/tasks/desktop-kde
@@ -60,11 +60,12 @@ Avoid:
  xdm,
 NeedConfig: yes - artwork
 
-Depends:
+Recommends:
  dragonplayer | totem | vlc | kaffeine | xine-ui | mplayer,
 
-Depends:
+Recommends:
  kdeedu,
+
 Recommends:
  print-manager,
  kwalletmanager,
diff --git a/tasks/desktop-mate b/tasks/desktop-mate
index 8f094f4..957b3a9 100644
--- a/tasks/desktop-mate
+++ b/tasks/desktop-mate
@@ -25,15 +25,7 @@ Avoid:
  xdm,
 
 Depends:
- libreoffice-gtk2,
- libreoffice-writer,
- libreoffice-calc,
- libreoffice-impress,
- libreoffice-draw,
- libreoffice-math,
- libreoffice-base,
- libreoffice-filter-binfilter,
- libreoffice-java-common,
+ libreoffice-gtk3,
 
 Depends:
  vlc | xine-ui | kaffeine | mplayer | totem | dragonplayer,
diff --git a/tasks/desktop-other b/tasks/desktop-other
index 127cd7c..6f1986b 100644
--- a/tasks/desktop-other
+++ b/tasks/desktop-other
@@ -31,9 +31,12 @@ Depends:
 Depends:
  alsa-utils,
 
-Depends:
+Recommends:
  gcj-jre-headless,
  libreoffice,
+ libreoffice-filter-binfilter
+ libreoffice-java-common
+
 Recommends:
  libreoffice-l10n-el,
  libreoffice-l10n-de,
@@ -51,7 +54,6 @@ Recommends:
  openclipart-libreoffice,
  openclipart,
 Suggests:
- libreoffice-filter-binfilter,
  libreoffice-l10n-en-za,
  libreoffice-help-zh-tw,
  libreoffice-l10n-zh-tw,

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