[debian-edu-commits] debian-edu/ 02/03: Adjust desktop task selection system to cope with the fact that the tasksel test preferred-desktop was removed in tasksel version 3.23, and use the new test default-desktop instead.

[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 9f5bc75175dda8e3cfc000265b481b4337a543c6
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Sun Sep 21 20:56:33 2014 +0200

    Adjust desktop task selection system to cope with the fact that the tasksel test preferred-desktop was removed in tasksel version 3.23, and use the new test default-desktop instead.
---
 debian/changelog    | 3 +++
 debian/control.stub | 2 +-
 tasks/desktop-gnome | 2 +-
 tasks/desktop-kde   | 2 +-
 tasks/desktop-lxde  | 2 +-
 tasks/desktop-mate  | 2 +-
 tasks/desktop-xfce  | 2 +-
 7 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 976f716..d8533ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,6 +35,9 @@ debian-edu (1.800~0.git.2014-09-11) unstable; urgency=low
     lxde desktop is installed in parallell with the gnome desktop, where
     the gnome-core package depend on evince, which conflict with evince-
     gtk.
+  * Adjust desktop task selection system to cope with the fact that the
+    tasksel test preferred-desktop was removed in tasksel version 3.23,
+    and use the new test default-desktop instead (Closes: #762365).
 
  -- Petter Reinholdtsen <pere at debian.org>  Thu, 11 Sep 2014 14:17:22 +0200
 
diff --git a/debian/control.stub b/debian/control.stub
index 21d9d0d..1be44ea 100644
--- a/debian/control.stub
+++ b/debian/control.stub
@@ -20,7 +20,7 @@ Homepage: http://www.skolelinux.org
 XS-Comment: This is a specific package which contains a tasksel helper. It doesn't make sense to put it in tasks.
 Package: education-tasks
 Architecture: any
-Depends: tasksel (>= 3.00)
+Depends: tasksel (>= 3.23)
 Description: Debian Edu tasks for tasksel
  This package provides Debian Edu tasks in tasksel.
 
diff --git a/tasks/desktop-gnome b/tasks/desktop-gnome
index a0b0f6c..83e6665 100644
--- a/tasks/desktop-gnome
+++ b/tasks/desktop-gnome
@@ -2,7 +2,7 @@ Task: Gnome
 Section: metapackages
 Architecture: any
 Enhances: education-desktop-other
-Test-preferred-desktop: gnome
+Test-default-desktop: 3 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 294ec3e..2467629 100644
--- a/tasks/desktop-kde
+++ b/tasks/desktop-kde
@@ -2,7 +2,7 @@ Task: KDE
 Section: metapackages
 Architecture: any
 Enhances: education-desktop-other
-Test-preferred-desktop: kde
+Test-default-desktop: 3 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 ee3e8bf..1a05839 100644
--- a/tasks/desktop-lxde
+++ b/tasks/desktop-lxde
@@ -2,7 +2,7 @@ Task: LXDE
 Section: metapackages
 Architecture: any
 Enhances: education-desktop-other
-Test-preferred-desktop: lxde
+Test-default-desktop: 3 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 0434037..0ba04df 100644
--- a/tasks/desktop-mate
+++ b/tasks/desktop-mate
@@ -2,7 +2,7 @@ Task: MATE
 Section: metapackages
 Architecture: any
 Enhances: education-desktop-other
-Test-preferred-desktop: mate
+Test-default-desktop: 3 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 87a1591..19eefe6 100644
--- a/tasks/desktop-xfce
+++ b/tasks/desktop-xfce
@@ -2,7 +2,7 @@ Task: Xfce
 Section: metapackages
 Architecture: any
 Enhances: education-desktop-other
-Test-preferred-desktop: xfce
+Test-default-desktop: 3 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