diff --git a/BuildLiveCD b/BuildLiveCD index b58d7296..daaf3bae 100755 --- a/BuildLiveCD +++ b/BuildLiveCD @@ -27,7 +27,7 @@ fi ARCH=$(dpkg --print-installation-architecture) SUBARCH="" SUBARCHARG="" -DEFAULTSUITE="intrepid" +DEFAULTSUITE="jaunty" NEWSUITE="" SUITES="" PROPOSED="" @@ -72,9 +72,9 @@ if [ "$new_suite" = "yes" ] && [ "$old_suite" = "yes" ]; then exit 1 fi if (( $# == 0 )) || [ "X$1" = "Xall" ]; then - set -- ubuntu kubuntu kubuntu-kde4 edubuntu xubuntu base + 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 base + set -- ubuntu ubuntu-dvd ubuntu-lpia kubuntu kubuntu-dvd kubuntu-kde4 edubuntu edubuntu-dvd xubuntu mythbuntu base fi fi diff --git a/debian/changelog b/debian/changelog index 25dd6a59..1941399f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (0.73) jaunty; urgency=low + + * Add ubuntu-umpc support (equivalent to previous ubuntu-mobile). + * Add Mythbuntu support. + * BuildLiveCD: default to jaunty. + + -- Mario Limonciello Tue, 04 Nov 2008 19:28:35 -0600 + livecd-rootfs (0.72) intrepid; urgency=low * Fix source mirror for -updates in generated sources.list (it was diff --git a/livecd.sh b/livecd.sh index c038bd47..402d2e96 100755 --- a/livecd.sh +++ b/livecd.sh @@ -133,15 +133,15 @@ esac; done; shift $((OPTIND-1)) if (( $# == 0 )) || [ "X$1" = "Xall" ]; then - set -- ubuntu kubuntu kubuntu-kde4 edubuntu xubuntu gobuntu base + set -- ubuntu kubuntu kubuntu-kde4 edubuntu xubuntu mythbuntu gobuntu base if [ "$ARCH" = "i386" ]; then - set -- ubuntu ubuntu-dvd kubuntu kubuntu-dvd kubuntu-kde4 edubuntu edubuntu-dvd xubuntu gobuntu base + set -- ubuntu ubuntu-dvd kubuntu kubuntu-dvd kubuntu-kde4 edubuntu edubuntu-dvd mythbuntu xubuntu gobuntu base fi fi for arg in "$@"; do case "$arg" in - ubuntu|ubuntu-dvd|ubuntu-lpia|edubuntu|edubuntu-dvd|kubuntu|kubuntu-dvd|kubuntu-kde4|xubuntu|gobuntu|ubuntu-mid|ubuntu-mobile|base|tocd) + ubuntu|ubuntu-dvd|ubuntu-lpia|edubuntu|edubuntu-dvd|kubuntu|kubuntu-dvd|kubuntu-kde4|xubuntu|mythbuntu|gobuntu|ubuntu-mid|ubuntu-mobile|ubuntu-umpc|base|tocd) ;; *) echo bad name >&2; @@ -204,11 +204,16 @@ Flags: seen LIVELIST="casper ubiquity" COMP="main restricted universe multiverse" ;; - ubuntu-mobile) + ubuntu-mobile|ubuntu-umpc) LIST="$LIST minimal^ mobile-mobile^" LIVELIST="casper ubiquity" COMP="main restricted universe multiverse" ;; + mythbuntu) + LIST="$LIST minimal^ standard^ mythbuntu-desktop^" + LIVELIST="mythbuntu-live^ laptop-detect casper lupin-casper" + COMP="main restricted universe multiverse" + ;; base) LIST="$LIST minimal^ standard^" LIVELIST="casper lupin-casper"