From 0ebe5e57b10900f825c43a92b30319acd1d50715 Mon Sep 17 00:00:00 2001 From: Iain Lane Date: Mon, 12 May 2014 13:02:29 +0100 Subject: [PATCH 1/3] Add unity8 flavour --- debian/changelog | 21 +++++++++++++++++++++ live-build/auto/config | 7 +++++++ 2 files changed, 28 insertions(+) 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 From 23beed5123f6e3eb011bbbdc88d4d0344d07cf5e Mon Sep 17 00:00:00 2001 From: Iain Lane Date: Mon, 12 May 2014 16:23:06 +0100 Subject: [PATCH 2/3] Install the metapackage from the seed instead of just the session nb: can't use the task as this isn't generated yet --- debian/changelog | 6 ++++++ live-build/auto/config | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 7108b0bc..8c1766c8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.209+unity8.2) UNRELEASED; urgency=medium + + * Install the unity8 meta package instead of just the session + + -- Iain Lane Mon, 12 May 2014 16:22:37 +0100 + livecd-rootfs (2.209+unity8.1) utopic; urgency=medium * Merge with Utopic. Remaining changes: diff --git a/live-build/auto/config b/live-build/auto/config index 2f244a6d..eb25d1b9 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -194,7 +194,7 @@ case $PROJECT in ubuntu-unity8) add_task install minimal standard - add_package install unity8-desktop-session-x11 + add_package install ubuntu-unity8 COMPONENTS='main restricted universe' LIVE_TASK='ubuntu-live' ;; From 1a785e26151c9f999532e8831fcc1d816acff77b Mon Sep 17 00:00:00 2001 From: Iain Lane Date: Mon, 12 May 2014 16:23:47 +0100 Subject: [PATCH 3/3] releasing package livecd-rootfs version 2.209+unity8.2 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8c1766c8..ad79f4e1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -livecd-rootfs (2.209+unity8.2) UNRELEASED; urgency=medium +livecd-rootfs (2.209+unity8.2) utopic; urgency=medium * Install the unity8 meta package instead of just the session - -- Iain Lane Mon, 12 May 2014 16:22:37 +0100 + -- Iain Lane Mon, 12 May 2014 16:23:28 +0100 livecd-rootfs (2.209+unity8.1) utopic; urgency=medium