[debian-edu-commits] debian-edu/ 01/01: tasks/desktop-other: Adjust libreoffice related Recommends.

[Wolfgang Schweer]

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

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

commit bf64667434f870eb257eb707bbb877db87d0a38d
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Tue Apr 3 20:31:10 2018 +0200

    tasks/desktop-other: Adjust libreoffice related Recommends.
    
    Drop gcj-jre-headless (gcj will be removed soon and default-jre is already
    recommended).
    
    Drop libreoffice-java-common (already pulled in recursively).
---
 debian-edu-tasks.desc | 10 ----------
 debian/changelog      |  6 +++++-
 debian/control        |  6 ++----
 tasks/desktop-other   |  2 --
 4 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/debian-edu-tasks.desc b/debian-edu-tasks.desc
index 2013956..b85b8f0 100644
--- a/debian-edu-tasks.desc
+++ b/debian-edu-tasks.desc
@@ -755,9 +755,7 @@ Packages: list
  childsplay
  vym
  scratch
- gcj-jre-headless
  libreoffice
- libreoffice-java-common
  libreoffice-l10n-ca
  libreoffice-l10n-de
  libreoffice-l10n-el
@@ -1477,9 +1475,7 @@ Packages: list
  childsplay
  vym
  scratch
- gcj-jre-headless
  libreoffice
- libreoffice-java-common
  libreoffice-l10n-ca
  libreoffice-l10n-de
  libreoffice-l10n-el
@@ -2246,9 +2242,7 @@ Packages: list
  childsplay
  vym
  scratch
- gcj-jre-headless
  libreoffice
- libreoffice-java-common
  libreoffice-l10n-ca
  libreoffice-l10n-de
  libreoffice-l10n-el
@@ -2595,9 +2589,7 @@ Packages: list
  childsplay
  vym
  scratch
- gcj-jre-headless
  libreoffice
- libreoffice-java-common
  libreoffice-l10n-ca
  libreoffice-l10n-de
  libreoffice-l10n-el
@@ -2981,9 +2973,7 @@ Packages: list
  childsplay
  vym
  scratch
- gcj-jre-headless
  libreoffice
- libreoffice-java-common
  libreoffice-l10n-ca
  libreoffice-l10n-de
  libreoffice-l10n-el
diff --git a/debian/changelog b/debian/changelog
index 8970c00..a491a3d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,11 @@ debian-edu (2.10.21) UNRELEASED; urgency=medium
   * debian/tests/test-tasksel-desktop: Add lxqt to the list of desktops to test.
   * debian/tests/control; Reduce number of test combinations:
     - kde: full range of profiles, others: only profile 'Workstation'.
-
+  * tasks/desktop-other: Adjust libreoffice related Recommends.
+    - Drop gcj-jre-headless (gcj will be removed soon and default-jre is
+      already recommended).
+    - Drop libreoffice-java-common (already pulled in recursively).
+  
  -- Wolfgang Schweer <wschweer at arcor.de>  Fri, 30 Mar 2018 16:37:15 +0200
 
 debian-edu (2.10.20) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 15a59d1..1c6bd28 100644
--- a/debian/control
+++ b/debian/control
@@ -443,7 +443,6 @@ Recommends: cheese,
  firefox-esr-l10n-pt-br,
  firefox-esr-l10n-ru,
  firefox-esr-l10n-sv-se,
- gcj-jre-headless,
  gimp,
  gimp-data-extras,
  gimp-help-ca,
@@ -486,7 +485,6 @@ Recommends: cheese,
  libreoffice-help-pt-br,
  libreoffice-help-ru,
  libreoffice-help-sv,
- libreoffice-java-common,
  libreoffice-l10n-ca,
  libreoffice-l10n-de,
  libreoffice-l10n-el,
@@ -1320,13 +1318,13 @@ Package: education-primaryschool
 Section: metapackages
 Architecture: any
 Depends: ${misc:Depends},
- education-tasks (= ${source:Version})
+ education-tasks (= ${source:Version}),
+ gcompris-qt
 Recommends: education-menus,
  gnucap,
  gnuchess,
  tuxpaint,
  tuxpaint-config
-Suggests: gcompris-qt
 Description: Debian Edu applications for primary school level
  This metapackage depends on various applications that are recommended
  for teaching students at primary school level.
diff --git a/tasks/desktop-other b/tasks/desktop-other
index 9c6a55e..c3c5500 100644
--- a/tasks/desktop-other
+++ b/tasks/desktop-other
@@ -63,9 +63,7 @@ Depends:
  alsa-utils,
 
 Recommends:
- gcj-jre-headless,
  libreoffice,
- libreoffice-java-common
 
 Recommends:
  libreoffice-l10n-ca,

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