[Merge] ~xubuntu-dev/livecd-rootfs:xubuntu-core into livecd-rootfs:ubuntu/master

[Steve Langasek]

Review: Approve



Diff comments:

> diff --git a/live-build/auto/config b/live-build/auto/config
> index 1722e98..2e0fda8 100755
> --- a/live-build/auto/config
> +++ b/live-build/auto/config
> @@ -776,7 +776,14 @@ case $PROJECT in
>  		;;
>  
>  	xubuntu)
> -		add_task install minimal standard xubuntu-desktop
> +		case ${SUBPROJECT:-} in
> +			minimal)
> +				add_task install minimal standard xubuntu-desktop-minimal
> +				;;
> +			*)
> +				add_task install minimal standard xubuntu-desktop
> +				;;
> +		esac

could be clever here and just write 'add_task install minimal standard xubuntu-desktop-${SUBPROJECT:+-$SUBPROJECT}' but nah

>  		add_package install xterm
>  		LIVE_TASK='xubuntu-live'
>  		case $ARCH in


-- 
https://code.launchpad.net/~xubuntu-dev/livecd-rootfs/+git/livecd-rootfs/+merge/435315
Your team Ubuntu Core Development Team is subscribed to branch livecd-rootfs:ubuntu/master.