[debian-edu-commits] debian-edu/ 04/05: tasks/desktop-*: Move things (desktop-other -> {gnome, kde, lxde, lxqt, mate, xfce}).

[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 0f8ce431e582d6c2e165fc26b75ca6b9cea69f27
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Wed May 9 10:48:30 2018 +0200

    tasks/desktop-*: Move things (desktop-other -> {gnome,kde,lxde,lxqt,mate,xfce}).
    
    Try another approach to decouple desktop=xxxx setup from desktop-other; move:
     - Recommends: education-astronomy, education-chemistry, education-electronics,
       education-geography, education-graphics, education-language,
       education-logic-games, education-mathematics, education-music,
       education-physics, education-misc
     - Suggests: education-primaryschool, education-development
    from desktop-other to desktop-{gnome,kde,lxde,lxqt,mate,xfce}.
    This would hopefully avoid installing the application related meta-packages if
    desktop=xxxx has been removed from the kernel command line at installation time.
---
 tasks/desktop-gnome | 16 ++++++++++++++++
 tasks/desktop-kde   | 16 ++++++++++++++++
 tasks/desktop-lxde  | 16 ++++++++++++++++
 tasks/desktop-lxqt  | 16 ++++++++++++++++
 tasks/desktop-mate  | 16 ++++++++++++++++
 tasks/desktop-other | 16 ----------------
 tasks/desktop-xfce  | 16 ++++++++++++++++
 7 files changed, 96 insertions(+), 16 deletions(-)

diff --git a/tasks/desktop-gnome b/tasks/desktop-gnome
index 539eb50..27a43be 100644
--- a/tasks/desktop-gnome
+++ b/tasks/desktop-gnome
@@ -19,3 +19,19 @@ Recommends:
 
 Recommends:
  ssh-askpass-gnome | ssh-askpass,
+
+Recommends:
+ education-astronomy,
+ education-chemistry,
+ education-electronics,
+ education-geography,
+ education-graphics,
+ education-language,
+ education-logic-games,
+ education-mathematics,
+ education-music,
+ education-physics,
+ education-misc,
+Suggests:
+ education-primaryschool,
+ education-development,
diff --git a/tasks/desktop-kde b/tasks/desktop-kde
index 454ab9d..c698298 100644
--- a/tasks/desktop-kde
+++ b/tasks/desktop-kde
@@ -79,3 +79,19 @@ Recommends:
 
 Recommends:
  ksshaskpass | ssh-askpass,
+
+Recommends:
+ education-astronomy,
+ education-chemistry,
+ education-electronics,
+ education-geography,
+ education-graphics,
+ education-language,
+ education-logic-games,
+ education-mathematics,
+ education-music,
+ education-physics,
+ education-misc,
+Suggests:
+ education-primaryschool,
+ education-development,
diff --git a/tasks/desktop-lxde b/tasks/desktop-lxde
index c621105..a1b8ef3 100644
--- a/tasks/desktop-lxde
+++ b/tasks/desktop-lxde
@@ -29,3 +29,19 @@ Recommends:
 
 Recommends:
  ssh-askpass,
+
+Recommends:
+ education-astronomy,
+ education-chemistry,
+ education-electronics,
+ education-geography,
+ education-graphics,
+ education-language,
+ education-logic-games,
+ education-mathematics,
+ education-music,
+ education-physics,
+ education-misc,
+Suggests:
+ education-primaryschool,
+ education-development,
diff --git a/tasks/desktop-lxqt b/tasks/desktop-lxqt
index 3685d5f..516a3a8 100644
--- a/tasks/desktop-lxqt
+++ b/tasks/desktop-lxqt
@@ -29,3 +29,19 @@ Recommends:
 
 Recommends:
  ssh-askpass,
+
+Recommends:
+ education-astronomy,
+ education-chemistry,
+ education-electronics,
+ education-geography,
+ education-graphics,
+ education-language,
+ education-logic-games,
+ education-mathematics,
+ education-music,
+ education-physics,
+ education-misc,
+Suggests:
+ education-primaryschool,
+ education-development,
diff --git a/tasks/desktop-mate b/tasks/desktop-mate
index df26632..fed24ef 100644
--- a/tasks/desktop-mate
+++ b/tasks/desktop-mate
@@ -36,3 +36,19 @@ Recommends:
 
 Recommends:
  ssh-askpass-gnome | ssh-askpass,
+
+Recommends:
+ education-astronomy,
+ education-chemistry,
+ education-electronics,
+ education-geography,
+ education-graphics,
+ education-language,
+ education-logic-games,
+ education-mathematics,
+ education-music,
+ education-physics,
+ education-misc,
+Suggests:
+ education-primaryschool,
+ education-development,
diff --git a/tasks/desktop-other b/tasks/desktop-other
index 54e9459..b0ec3ab 100644
--- a/tasks/desktop-other
+++ b/tasks/desktop-other
@@ -21,22 +21,6 @@ Description: Debian Edu common desktop applications
    - sv (Swedish)
 
 Recommends:
- education-astronomy,
- education-chemistry,
- education-electronics,
- education-geography,
- education-graphics,
- education-language,
- education-logic-games,
- education-mathematics,
- education-music,
- education-physics,
- education-misc,
-Suggests:
- education-primaryschool,
- education-development,
-
-Recommends:
  kdeedu,
 
 Recommends:
diff --git a/tasks/desktop-xfce b/tasks/desktop-xfce
index d51ddeb..11b237d 100644
--- a/tasks/desktop-xfce
+++ b/tasks/desktop-xfce
@@ -27,3 +27,19 @@ Recommends:
 
 Recommends:
  ssh-askpass,
+
+Recommends:
+ education-astronomy,
+ education-chemistry,
+ education-electronics,
+ education-geography,
+ education-graphics,
+ education-language,
+ education-logic-games,
+ education-mathematics,
+ education-music,
+ education-physics,
+ education-misc,
+Suggests:
+ education-primaryschool,
+ education-development,

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