[debian-edu-commits] debian-edu/ 01/03: Correct desktop task selection system to use our own edu-preferred-desktop tasksel test, as the new default-desktop test is not working the way we need. Without this fix, no desktop style is selected.

[Petter Reinholdtsen]

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

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

commit c50ba60c0a05728e02653c59172d81e1a1c84e33
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Thu Sep 25 19:57:40 2014 +0200

    Correct desktop task selection system to use our own
    edu-preferred-desktop tasksel test, as the new default-desktop
    test is not working the way we need.  Without this fix, no desktop
    style is selected.
---
 debian/changelog               |  4 ++++
 debian/edu-preferred-desktop   | 18 ++++++++++++++++++
 debian/education-tasks.install |  1 +
 tasks/desktop-gnome            |  2 +-
 tasks/desktop-kde              |  2 +-
 tasks/desktop-lxde             |  2 +-
 tasks/desktop-mate             |  2 +-
 tasks/desktop-xfce             |  2 +-
 8 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5aa308c..d3e00d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,10 @@ debian-edu (1.801~0.git.2014-09-24) unstable; urgency=low
   * Drop audacious as video player alternative from all desktop tasks.
     It is not a video player, and it is already listed in the music task
     as a audio player.
+  * Correct desktop task selection system to use our own
+    edu-preferred-desktop tasksel test, as the new default-desktop
+    test is not working the way we need.  Without this fix, no desktop
+    style is selected.
 
   [ Wolfgang Schweer ]
   * Drop non-existent packages celestia-kde and cl-geodesics from the
diff --git a/debian/edu-preferred-desktop b/debian/edu-preferred-desktop
new file mode 100755
index 0000000..0c4bcf3
--- /dev/null
+++ b/debian/edu-preferred-desktop
@@ -0,0 +1,18 @@
+#!/bin/sh
+# Choose which desktop environment should be installed to enhance the desktop
+# task. tasksel/desktop can be preseeded to select which to install.
+set -e
+
+# Avoid starting debconf if not being used to test which enhancing task to
+# install.
+if [ ! "$TESTING_ENHANCER" ]; then
+	exit 1
+fi
+
+. /usr/share/debconf/confmodule
+
+if db_get "tasksel/desktop" && echo "$RET" | grep -qw "$2"; then
+	exit 0
+else
+	exit 1
+fi
diff --git a/debian/education-tasks.install b/debian/education-tasks.install
index 8932dbb..ee7a4b4 100644
--- a/debian/education-tasks.install
+++ b/debian/education-tasks.install
@@ -1,4 +1,5 @@
 debian/always-lang   /usr/lib/tasksel/tests
 debian/always-laptop   /usr/lib/tasksel/tests
+debian/edu-preferred-desktop /usr/lib/tasksel/tests
 debian/edu-profile   /usr/lib/tasksel/tests
 debian/edu-tasksel-setup /usr/lib/education-tasks
diff --git a/tasks/desktop-gnome b/tasks/desktop-gnome
index 419af29..fc6c3cf 100644
--- a/tasks/desktop-gnome
+++ b/tasks/desktop-gnome
@@ -2,7 +2,7 @@ Task: Gnome
 Section: metapackages
 Architecture: any
 Enhances: education-desktop-other
-Test-default-desktop: 3 gnome
+Test-edu-preferred-desktop: gnome
 Description: Debian Edu GNOME desktop applications
  This metapackage depends on various GNOME office and desktop applications
  that are useful for teachers and their students.
diff --git a/tasks/desktop-kde b/tasks/desktop-kde
index d583f7d..4718f59 100644
--- a/tasks/desktop-kde
+++ b/tasks/desktop-kde
@@ -2,7 +2,7 @@ Task: KDE
 Section: metapackages
 Architecture: any
 Enhances: education-desktop-other
-Test-default-desktop: 3 kde
+Test-edu-preferred-desktop: kde
 Description: Debian Edu KDE desktop applications
  This metapackage depends on various KDE office and desktop applications
  that are useful for teachers and their students.
diff --git a/tasks/desktop-lxde b/tasks/desktop-lxde
index 7b6f6f5..1a96686 100644
--- a/tasks/desktop-lxde
+++ b/tasks/desktop-lxde
@@ -2,7 +2,7 @@ Task: LXDE
 Section: metapackages
 Architecture: any
 Enhances: education-desktop-other
-Test-default-desktop: 3 lxde
+Test-edu-preferred-desktop: lxde
 Description: Debian Edu LXDE desktop applications
  This metapackage depends on various LXDE components and lightweight
  desktop applications that are useful for teachers and their students.
diff --git a/tasks/desktop-mate b/tasks/desktop-mate
index b8f4f91..34ce616 100644
--- a/tasks/desktop-mate
+++ b/tasks/desktop-mate
@@ -2,7 +2,7 @@ Task: MATE
 Section: metapackages
 Architecture: any
 Enhances: education-desktop-other
-Test-default-desktop: 3 mate
+Test-edu-preferred-desktop: mate
 Description: Debian Edu MATE desktop applications
  This metapackage depends on various MATE office and desktop applications
  that are useful for teachers and their students.
diff --git a/tasks/desktop-xfce b/tasks/desktop-xfce
index 19eefe6..d44e333 100644
--- a/tasks/desktop-xfce
+++ b/tasks/desktop-xfce
@@ -2,7 +2,7 @@ Task: Xfce
 Section: metapackages
 Architecture: any
 Enhances: education-desktop-other
-Test-default-desktop: 3 xfce
+Test-edu-preferred-desktop: xfce
 Description: Debian Edu Xfce desktop applications
  This metapackage depends on various XFCE components that are useful
  for teachers and their students.

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