[debian-edu-commits] debian-edu/ 21/23: tasks/desktop-other: Downgrade Depends to 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 6d0650044fda85dfd7c718ccc2c0a08d8211d9a4
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Wed May 2 15:19:52 2018 +0200

    tasks/desktop-other: Downgrade Depends to Recommends.
    
    Drop packages already pulled in via other dependencies.
    Add packages common to all supported desktops which have been removed from the
    related desktop task file to have the packages available regardless which
    desktop has been chosen.
    
    Add 'Enhances: education-desktop-gnome, education-desktop-kde,
    education-desktop-lxde, education-desktop-lxqt, education-desktop-mate,
    education-desktop-xfce' to match the changed dependency order.
    
    Add 'Suggests: education-development' to get the related packages onto the USB
    ISO image.
---
 tasks/desktop-other | 53 ++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 36 insertions(+), 17 deletions(-)

diff --git a/tasks/desktop-other b/tasks/desktop-other
index acb3eb5..ac56d11 100644
--- a/tasks/desktop-other
+++ b/tasks/desktop-other
@@ -1,8 +1,9 @@
 Task: Desktop-other
 Section: metapackages
 Architecture: any
+Enhances: education-desktop-gnome, education-desktop-kde, education-desktop-lxde, education-desktop-lxqt, education-desktop-mate, education-desktop-xfce
 Test-edu-profile: Workstation LTSP-Server Standalone
-Description: Debian Edu non-GNOME- and non-KDE-specific desktop applications
+Description: Debian Edu common desktop applications
  This metapackage depends on various office and desktop applications
  that are useful for teachers and their students.
  .
@@ -34,11 +35,12 @@ Recommends:
  education-misc,
 Suggests:
  education-primaryschool,
+ education-development,
 
-Depends:
- xorg,
- xserver-xorg-input-all,
- xserver-xorg-video-all,
+Recommends:
+ kdeedu,
+
+Recommends:
  libgl1-mesa-dri,
  numlockx,
  unifont,
@@ -56,10 +58,10 @@ Suggests:
 Suggests:
  fonts-larabie-deco,
 
-Depends:
+Recommends:
  synaptic,
 
-Depends:
+Recommends:
  alsa-utils,
 
 Recommends:
@@ -252,19 +254,19 @@ Recommends:
  default-jre,
  icedtea-8-plugin,
 
-Depends:
+Recommends:
  debian-edu-artwork,
  plymouth,
  plymouth-themes,
 NeedConfig: yes - kdm and kde need to be configured to use it.
 
-Depends:
- gnupg2 | gnupg,
+Recommends:
+ gnupg,
  gnupg-agent,
 Avoid:
  pgp,
 
-Depends:
+Recommends:
  avahi-daemon,
  libnss-mdns,
 Suggests:
@@ -272,24 +274,24 @@ Suggests:
  mdns-scan,
  avahi-autoipd,
 
-Depends:
+Recommends:
  cups-client,
  cups-bsd,
 
-Depends:
+Recommends:
  unzip,
  zip,
  bzip2,
 
-Depends:
+Recommends:
  isc-dhcp-client,
 Avoid:
  pump,
 
-Depends:
+Recommends:
  freerdp2-x11 | rdesktop
 
-Depends:
+Recommends:
  ktuberling,
 
 Recommends:
@@ -464,7 +466,24 @@ NeedConfig: yes - the site admin needs to put printers and networks into /etc/st
 
 Recommends:
  gir1.2-vte-2.91,
+ kvpm
+
+Recommends:
+ totem | dragonplayer | vlc | kaffeine | xine-ui | mplayer,
 
 Recommends:
- kvpm,
+ lightdm | x-display-manager,
+NeedConfig: yes - artwork
+
+Suggests:
+ krb5-auth-dialog,
 
+Suggests:
+ kredentials,
+
+Suggests:
+ jxplorer,
+
+Suggests:
+ gosa-desktop,
+NeedConfig: yes - override upstream url using /etc/gosa/desktoprc

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