diff --git a/BuildLiveCD b/BuildLiveCD index 54462949..7e8a790a 100755 --- a/BuildLiveCD +++ b/BuildLiveCD @@ -55,9 +55,9 @@ if [ -z "$SUITES" ]; then echo "No valid suites to build for" >&2 && exit 1 fi if (( $# == 0 )) || [ "X$1" = "Xall" ]; then - set -- ubuntu kubuntu edubuntu xubuntu base + set -- ubuntu kubuntu kubuntu-kde4 edubuntu xubuntu base if [ "$ARCH" = "i386" ]; then - set -- ubuntu ubuntu-lpia kubuntu edubuntu xubuntu base + set -- ubuntu ubuntu-dvd ubuntu-lpia kubuntu kubuntu-dvd kubuntu-kde4 edubuntu edubuntu-dvd xubuntu base fi fi diff --git a/debian/changelog b/debian/changelog index 3f0a40d6..1c94cccd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +livecd-rootfs (0.51) hardy; urgency=low + + [ Jonathan Riddell ] + * Add kubuntu-kde4 + + [ Steve Langasek ] + * Add new targets for {k,ed,}ubuntu-dvd + + -- Steve Langasek Thu, 14 Feb 2008 10:15:33 -0800 + livecd-rootfs (0.50) hardy; urgency=low * Switch Xubuntu to libgoffice-gtk-0-6. diff --git a/livecd.sh b/livecd.sh index 90d1b0ad..f91006ed 100755 --- a/livecd.sh +++ b/livecd.sh @@ -129,15 +129,15 @@ esac; done; shift $((OPTIND-1)) if (( $# == 0 )) || [ "X$1" = "Xall" ]; then - set -- ubuntu kubuntu edubuntu xubuntu gobuntu base + set -- ubuntu kubuntu kubuntu-kde4 edubuntu xubuntu gobuntu base if [ "$ARCH" = "i386" ]; then - set -- ubuntu ubuntu-lpia kubuntu edubuntu xubuntu gobuntu base + set -- ubuntu ubuntu-dvd ubuntu-lpia kubuntu kubuntu-dvd kubuntu-kde4 edubuntu edubuntu-dvd xubuntu gobuntu base fi fi for arg in "$@"; do case "$arg" in - ubuntu|ubuntu-lpia|edubuntu|kubuntu|xubuntu|gobuntu|base|tocd) + ubuntu|ubuntu-dvd|ubuntu-lpia|edubuntu|edubuntu-dvd|kubuntu|kubuntu-dvd|kubuntu-kde4|xubuntu|gobuntu|base|tocd) ;; *) echo bad name >&2; @@ -169,15 +169,19 @@ Flags: seen @@EOF case "$FS" in - ubuntu|ubuntu-lpia) + ubuntu|ubuntu-lpia|ubuntu-dvd) LIST="$LIST minimal^ standard^ ubuntu-desktop^" LIVELIST="ubuntu-live^ xresprobe laptop-detect casper lupin-casper" ;; - kubuntu) + kubuntu|kubuntu-dvd) LIST="$LIST minimal^ standard^ kubuntu-desktop^" LIVELIST="kubuntu-live^ xresprobe laptop-detect casper lupin-casper" ;; - edubuntu) + kubuntu-kde4) + LIST="$LIST minimal^ standard^ kubuntu-kde4-desktop^" + LIVELIST="kubuntu-kde4-live^ xresprobe laptop-detect casper lupin-casper" + ;; + edubuntu|edubuntu-dvd) LIST="$LIST minimal^ standard^ edubuntu-desktop^" LIVELIST="edubuntu-live^ xresprobe laptop-detect casper lupin-casper" ;; @@ -219,6 +223,11 @@ Flags: seen LIST="$LIST $tocddesktop" LIVELIST="$tocdlive casper" esac + case "$FS" in + *-dvd) + LIVELIST="$LIVELIST ${FS}-live^" + ;; + esac dpkg -l livecd-rootfs || true # get our version # in the log. if [ "$FS" != "ubuntu-lpia" ]; then