Merge remote-tracking branch 'xubuntu-dev/xubuntu-core' into ubuntu/master

debian/tests/default-bootstraps

@@ -38,7 +38,8 @@ ALL_TRIPLETS="
  ubuntu-mate-live::
  ubuntu-netbook::
  ubuntu-server:live:ubuntu-server
- xubuntu::"
+ xubuntu::
+ xubuntu:minimal:"
 
 if [ -z "$SELECTED_TRIPLETS" ]; then
     SELECTED_TRIPLETS="

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
 		add_package install xterm
 		LIVE_TASK='xubuntu-live'
 		case $ARCH in