merge w/ mythbuntu-livecd-rootfs

ubuntu/precise
Mario Limonciello 16 years ago
commit 5e19ccc02d

@ -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

3
debian/changelog vendored

@ -1,8 +1,9 @@
livecd-rootfs (0.73) UNRELEASED; urgency=low
* Add ubuntu-umpc support (equivalent to previous ubuntu-mobile).
* Add Mythbuntu support.
-- Colin Watson <cjwatson@ubuntu.com> Fri, 31 Oct 2008 12:38:00 +0000
-- Mario Limonciello <superm1@ubuntu.com> Tue, 04 Nov 2008 19:28:35 -0600
livecd-rootfs (0.72) intrepid; urgency=low

@ -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|ubuntu-umpc|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;
@ -209,6 +209,11 @@ Flags: seen
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"

Loading…
Cancel
Save