Update boot config/screens for the default desktop change.

That is: GNOME → Xfce, in tasksel 3.19 (Closes: #738602).

build/README

@@ -384,7 +384,7 @@ DESKTOP (x86 only)
   Allows to specify that a specific desktop environment should be installed
   when that option is selected in pkgsel. Modifies the syslinux configuration.
   Ignored unless SYSLINUX_CFG is set to 'prompt' or 'standard'; the default
-  (gnome) does not need to be specified.
+  (xfce) does not need to be specified.
 
 BOOTMENU_BEEP
   Set to y to produce a beep when the boot menu is ready to accept commands

build/boot/x86/dtmenu.cfg

@@ -10,7 +10,7 @@ menu begin desktop
     label mainmenu-kde
         menu label ^Back..
         text help
-        Higher level options install the GNOME desktop environment
+        Higher level options install the Xfce desktop environment
         endtext
         menu exit
     menu begin kde-desktop
@@ -37,16 +37,16 @@ menu begin desktop
             menu exit
         include ${SYSDIR}lxde/menu.cfg
     menu end
-    menu begin xfce-desktop
+    menu begin gnome-desktop
         include ${SYSDIR}stdmenu.cfg
-        menu label ^Xfce
-        menu title Xfce desktop boot menu
+        menu label ^GNOME
+        menu title GNOME desktop boot menu
         text help
-   Select the 'Xfce lightweight desktop environment' for the Desktop task
+   Select the 'GNOME desktop environment' for the Desktop task
         endtext
-        label mainmenu-xfce
+        label mainmenu-gnome
             menu label ^Back..
             menu exit
-        include ${SYSDIR}xfce/menu.cfg
+        include ${SYSDIR}gnome/menu.cfg
     menu end
 menu end

build/boot/x86/f8.txt

@@ -9,7 +9,7 @@ Disable framebuffer                     0fvga=normal fb=false07
 Don't start PCMCIA                      0fhw-detect/start_pcmcia=false07
 Force static network config             0fnetcfg/disable_dhcp=true07
 Set keyboard map                        0fbootkbd=es07
-Select the kde or xfce desktops         0fdesktop=kde07
+Select the gnome, kde, or lxde desktops 0fdesktop=kde07
 
 Accessibility options (last 2 options not available for all images):
   Use high contrast theme               0ftheme=dark07

build/config/common

@@ -60,8 +60,8 @@ BUILD_DATE ?= $(shell date -u '+%Y%m%d-%H:%M')
 BOOTMENU_BEEP ?= n
 
 # x86: configure syslinux to have tasksel install a different desktop
-# environment than the default (gnome).
-# Possible values: kde, xfce, lxde
+# environment than the default (xfce).
+# Possible values: gnome, kde, lxde
 DESKTOP = 
 
 # Filesystem type for the initrd, currently valid values are ext2, cramfs,

build/config/kfreebsd.cfg

@@ -57,7 +57,7 @@ arch_cd_info_dir:
 		(printf "[installer]\n"; \
 		printf "kernel=kfreebsd\n"; \
 		printf "arch=$(subst kfreebsd-,,$(ARCH))\n"; \
-		printf "default_desktop=gnome\n"; \
+		printf "default_desktop=xfce\n"; \
 		#if [ -n "$(INITRD_GTK)" ]; then \
 		#	printf "$(ARCH)/kfreebsd=boot/kernel/kfreebsd.gz\n$(ARCH)/kfreebsd_module=boot/mfsroot.gz\n"; \
 		#	printf "$(ARCH)/gtk/kfreebsd=boot/kernel/kfreebsd.gz\n$(ARCH)/gtk/kfreebsd_module=boot/gtk/mfsroot.gz\n"; \
@@ -100,7 +100,7 @@ arch_miniiso: $(TEMP_INITRD) $(TEMP_KERNEL) $(TREE)
 		(printf "[installer]\n"; \
 		printf "kernel=kfreebsd\n"; \
 		printf "arch=$(subst kfreebsd-,,$(ARCH))\n"; \
-		printf "default_desktop=gnome\n"; \
+		printf "default_desktop=xfce\n"; \
 		if [ "$(TYPE)" = "netboot/gtk" ]; then \
 			printf "user_interface=graphical\n"; \
 			printf "$(ARCH)/gtk/kfreebsd=boot/kernel/kfreebsd.gz\n$(ARCH)/gtk/kfreebsd_module=boot/mfsroot.gz\n"; \

build/config/x86.cfg

@@ -125,7 +125,7 @@ endif
 		(printf "[installer]\n"; \
 		printf "kernel=linux\n"; \
 		printf "arch=$(ARCH)\n"; \
-		printf "default_desktop=gnome\n"; \
+		printf "default_desktop=xfce\n"; \
 		if [ -n "$(INITRD_GTK)" ]; then \
 			printf "$(ARCH)/linux=linux\n$(ARCH)/initrd=initrd.gz\n"; \
 			printf "$(ARCH)/gtk/linux=linux\n$(ARCH)/gtk/initrd=initrdg.gz\n"; \
@@ -229,7 +229,7 @@ arch_cd_info_dir: x86_syslinux x86_grub_efi
 		(printf "[installer]\n"; \
 		printf "kernel=linux\n"; \
 		printf "arch=$(ARCH)\n"; \
-		printf "default_desktop=gnome\n"; \
+		printf "default_desktop=xfce\n"; \
 		if [ -n "$(INITRD_GTK)" ]; then \
 			printf "$(ARCH)/linux=install/vmlinuz\n$(ARCH)/initrd=install/initrd.gz\n"; \
 			printf "$(ARCH)/gtk/linux=install/vmlinuz\n$(ARCH)/gtk/initrd=install/gtk/initrd.gz\n"; \
@@ -311,7 +311,7 @@ arch_miniiso: x86_syslinux x86_grub_efi
 		(printf "[installer]\n"; \
 		printf "kernel=linux\n"; \
 		printf "arch=$(ARCH)\n"; \
-		printf "default_desktop=gnome\n"; \
+		printf "default_desktop=xfce\n"; \
 		if [ "$(TYPE)" = "netboot/gtk" ]; then \
 			printf "user_interface=graphical\n"; \
 			printf "$(ARCH)/gtk/linux=linux\n$(ARCH)/gtk/initrd=initrd.gz\n"; \

build/util/syslinux-cfgs

@@ -44,7 +44,7 @@ add_desktop_configs() {
 
 	cp "$SRC"/dtmenu.cfg "$DST"/
 
-	for desktop in kde xfce lxde; do
+	for desktop in gnome kde lxde; do
 		mkdir "$DST"/$desktop
 
 		cp "$SRC"/desktop/menu.cfg "$SRC"/desktop/prompt.cfg \
@@ -57,8 +57,8 @@ add_desktop_configs() {
 		fi
 
 		case $desktop in
+			gnome)	title=GNOME ;;
 			kde)	title=KDE ;;
-			xfce)	title=Xfce ;;
 			lxde)	title=LXDE ;;
 		esac
 		sed -i "s/%desktop%/$desktop/

debian/changelog

@@ -8,6 +8,8 @@ debian-installer (20140210) UNRELEASED; urgency=medium
   [ Cyril Brulebois ]
   * build/Makefile: Use $(GZIP) instead of gzip, and prefer pigz over
     gzip if it's available, which can give a nice speed-up.
+  * Update boot config/screens for the default desktop change (GNOME → Xfce)
+    in tasksel 3.19 (Closes: #738602).
 
  -- Colin Watson <cjwatson@debian.org>  Mon, 10 Feb 2014 19:41:38 +0000