From b402ea3ba7ae0eff325ad7eece87e6106406b8e7 Mon Sep 17 00:00:00 2001
From: Steve McIntyre <93sam@debian.org>
Date: Tue, 29 Jul 2008 17:29:32 +0000
Subject: [PATCH]   * Applied patch from Robert Millan <rmh@aybabtu.com> to
 allow choice of     desktop when building for win32-loader. Closes: #491300.

---
 CONF.sh                   | 8 ++++++--
 debian/CONF.sh            | 3 +++
 debian/changelog          | 4 ++++
 tools/boot/lenny/boot-x86 | 3 +++
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/CONF.sh b/CONF.sh
index 741fd472..ef189266 100644
--- a/CONF.sh
+++ b/CONF.sh
@@ -103,7 +103,7 @@ fi
 export MIRROR=/mirror/debian
 
 # Path of the temporary directory
-export TDIR=/mirror/tmp
+export TDIR=/mirror/tmp/test
 
 # Path where the images will be written
 export OUT=/mirror/debian-cd-test
@@ -157,6 +157,7 @@ export CONTRIB=1
 # export MKISOFS=mkisofs
 # export MKISOFS_OPTS="-r"		#For normal users
 # export MKISOFS_OPTS="-r -F ."	#For symlink farmers
+export MKISOFS=/home/steve/mkisofs
 
 # ISOLinux support for multiboot on CD1 for i386
 export ISOLINUX=1
@@ -203,7 +204,7 @@ export NORECOMMENDS=1
 # 0/unset = Don't do jigdo at all, produce only the full iso image.
 # 1 = Produce both the iso image and jigdo stuff.
 # 2 = Produce only the jigdo stuff
-export DOJIGDO=1
+export DOJIGDO=2
 
 # HTTP/FTP URL for directory where you intend to make the templates
 # available. You should not need to change this; the default value ""
@@ -300,6 +301,9 @@ done
 # supported for all architectures.
 #export KERNEL_PARAMS="DEBCONF_PRIORITY=critical"
 
+# Default desktop (currently only used by win32-loader)
+#export DESKTOP=kde
+
 # If set, limits the number of binary CDs to produce.
 #export MAXCDS=1
 
diff --git a/debian/CONF.sh b/debian/CONF.sh
index 43177ace..77fa5a43 100644
--- a/debian/CONF.sh
+++ b/debian/CONF.sh
@@ -293,6 +293,9 @@ done
 # supported for all architectures.
 #export KERNEL_PARAMS="DEBCONF_PRIORITY=critical"
 
+# Default desktop (currently only used by win32-loader)
+#export DESKTOP=kde
+
 # If set, limits the number of binary CDs to produce.
 #export MAXCDS=1
 
diff --git a/debian/changelog b/debian/changelog
index 4def239b..3ecd55f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -77,6 +77,10 @@ debian-cd (3.0.5) UNRELEASED; urgency=low
   * Disable zd1211-firmware as its dependencies currently
     break d-i. (See #492205)
 
+  [ Steve McIntyre ]
+  * Applied patch from Robert Millan <rmh@aybabtu.com> to allow choice of
+    desktop when building for win32-loader. Closes: #491300.
+
  -- Frans Pop <fjp@debian.org>  Fri, 18 Jul 2008 17:30:42 +0200
 
 debian-cd (3.0.4) unstable; urgency=low
diff --git a/tools/boot/lenny/boot-x86 b/tools/boot/lenny/boot-x86
index 68c8ace2..55f4eb9f 100644
--- a/tools/boot/lenny/boot-x86
+++ b/tools/boot/lenny/boot-x86
@@ -203,6 +203,9 @@ if [ "$THISTYPE" = "isolinux" ]; then
 
 	if [ -e boot$N/win32-loader.ini ] ; then
 	    sed -i "s|install/|$INSTALLDIR/|" boot$N/win32-loader.ini
+        if [ "${DESKTOP}" ] ; then
+            sed -i "s|^\(default_desktop\)=.*|\1=${DESKTOP}|" boot$N/win32-loader.ini
+        fi
 	fi
 
 	cp -f $BASEDIR/data/$DI_CODENAME/isolinux.bin boot$N/$ISOLINUXDIR/