diff --git a/debian/changelog b/debian/changelog index 3a0bbedb..425dfa97 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,22 +1,16 @@ -livecd-rootfs (2.275+ppa5) vivid; urgency=low +livecd-rootfs (2.276) UNRELEASED; urgency=medium + [ Mathieu Trudel-Lapierre ] + * live-build/auto/config: add config for Ubuntu MATE. + + [ Michael Vogt ] * use generic kernel for all ubuntu-core system-image - - -- Michael Vogt Wed, 21 Jan 2015 14:39:31 +0100 - -livecd-rootfs (2.275+ppa4) vivid; urgency=low - * live-build/ubuntu-core/hooks/01-setup_user.chroot: - run chpasswd after user moved into /var/lib/extrausers - - -- Michael Vogt Fri, 16 Jan 2015 19:56:49 +0100 - -livecd-rootfs (2.275+ppa3) vivid; urgency=low - * live-build/ubuntu-core/hooks/01-setup_user.chroot: - run with -e - -- Michael Vogt Fri, 16 Jan 2015 18:28:10 +0100 + -- Mathieu Trudel-Lapierre Wed, 28 Jan 2015 11:00:23 -0500 livecd-rootfs (2.275+ppa2) vivid; urgency=medium diff --git a/live-build/auto/config b/live-build/auto/config index f76d1a9b..1b61f57c 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -149,6 +149,10 @@ if [ "$PREINSTALLED" = "true" ] && [ "$SUBPROJECT" != "wubi" ]; then add_package live oem-config-gtk ubiquity-frontend-gtk add_package live ubiquity-slideshow-xubuntu ;; + ubuntu-mate) + add_package live oem-config-gtk ubiquity-frontend-gtk + add_package live ubiquity-slideshow-ubuntu-mate + ;; ubuntu-server) add_package live oem-config-debconf ubiquity-frontend-debconf ;; @@ -306,6 +310,18 @@ case $PROJECT in COMPONENTS='main restricted universe' ;; + ubuntu-mate) + add_task install minimal standard ubuntu-mate-core ubuntu-mate-desktop + LIVE_TASK='ubuntu-mate-live' + case $ARCH in + amd64) add_package live linux-signed-generic ;; + esac + COMPONENTS='main restricted universe multiverse' + # The Ubuntu MATE STRUCTURE file has "feature + # no-follow-recommends". Mirror this. + export APT_OPTIONS="--yes --no-install-recommends" + ;; + ubuntustudio-dvd) add_task install minimal standard ubuntustudio-desktop ubuntustudio-audio ubuntustudio-font-meta ubuntustudio-graphics ubuntustudio-video ubuntustudio-publishing ubuntustudio-photography COMPONENTS='main restricted universe multiverse'