[debian-edu-commits] debian-edu/ 03/03: Generated.

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

    Generated.
---
 debian-edu-tasks.desc | 10 +++++-----
 debian/control        |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/debian-edu-tasks.desc b/debian-edu-tasks.desc
index c9c2b8e..f4bda85 100644
--- a/debian-edu-tasks.desc
+++ b/debian-edu-tasks.desc
@@ -5,7 +5,7 @@ Description: Debian Edu GNOME desktop applications
  that are useful for teachers and their students.
 Relevance: 10
 Enhances: education-desktop-other
-Test-preferred-desktop: gnome
+Test-default-desktop: 3 gnome
 Key: 
  education-desktop-gnome
 Packages: list
@@ -119,7 +119,7 @@ Description: Debian Edu KDE desktop applications
  that are useful for teachers and their students.
 Relevance: 10
 Enhances: education-desktop-other
-Test-preferred-desktop: kde
+Test-default-desktop: 3 kde
 Key: 
  education-desktop-kde
 Packages: list
@@ -192,7 +192,7 @@ Description: Debian Edu LXDE desktop applications
  desktop applications that are useful for teachers and their students.
 Relevance: 10
 Enhances: education-desktop-other
-Test-preferred-desktop: lxde
+Test-default-desktop: 3 lxde
 Key: 
  education-desktop-lxde
 Packages: list
@@ -309,7 +309,7 @@ Description: Debian Edu MATE desktop applications
  that are useful for teachers and their students.
 Relevance: 10
 Enhances: education-desktop-other
-Test-preferred-desktop: mate
+Test-default-desktop: 3 mate
 Key: 
  education-desktop-mate
 Packages: list
@@ -750,7 +750,7 @@ Description: Debian Edu Xfce desktop applications
  for teachers and their students.
 Relevance: 10
 Enhances: education-desktop-other
-Test-preferred-desktop: xfce
+Test-default-desktop: 3 xfce
 Key: 
  education-desktop-xfce
 Packages: list
diff --git a/debian/control b/debian/control
index c204555..60543dd 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,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.
 
@@ -331,7 +331,7 @@ Depends: education-tasks (= ${binary:Version})
 Recommends: blueman,
  desktop-file-utils,
  education-common,
- evince-gtk,
+ evince-gtk | evince,
  fotoxx,
  galculator,
  gimp,

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