From 7f7f42d61d0b129a8baaab87ba522c098b614bda Mon Sep 17 00:00:00 2001 From: Iain Lane Date: Tue, 3 Apr 2018 11:56:32 +0100 Subject: [PATCH] Import patches-unapplied version 2.517 to ubuntu/bionic-proposed Imported using git-ubuntu import. Changelog parent: b3e90b47980c38b3a4b9af6abd8eb2fcef9a4953 New changelog entries: [ Simon Quigley ] * Add proper lubuntu support in BASE_SEED. --- debian/changelog | 7 +++++++ live-build/auto/config | 8 +++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 4ca89443..1a66cf1a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.517) bionic; urgency=medium + + [ Simon Quigley ] + * Add proper lubuntu support in BASE_SEED. + + -- Iain Lane Tue, 03 Apr 2018 11:56:32 +0100 + livecd-rootfs (2.516) bionic; urgency=medium [ Chris Glass ] diff --git a/live-build/auto/config b/live-build/auto/config index e02f0512..2bd67c77 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -667,9 +667,15 @@ esac # we'll expand the base seed given here according to the STRUCTURE file, and # then look in all of the seeds found to see which snaps are seeded case $PROJECT:${SUBPROJECT:-} in - ubuntu:*|kubuntu*:*|lubuntu*:*|xubuntu*:*|ubuntu-mate*:*|ubuntustudio*:*|ubuntukylin*:*|ubuntu-budgie*:*) + ubuntu:*|kubuntu*:*|xubuntu*:*|ubuntu-mate*:*|ubuntustudio*:*|ubuntukylin*:*|ubuntu-budgie*:*) BASE_SEED='desktop' ;; + lubuntu-next:*) + BASE_SEED='desktop-qt' + ;; + lubuntu:*) + BASE_SEED='desktop-gtk' + ;; ubuntu-server:live) BASE_SEED='server' # subiquity is seeded but in a separate squashfs via hooks; set HOOK_SNAPS and ALL_SNAPS.