From 92501f86560d06f63f0e2d6f633e5b798549fed9 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Tue, 15 Sep 2009 13:13:10 +0100 Subject: [PATCH] Import patches-unapplied version 0.96 to ubuntu/karmic MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Imported using git-ubuntu import. Changelog parent: a8e9968674e7fee531e168b118ecd8c749de7dd0 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 | 2 +- debian/changelog | 10 ++++++++++ livecd.sh | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/BuildLiveCD b/BuildLiveCD index c318c048..2e83ef0a 100755 --- a/BuildLiveCD +++ b/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 diff --git a/debian/changelog b/debian/changelog index e8fa3d5f..860d3321 100644 --- a/debian/changelog +++ b/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 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. diff --git a/livecd.sh b/livecd.sh index f74cf9c2..bd5c3526 100755 --- a/livecd.sh +++ b/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)