[Qa-jenkins-scm] [jenkins.debian.net] 01/01: g-i: preseed desktop using the new syntax introduced with jessie

[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 328fb469266599726ad8a5bd1d97551d5b32cfab
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sun May 3 13:52:13 2015 +0200

    g-i: preseed desktop using the new syntax introduced with jessie
---
 d-i-preseed-cfgs/debian_jessie_gnome_preseed.cfg           | 6 +-----
 d-i-preseed-cfgs/debian_jessie_kde_preseed.cfg             | 7 +------
 d-i-preseed-cfgs/debian_jessie_lxde_preseed.cfg            | 7 +------
 d-i-preseed-cfgs/debian_sid_daily_presentation_preseed.cfg | 6 +-----
 4 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/d-i-preseed-cfgs/debian_jessie_gnome_preseed.cfg b/d-i-preseed-cfgs/debian_jessie_gnome_preseed.cfg
index 4ed025a..a373a3c 100644
--- a/d-i-preseed-cfgs/debian_jessie_gnome_preseed.cfg
+++ b/d-i-preseed-cfgs/debian_jessie_gnome_preseed.cfg
@@ -300,11 +300,7 @@ d-i partman/confirm_nooverwrite boolean true
 #d-i debian-installer/allow_unauthenticated 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/first multiselect standard, gnome-desktop
 
 # Individual additional packages to install
 #d-i pkgsel/include string openssh-server build-essential
diff --git a/d-i-preseed-cfgs/debian_jessie_kde_preseed.cfg b/d-i-preseed-cfgs/debian_jessie_kde_preseed.cfg
index ed3a093..684f28f 100644
--- a/d-i-preseed-cfgs/debian_jessie_kde_preseed.cfg
+++ b/d-i-preseed-cfgs/debian_jessie_kde_preseed.cfg
@@ -300,12 +300,7 @@ d-i partman/confirm_nooverwrite boolean true
 #d-i debian-installer/allow_unauthenticated 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 kde
+tasksel tasksel/first multiselect standard, kde-desktop
 
 # Individual additional packages to install
 #d-i pkgsel/include string openssh-server build-essential
diff --git a/d-i-preseed-cfgs/debian_jessie_lxde_preseed.cfg b/d-i-preseed-cfgs/debian_jessie_lxde_preseed.cfg
index b1d5e29..4b7e7ba 100644
--- a/d-i-preseed-cfgs/debian_jessie_lxde_preseed.cfg
+++ b/d-i-preseed-cfgs/debian_jessie_lxde_preseed.cfg
@@ -300,12 +300,7 @@ d-i partman/confirm_nooverwrite boolean true
 #d-i debian-installer/allow_unauthenticated 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 lxde
+tasksel tasksel/first multiselect standard, lxde-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_presentation_preseed.cfg b/d-i-preseed-cfgs/debian_sid_daily_presentation_preseed.cfg
index 6a8b7a3..6b8857e 100644
--- a/d-i-preseed-cfgs/debian_sid_daily_presentation_preseed.cfg
+++ b/d-i-preseed-cfgs/debian_sid_daily_presentation_preseed.cfg
@@ -300,11 +300,7 @@ d-i partman/confirm_nooverwrite boolean true
 #d-i debian-installer/allow_unauthenticated 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/first multiselect standard, gnome-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