Merge remote-tracking branch 'edubuntu-dev/ubuntu/master' into ubuntu/master

debian/tests/default-bootstraps

@@ -13,6 +13,7 @@ fi
 # Listed subprojects can be combined with other projects as well,
 # but this list gives reasonable coverage.
 ALL_TRIPLETS="
+ edubuntu::
  kubuntu::
  kubuntu-dvd::
  kubuntu-plasma5::

live-build/auto/config

@@ -653,7 +653,7 @@ case $PROJECT in
 	ubuntu-server)
 		COMPONENTS='main'
 		;;
-	kubuntu|kubuntu-dvd|kubuntu-plasma5|ubuntu-gnome|ubuntu-budgie|ubuntukylin)
+	kubuntu|kubuntu-dvd|kubuntu-plasma5|edubuntu|ubuntu-gnome|ubuntu-budgie|ubuntukylin)
 		COMPONENTS='main restricted universe'
 		;;
 	xubuntu|mythbuntu|lubuntu|ubuntu-mate|ubuntu-unity|ubuntustudio-dvd|ubuntu-unity)
@@ -775,6 +775,11 @@ case $PROJECT in
 		add_chroot_hook remove-gnome-icon-cache
 		;;
 
+	edubuntu)
+		add_task install minimal standard ubuntu-minimal edubuntu-desktop-gnome
+		LIVE_TASK='edubuntu-live'
+		;;
+
 	xubuntu)
 		case ${SUBPROJECT:-} in
 			minimal)