[Qa-jenkins-scm] [jenkins.debian.net] 03/03: g-i: really install xfce in _xfce preseed configs

[Holger Levsen]

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

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit d1c46af24950bc3c69fe7dc851a78ec034988d1b
Author: Steven Chamberlain <steven at pyro.eu.org>
Date:   Sat May 2 22:04:41 2015 +0100

    g-i: really install xfce in _xfce preseed configs
    
    Syntax for preseeding desktop selection changed in jessie and later.
---
 d-i-preseed-cfgs/debian_jessie_xfce_preseed.cfg    | 6 +-----
 d-i-preseed-cfgs/debian_sid_daily_xfce_preseed.cfg | 6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/d-i-preseed-cfgs/debian_jessie_xfce_preseed.cfg b/d-i-preseed-cfgs/debian_jessie_xfce_preseed.cfg
index e420e6f..fda634f 100644
--- a/d-i-preseed-cfgs/debian_jessie_xfce_preseed.cfg
+++ b/d-i-preseed-cfgs/debian_jessie_xfce_preseed.cfg
@@ -301,11 +301,7 @@ d-i partman/confirm_nooverwrite boolean true
 
 ### Package selection
 #tasksel tasksel/first multiselect standard, web-server
-tasksel tasksel/first multiselect standard, desktop
-# If the desktop task is selected, install the kde and xfce desktops
-# instead of the default gnome desktop.
-#tasksel tasksel/desktop multiselect kde, xfce
-tasksel tasksel/desktop multiselect xfce
+tasksel tasksel/first multiselect standard, xfce-desktop
 
 # Individual additional packages to install
 #d-i pkgsel/include string openssh-server build-essential
diff --git a/d-i-preseed-cfgs/debian_sid_daily_xfce_preseed.cfg b/d-i-preseed-cfgs/debian_sid_daily_xfce_preseed.cfg
index b68138d..e464790 100644
--- a/d-i-preseed-cfgs/debian_sid_daily_xfce_preseed.cfg
+++ b/d-i-preseed-cfgs/debian_sid_daily_xfce_preseed.cfg
@@ -301,11 +301,7 @@ d-i partman/confirm_nooverwrite boolean true
 
 ### Package selection
 #tasksel tasksel/first multiselect standard, web-server
-tasksel tasksel/first multiselect standard, desktop
-# If the desktop task is selected, install the kde and xfce desktops
-# instead of the default gnome desktop.
-#tasksel tasksel/desktop multiselect kde, xfce
-tasksel tasksel/desktop multiselect xfce
+tasksel tasksel/first multiselect standard, xfce-desktop
 
 # Individual additional packages to install
 #d-i pkgsel/include string openssh-server build-essential

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