Import patches-unapplied version 0.96 to ubuntu/karmic

Imported using git-ubuntu import.

Changelog parent: a8e9968674

New changelog entries:
  [ Loïc Minier ]
  * Append ${SUBARCH:+-$SUBARCH} to LOG filename for consistency.
  [ Colin Watson ]
  * Edubuntu's desktop task is edubuntu-desktop-gnome, not edubuntu-desktop.

BuildLiveCD

@@ -123,7 +123,7 @@ for STE in $SUITES; do
 	    NOW=${NOW}.$n
 	fi
 	NOW=${NOW}
-	LOG=${PUBDIR}${NOW}/livecd-${NOW}-${ARCH}.out
+	LOG=${PUBDIR}${NOW}/livecd-${NOW}-${ARCH}${SUBARCH:+-$SUBARCH}.out
 
 	rm -f ${PUBDIR}latest
 	ln -sf ${PUBDIR}${NOW} ${PUBDIR}latest

debian/changelog

@@ -1,3 +1,13 @@
+livecd-rootfs (0.96) karmic; urgency=low
+
+  [ Loïc Minier ]
+  * Append ${SUBARCH:+-$SUBARCH} to LOG filename for consistency.
+
+  [ Colin Watson ]
+  * Edubuntu's desktop task is edubuntu-desktop-gnome, not edubuntu-desktop.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Tue, 15 Sep 2009 13:13:10 +0100
+
 livecd-rootfs (0.95) karmic; urgency=low
 
   * Add the EXTRASOURCE apt source to the "pristine" /etc/apt/sources.list.

livecd.sh

@@ -190,7 +190,7 @@ Flags: seen
 	    LIVELIST="language-support-en kubuntu-netbook-live^ laptop-detect casper lupin-casper"
 	    ;;
 	edubuntu|edubuntu-dvd)
-	    LIST="$LIST minimal^ standard^ edubuntu-desktop^"
+	    LIST="$LIST minimal^ standard^ edubuntu-desktop-gnome^"
 	    LIVELIST="edubuntu-live^ laptop-detect casper lupin-casper"
 	    ;;
 	xubuntu)