diff --git a/debian/changelog b/debian/changelog index 021df2bd..7108b0bc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +livecd-rootfs (2.209+unity8.1) utopic; urgency=medium + + * Merge with Utopic. Remaining changes: + + Add a very prelimenary unity8 desktop session + - Doesn't install ubuntu-desktop + - Installs unity8-desktop-session-x11 for now. In future will switch to a + seed and Mir + - Builds from universe + + -- Iain Lane Mon, 12 May 2014 13:01:36 +0100 + livecd-rootfs (2.209) utopic; urgency=medium * live-build/auto/config: Pass any additional command-line arguments on to @@ -5,6 +16,16 @@ livecd-rootfs (2.209) utopic; urgency=medium -- Colin Watson Sat, 10 May 2014 13:54:42 +0100 +livecd-rootfs (2.208+unity8.1) utopic; urgency=medium + + * Add a very prelimenary unity8 desktop session + - Doesn't install ubuntu-desktop + - Installs unity8-desktop-session-x11 for now. In future will switch to a + seed and Mir + - Builds from universe + + -- Iain Lane Fri, 09 May 2014 16:18:14 +0100 + livecd-rootfs (2.208) trusty; urgency=medium * Adding support for ubuntu-touch i386 based images diff --git a/live-build/auto/config b/live-build/auto/config index 07a82e3d..2f244a6d 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -192,6 +192,13 @@ case $PROJECT in LIVE_TASK='ubuntu-live' ;; + ubuntu-unity8) + add_task install minimal standard + add_package install unity8-desktop-session-x11 + COMPONENTS='main restricted universe' + LIVE_TASK='ubuntu-live' + ;; + kubuntu|kubuntu-dvd) add_task install minimal standard case "$ARCH+$SUBARCH" in