diff --git a/BuildLiveCD b/BuildLiveCD index daaf3bae..70a00a72 100755 --- a/BuildLiveCD +++ b/BuildLiveCD @@ -74,7 +74,7 @@ fi if (( $# == 0 )) || [ "X$1" = "Xall" ]; then set -- ubuntu kubuntu kubuntu-kde4 edubuntu xubuntu mythbuntu base if [ "$ARCH" = "i386" ]; then - set -- ubuntu ubuntu-dvd ubuntu-lpia kubuntu kubuntu-dvd kubuntu-kde4 edubuntu edubuntu-dvd xubuntu mythbuntu base + set -- ubuntu ubuntu-dvd ubuntu-lpia ubuntu-netbook-remix kubuntu kubuntu-dvd kubuntu-kde4 edubuntu edubuntu-dvd xubuntu mythbuntu base fi fi @@ -85,7 +85,7 @@ esac for arg in "$@"; do case "$arg" in - *ubuntu|*ubuntu-dvd|kubuntu-kde4|ubuntu-lpia|base|tocd) ;; + *ubuntu|*ubuntu-dvd|kubuntu-kde4|ubuntu-lpia|ubuntu-mid|ubuntu-umpc|ubuntu-mobile|ubuntu-netbook-remix|mythbuntu|base|tocd) ;; *) echo "bad project: $arg" >&2 exit 2 diff --git a/debian/changelog b/debian/changelog index 27be4cb5..94a06797 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,18 @@ +livecd-rootfs (0.75) jaunty; urgency=low + + [ Steve Langasek ] + * BuildLiveCD: recognize 'mythbuntu' and 'ubuntu-mobile' as valid project + names + + [ Colin Watson ] + * BuildLiveCD: add ubuntu-umpc too. + + [ Steve Kowalik ] + * BuildLiveCD: Add ubuntu-netbook-remix. + * livecd.sh: Support ubuntu-netbook-remix. + + -- Steve Kowalik Sat, 10 Jan 2009 11:08:29 +1100 + livecd-rootfs (0.74) jaunty; urgency=low * For mythbuntu livefs builds, we don't have tasks yet. They will be @@ -8,7 +23,10 @@ livecd-rootfs (0.74) jaunty; urgency=low livecd-rootfs (0.73) jaunty; urgency=low + [ Colin Watson ] * Add ubuntu-umpc support (equivalent to previous ubuntu-mobile). + + [ Mario Limonciello ] * Add Mythbuntu support. * BuildLiveCD: default to jaunty. diff --git a/livecd.sh b/livecd.sh index 6165d02f..fd33148c 100755 --- a/livecd.sh +++ b/livecd.sh @@ -141,7 +141,7 @@ fi for arg in "$@"; do case "$arg" in - ubuntu|ubuntu-dvd|ubuntu-lpia|edubuntu|edubuntu-dvd|kubuntu|kubuntu-dvd|kubuntu-kde4|xubuntu|mythbuntu|gobuntu|ubuntu-mid|ubuntu-mobile|ubuntu-umpc|base|tocd) + ubuntu|ubuntu-dvd|ubuntu-lpia|edubuntu|edubuntu-dvd|kubuntu|kubuntu-dvd|kubuntu-kde4|xubuntu|mythbuntu|gobuntu|ubuntu-mid|ubuntu-netbook-remix|base|tocd) ;; *) echo bad name >&2; @@ -199,16 +199,16 @@ Flags: seen LIVELIST="gobuntu-live^ laptop-detect casper lupin-casper" COMP="main" ;; - ubuntu-mid) - LIST="$LIST minimal^ ubuntu-mid" - LIVELIST="casper ubiquity" - COMP="main restricted universe multiverse" - ;; - ubuntu-mobile|ubuntu-umpc) - LIST="$LIST minimal^ mobile-mobile^" - LIVELIST="casper ubiquity" - COMP="main restricted universe multiverse" - ;; + ubuntu-mid) + LIST="$LIST minimal^ mobile-mid^" + LIVELIST="casper ubiquity" + COMP="main restricted universe multiverse" + ;; + ubuntu-netbook-remix) + LIST="$LIST minimal^ mobile-netbook-remix^" + LIVELIST="casper ubiquity" + COMP="main restricted universe multiverse" + ;; mythbuntu) LIST="$LIST minimal^ standard^ mythbuntu-desktop" LIVELIST="mythbuntu-live laptop-detect casper lupin-casper"