Merge lp:~ubuntu-mate-dev/debian-cd/ubuntu-mate-base into lp:~ubuntu-cdimage/debian-cd/ubun3

[Martin Wimpress ]

[Martin Wimpress  (flexiondotorg)]

This merge proposal adds support for Xubuntu Base and Ubuntu MATE Base as discussed with Adam Conrad. The "Base" variants contain a minimal desktop environment suitable for experienced user to craft their own setup.

[Dimitri John Ledkov (xnox)]

Is this still needed? if yes, please provide design guidelines and any other changes that need to happen. And then it will need rebase onto current series.

Otherwise, we can drop this.

review: Needs Resubmitting

Unmerged revisions

1931. By Martin Wimpress  on 2016-01-26

Added ubuntu-mate-base.

1930. By Sean Davis on 2016-01-26

Replace Xubuntu Core with Base

1929. By Sean Davis on 2016-01-26

Merge in lp:~unit193/debian-cd/xubuntu-core via lp:~bluesabre/debian-cd/xubuntu-core to work around broken bzr hook

=== added directory 'data/wily/preseed/xubuntu-base'
=== added file 'data/wily/preseed/xubuntu-base/ltsp.seed'
--- data/wily/preseed/xubuntu-base/ltsp.seed	1970-01-01 00:00:00 +0000
+++ data/wily/preseed/xubuntu-base/ltsp.seed	2016-01-29 11:39:09 +0000
@@ -0,0 +1,13 @@
+# Build an LTSP client chroot.
+d-i	anna/choose_modules	string ltsp-client-builder
+d-i	ltsp-client-builder/run	boolean true
+d-i	ltsp-client-builder/build-client-opts	string --mirror file:///cdrom --security-mirror none --skipimage --components main,restricted,universe
+# Install the Xubuntu desktop and LTSP server.
+tasksel	tasksel/first	multiselect xubuntu-base
+d-i	preseed/early_command	string . /usr/share/debconf/confmodule; db_get debconf/priority; case $RET in low|medium) db_fset tasksel/first seen false; echo 'tasksel tasksel/first seen false' >>/var/lib/preseed/log ;; esac
+d-i	pkgsel/include/install-recommends	boolean true
+d-i	pkgsel/include	string ltsp-server-standalone openssh-server
+# No XFCE translation packages yet.
+d-i	pkgsel/language-pack-patterns	string
+# Build a client chroot.
+d-i	preseed/late_command	string chroot /target /usr/sbin/ltsp-update-sshkeys
 
=== added file 'data/wily/preseed/xubuntu-base/xubuntu-base.seed'
--- data/wily/preseed/xubuntu-base/xubuntu-base.seed	1970-01-01 00:00:00 +0000
+++ data/wily/preseed/xubuntu-base/xubuntu-base.seed	2016-01-29 11:39:09 +0000
@@ -0,0 +1,5 @@
+# Install the Xubuntu desktop.
+tasksel	tasksel/first	multiselect xubuntu-base
+d-i	preseed/early_command	string . /usr/share/debconf/confmodule; db_get debconf/priority; case $RET in low|medium) db_fset tasksel/first seen false; echo 'tasksel tasksel/first seen false' >>/var/lib/preseed/log ;; esac
+# No XFCE translation packages yet.
+d-i	pkgsel/language-pack-patterns	string
 
=== modified file 'data/wily/preseed/xubuntu/ltsp.seed'
--- data/wily/preseed/xubuntu/ltsp.seed	2015-05-08 05:28:37 +0000
+++ data/wily/preseed/xubuntu/ltsp.seed	2016-01-29 11:39:09 +0000
@@ -2,8 +2,6 @@
 d-i	anna/choose_modules	string ltsp-client-builder
 d-i	ltsp-client-builder/run	boolean true
 d-i	ltsp-client-builder/build-client-opts	string --mirror file:///cdrom --security-mirror none --skipimage --components main,restricted,universe
-# Enable extras.ubuntu.com.
-d-i	apt-setup/extras	boolean true
 # Install the Xubuntu desktop and LTSP server.
 tasksel	tasksel/first	multiselect xubuntu-desktop
 d-i	preseed/early_command	string . /usr/share/debconf/confmodule; db_get debconf/priority; case $RET in low|medium) db_fset tasksel/first seen false; echo 'tasksel tasksel/first seen false' >>/var/lib/preseed/log ;; esac
 
=== modified file 'data/wily/preseed/xubuntu/xubuntu.seed'
--- data/wily/preseed/xubuntu/xubuntu.seed	2015-05-08 05:28:37 +0000
+++ data/wily/preseed/xubuntu/xubuntu.seed	2016-01-29 11:39:09 +0000
@@ -1,5 +1,3 @@
-# Enable extras.ubuntu.com.
-d-i	apt-setup/extras	boolean true
 # Install the Xubuntu desktop.
 tasksel	tasksel/first	multiselect xubuntu-desktop
 d-i	preseed/early_command	string . /usr/share/debconf/confmodule; db_get debconf/priority; case $RET in low|medium) db_fset tasksel/first seen false; echo 'tasksel tasksel/first seen false' >>/var/lib/preseed/log ;; esac
 
=== added symlink 'data/wily/xubuntu-base-access.pcx'
=== target is u'xubuntu-access.pcx'
=== added symlink 'data/wily/xubuntu-base-blank.pcx'
=== target is u'xubuntu-blank.pcx'
=== added symlink 'data/wily/xubuntu-base.pcx'
=== target is u'xubuntu.pcx'
=== added symlink 'data/wily/xubuntu-base.png'
=== target is u'xubuntu.png'
=== modified file 'data/wily/xubuntu.pcx'
 Binary files data/wily/xubuntu.pcx	2015-05-08 05:28:37 +0000 and data/wily/xubuntu.pcx	2016-01-29 11:39:09 +0000 differ
=== added directory 'data/xenial/preseed/ubuntu-mate-base'
=== added file 'data/xenial/preseed/ubuntu-mate-base/ltsp.seed'
--- data/xenial/preseed/ubuntu-mate-base/ltsp.seed	1970-01-01 00:00:00 +0000
+++ data/xenial/preseed/ubuntu-mate-base/ltsp.seed	2016-01-29 11:39:09 +0000
@@ -0,0 +1,13 @@
+# Build an LTSP client chroot.
+d-i     anna/choose_modules     string ltsp-client-builder
+d-i     ltsp-client-builder/run boolean true
+d-i     ltsp-client-builder/build-client-opts   string --mirror file:///cdrom --security-mirror none --skipimage --components main,restricted,universe
+# Install the Ubuntu MATE desktop and LTSP server.
+tasksel tasksel/first   multiselect ubuntu-mate-core
+d-i     preseed/early_command   string . /usr/share/debconf/confmodule; db_get debconf/priority; case $RET in low|medium) db_fset tasksel/first seen false; echo 'tasksel tasksel/first seen false' >>/var/lib/preseed/log ;; esac
+d-i     pkgsel/include/install-recommends       boolean false
+d-i     pkgsel/include  string ltsp-server-standalone openssh-server
+# No MATE translation packages yet.
+d-i     pkgsel/language-pack-patterns   string
+# Build a client chroot.
+d-i     preseed/late_command    string chroot /target /usr/sbin/ltsp-update-sshkeys
 
=== added file 'data/xenial/preseed/ubuntu-mate-base/ubuntu-mate-base.seed'
--- data/xenial/preseed/ubuntu-mate-base/ubuntu-mate-base.seed	1970-01-01 00:00:00 +0000
+++ data/xenial/preseed/ubuntu-mate-base/ubuntu-mate-base.seed	2016-01-29 11:39:09 +0000
@@ -0,0 +1,5 @@
+# Install the Ubuntu MATE desktop.
+tasksel tasksel/first   multiselect ubuntu-mate-core
+d-i     preseed/early_command   string . /usr/share/debconf/confmodule; db_get debconf/priority; case $RET in low|medium) db_fset tasksel/first seen false; echo 'tasksel tasksel/first seen false' >>/var/lib/preseed/log ;; esac
+# No MATE translation packages yet.
+d-i     pkgsel/language-pack-patterns   string
 
=== added symlink 'data/xenial/ubuntu-mate-base-access.pcx'
=== target is u'ubuntu-mate-access.pcx'
=== added symlink 'data/xenial/ubuntu-mate-base-blank.pcx'
=== target is u'ubuntu-mate-blank.pcx'
=== added symlink 'data/xenial/ubuntu-mate-base.pcx'
=== target is u'ubuntu-mate.pcx'
=== added symlink 'data/xenial/ubuntu-mate-base.png'
=== target is u'ubuntu-mate.png'
=== modified file 'tools/add_live_filesystem'
--- tools/add_live_filesystem	2015-01-26 19:48:42 +0000
+++ tools/add_live_filesystem	2016-01-29 11:39:09 +0000
@@ -102,14 +102,14 @@
 # installation locale code.
 RELEASE_NOTES=
 case $PROJECT in
-	ubuntu|kubuntu|edubuntu|xubuntu|gobuntu|ubuntustudio|mythbuntu|lubuntu|ubuntu-gnome|ubuntukylin|ubuntu-desktop-next|ubuntu-mate)
-		case $DIST in
-			warty|hoary|breezy|dapper|edgy)
-				;;
-			*)
-				RELEASE_NOTES="http://www.ubuntu.com/getubuntu/releasenotes?os=$PROJECT&ver=${DEBVERSION%% *}&lang=\${LANG}"
-				;;
-		esac
+	ubuntu|kubuntu|edubuntu|xubuntu|ubuntustudio|mythbuntu|lubuntu|ubuntu-gnome|ubuntukylin|ubuntu-desktop-next|ubuntu-mate)
+		RELEASE_NOTES="http://www.ubuntu.com/getubuntu/releasenotes?os=$PROJECT&ver=${DEBVERSION%% *}&lang=\${LANG}"
+		;;
+	ubuntu-mate-base)
+		RELEASE_NOTES="http://www.ubuntu.com/getubuntu/releasenotes?os=ubuntu-mate&ver=${DEBVERSION%% *}&lang=\${LANG}"
+		;;                
+	xubuntu-base)
+		RELEASE_NOTES="http://www.ubuntu.com/getubuntu/releasenotes?os=xubuntu&ver=${DEBVERSION%% *}&lang=\${LANG}"
 		;;
 esac
 if [ "$RELEASE_NOTES" ]; then
 
=== modified file 'tools/boot/wily/boot-amd64'
--- tools/boot/wily/boot-amd64	2015-05-14 16:01:23 +0000
+++ tools/boot/wily/boot-amd64	2016-01-29 11:39:09 +0000
@@ -185,7 +185,7 @@
 HIDDEN_TIMEOUT=
 if [ "$CDIMAGE_LIVE" = 1 ] && [ "$CDIMAGE_DVD" != 1 ]; then
     case $PROJECT in
-	ubuntu|ubuntu-netbook|xubuntu|ubuntukylin|kubuntu|kubuntu-plasma5|ubuntu-gnome|ubuntu-desktop-next|ubuntu-mate)
+	ubuntu|ubuntu-netbook|xubuntu|xubuntu-base|ubuntukylin|kubuntu|kubuntu-plasma5|ubuntu-gnome|ubuntu-desktop-next|ubuntu-mate)
 	    HIDDEN_TIMEOUT=2
 	    ;;
 	mythbuntu)
@@ -361,7 +361,7 @@
     cat >> boot$N/isolinux/gfxboot.cfg <<EOF
 access-options=v1 v2 brltty m1
 EOF
-elif [ "$PROJECT" = xubuntu ]; then
+elif [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = xubuntu-base ]; then
     # v1 and m1 don't have the necessary sed calls for Xubuntu yet.
     cat >> boot$N/isolinux/gfxboot.cfg <<EOF
 access-options=v2 v3 brltty m2
@@ -541,7 +541,7 @@
 EOF
     fi
 fi
-if [ "$CDIMAGE_INSTALL" = 1 ] && ([ "$PROJECT" = ubuntu ] || [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = edubuntu ] || [ "$PROJECT" = ubuntu-mate ]); then
+if [ "$CDIMAGE_INSTALL" = 1 ] && ([ "$PROJECT" = ubuntu ] || [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = xubuntu-base ] || [ "$PROJECT" = edubuntu ] || [ "$PROJECT" = ubuntu-mate ]); then
     cat >> boot$N/isolinux/gfxboot.cfg <<EOF
 label ltsp=Install an LTSP server
 replace ltsp=file=/cdrom/preseed/ltsp.seed
 
=== modified file 'tools/boot/wily/boot-amd64+mac'
--- tools/boot/wily/boot-amd64+mac	2015-05-14 16:01:23 +0000
+++ tools/boot/wily/boot-amd64+mac	2016-01-29 11:39:09 +0000
@@ -173,7 +173,7 @@
 HIDDEN_TIMEOUT=
 if [ "$CDIMAGE_LIVE" = 1 ] && [ "$CDIMAGE_DVD" != 1 ]; then
     case $PROJECT in
-	ubuntu|ubuntu-netbook|xubuntu|ubuntukylin|kubuntu|kubuntu-plasma5|ubuntu-gnome|ubuntu-mate)
+	ubuntu|ubuntu-netbook|xubuntu|xubuntu-base|ubuntukylin|kubuntu|kubuntu-plasma5|ubuntu-gnome|ubuntu-mate)
 	    HIDDEN_TIMEOUT=2
 	    ;;
 	mythbuntu)
@@ -336,7 +336,7 @@
     cat >> boot$N/isolinux/gfxboot.cfg <<EOF
 access-options=v1 v2 brltty m1
 EOF
-elif [ "$PROJECT" = xubuntu ]; then
+elif [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = xubuntu-base ]; then
     # v1 and m1 don't have the necessary sed calls for Xubuntu yet.
     cat >> boot$N/isolinux/gfxboot.cfg <<EOF
 access-options=v2 v3 brltty m2
@@ -463,7 +463,7 @@
 EOF
     fi
 fi
-if [ "$CDIMAGE_INSTALL" = 1 ] && ([ "$PROJECT" = ubuntu ] || [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = edubuntu ] || [ "$PROJECT" = ubuntu-mate ]); then
+if [ "$CDIMAGE_INSTALL" = 1 ] && ([ "$PROJECT" = ubuntu ] || [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = xubuntu-base ] || [ "$PROJECT" = edubuntu ] || [ "$PROJECT" = ubuntu-mate ]); then
     cat >> boot$N/isolinux/gfxboot.cfg <<EOF
 label ltsp=Install an LTSP server
 replace ltsp=file=/cdrom/preseed/ltsp.seed
 
=== modified file 'tools/boot/wily/boot-i386'
--- tools/boot/wily/boot-i386	2015-05-14 16:01:23 +0000
+++ tools/boot/wily/boot-i386	2016-01-29 11:39:09 +0000
@@ -174,7 +174,7 @@
 HIDDEN_TIMEOUT=
 if [ "$CDIMAGE_LIVE" = 1 ] && [ "$CDIMAGE_DVD" != 1 ]; then
     case $PROJECT in
-	ubuntu|ubuntu-netbook|xubuntu|ubuntukylin|kubuntu|kubuntu-plasma5|ubuntu-gnome|ubuntu-desktop-next|ubuntu-mate)
+	ubuntu|ubuntu-netbook|xubuntu|xubuntu-base|ubuntukylin|kubuntu|kubuntu-plasma5|ubuntu-gnome|ubuntu-desktop-next|ubuntu-mate)
 	    HIDDEN_TIMEOUT=2
 	    ;;
 	mythbuntu)
@@ -341,7 +341,7 @@
     cat >> boot$N/isolinux/gfxboot.cfg <<EOF
 access-options=v1 v2 brltty m1
 EOF
-elif [ "$PROJECT" = xubuntu ]; then
+elif [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = xubuntu-base ]; then
     # v1 and m1 don't have the necessary sed calls for Xubuntu yet.
     cat >> boot$N/isolinux/gfxboot.cfg <<EOF
 access-options=v2 v3 brltty m2
@@ -467,7 +467,7 @@
 EOF
     fi
 fi
-if [ "$CDIMAGE_INSTALL" = 1 ] && ([ "$PROJECT" = ubuntu ] || [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = edubuntu ] || [ "$PROJECT" = ubuntu-mate ]); then
+if [ "$CDIMAGE_INSTALL" = 1 ] && ([ "$PROJECT" = ubuntu ] || [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = xubuntu-base ] || [ "$PROJECT" = edubuntu ] || [ "$PROJECT" = ubuntu-mate ]); then
     cat >> boot$N/isolinux/gfxboot.cfg <<EOF
 label ltsp=Install an LTSP server
 replace ltsp=file=/cdrom/preseed/ltsp.seed
 
=== modified file 'tools/boot/wily/boot-powerpc'
--- tools/boot/wily/boot-powerpc	2015-05-14 16:01:23 +0000
+++ tools/boot/wily/boot-powerpc	2016-01-29 11:39:09 +0000
@@ -188,7 +188,7 @@
  if [ "$CDIMAGE_INSTALL_BASE" = 1 ] && [ "$PROJECT" != ubuntu-server ]; then
      cat $BASEDIR/data/$CODENAME/yaboot/yaboot.conf.cli
  fi
- if [ "$CDIMAGE_INSTALL" = 1 ] && ([ "$PROJECT" = ubuntu ] || [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = ubuntu-mate ]); then
+ if [ "$CDIMAGE_INSTALL" = 1 ] && ([ "$PROJECT" = ubuntu ] || [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = xubuntu-base ] || [ "$PROJECT" = ubuntu-mate ]); then
      cat $BASEDIR/data/$CODENAME/yaboot/yaboot.conf.ltsp
  fi
  if [ "$CDIMAGE_LIVE" = 1 ]; then
 
=== modified file 'tools/boot/wily/common.sh'
--- tools/boot/wily/common.sh	2015-05-14 16:01:23 +0000
+++ tools/boot/wily/common.sh	2016-01-29 11:39:09 +0000
@@ -33,6 +33,9 @@
 	xubuntu)
 	    DEFAULT_PRESEED='file=/cdrom/preseed/xubuntu.seed'
 	    ;;
+	xubuntu-base)
+	    DEFAULT_PRESEED='file=/cdrom/preseed/xubuntu-base.seed'
+	    ;;
 	ubuntu-server)
 	    DEFAULT_PRESEED='file=/cdrom/preseed/ubuntu-server.seed'
 	    ;;
 
=== modified file 'tools/boot/xenial/boot-amd64'
--- tools/boot/xenial/boot-amd64	2015-10-22 16:03:46 +0000
+++ tools/boot/xenial/boot-amd64	2016-01-29 11:39:09 +0000
@@ -185,7 +185,7 @@
 HIDDEN_TIMEOUT=
 if [ "$CDIMAGE_LIVE" = 1 ] && [ "$CDIMAGE_DVD" != 1 ]; then
     case $PROJECT in
-	ubuntu|ubuntu-netbook|xubuntu|ubuntukylin|kubuntu|kubuntu-plasma5|ubuntu-gnome|ubuntu-desktop-next|ubuntu-mate)
+	ubuntu|ubuntu-netbook|xubuntu|xubuntu-base|ubuntukylin|kubuntu|kubuntu-plasma5|ubuntu-gnome|ubuntu-desktop-next|ubuntu-mate|ubuntu-mate-base)
 	    HIDDEN_TIMEOUT=2
 	    ;;
 	mythbuntu)
@@ -338,7 +338,7 @@
 screen-colour=0x2D3335
 EOF
 fi
-if [ "$PROJECT" = ubuntu-mate ]; then
+if [ "$PROJECT" = ubuntu-mate ] || [ "$PROJECT" = ubuntu-mate-base ]; then
     cat >> boot$N/isolinux/gfxboot.cfg <<EOF
 foreground=0xffffff
 background=0x87a556
@@ -361,7 +361,7 @@
     cat >> boot$N/isolinux/gfxboot.cfg <<EOF
 access-options=v1 v2 brltty m1
 EOF
-elif [ "$PROJECT" = xubuntu ]; then
+elif [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = xubuntu-base ]; then
     # v1 and m1 don't have the necessary sed calls for Xubuntu yet.
     cat >> boot$N/isolinux/gfxboot.cfg <<EOF
 access-options=v2 v3 brltty m2
@@ -541,7 +541,7 @@
 EOF
     fi
 fi
-if [ "$CDIMAGE_INSTALL" = 1 ] && ([ "$PROJECT" = ubuntu ] || [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = edubuntu ] || [ "$PROJECT" = ubuntu-mate ]); then
+if [ "$CDIMAGE_INSTALL" = 1 ] && ([ "$PROJECT" = ubuntu ] || [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = xubuntu-base ] || [ "$PROJECT" = edubuntu ] || [ "$PROJECT" = ubuntu-mate ] || [ "$PROJECT" = ubuntu-mate-base ]); then
     cat >> boot$N/isolinux/gfxboot.cfg <<EOF
 label ltsp=Install an LTSP server
 replace ltsp=file=/cdrom/preseed/ltsp.seed
 
=== modified file 'tools/boot/xenial/boot-amd64+mac'
--- tools/boot/xenial/boot-amd64+mac	2015-10-22 16:03:46 +0000
+++ tools/boot/xenial/boot-amd64+mac	2016-01-29 11:39:09 +0000
@@ -173,7 +173,7 @@
 HIDDEN_TIMEOUT=
 if [ "$CDIMAGE_LIVE" = 1 ] && [ "$CDIMAGE_DVD" != 1 ]; then
     case $PROJECT in
-	ubuntu|ubuntu-netbook|xubuntu|ubuntukylin|kubuntu|kubuntu-plasma5|ubuntu-gnome|ubuntu-mate)
+	ubuntu|ubuntu-netbook|xubuntu|xubuntu-base|ubuntukylin|kubuntu|kubuntu-plasma5|ubuntu-gnome|ubuntu-mate|ubuntu-mate-base)
 	    HIDDEN_TIMEOUT=2
 	    ;;
 	mythbuntu)
@@ -313,7 +313,7 @@
 screen-colour=0x270A1E
 EOF
 fi
-if [ "$PROJECT" = ubuntu-mate ]; then
+if [ "$PROJECT" = ubuntu-mate ] || [ "$PROJECT" = ubuntu-mate-base ]; then
     cat >> boot$N/isolinux/gfxboot.cfg <<EOF
 foreground=0xffffff
 background=0x87a556
@@ -336,7 +336,7 @@
     cat >> boot$N/isolinux/gfxboot.cfg <<EOF
 access-options=v1 v2 brltty m1
 EOF
-elif [ "$PROJECT" = xubuntu ]; then
+elif [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = xubuntu-base ]; then
     # v1 and m1 don't have the necessary sed calls for Xubuntu yet.
     cat >> boot$N/isolinux/gfxboot.cfg <<EOF
 access-options=v2 v3 brltty m2
@@ -463,7 +463,7 @@
 EOF
     fi
 fi
-if [ "$CDIMAGE_INSTALL" = 1 ] && ([ "$PROJECT" = ubuntu ] || [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = edubuntu ] || [ "$PROJECT" = ubuntu-mate ]); then
+if [ "$CDIMAGE_INSTALL" = 1 ] && ([ "$PROJECT" = ubuntu ] || [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = xubuntu-base ] || [ "$PROJECT" = edubuntu ] || [ "$PROJECT" = ubuntu-mate ] || [ "$PROJECT" = ubuntu-mate-base ]); then
     cat >> boot$N/isolinux/gfxboot.cfg <<EOF
 label ltsp=Install an LTSP server
 replace ltsp=file=/cdrom/preseed/ltsp.seed
 
=== modified file 'tools/boot/xenial/boot-i386'
--- tools/boot/xenial/boot-i386	2015-10-22 16:03:46 +0000
+++ tools/boot/xenial/boot-i386	2016-01-29 11:39:09 +0000
@@ -174,7 +174,7 @@
 HIDDEN_TIMEOUT=
 if [ "$CDIMAGE_LIVE" = 1 ] && [ "$CDIMAGE_DVD" != 1 ]; then
     case $PROJECT in
-	ubuntu|ubuntu-netbook|xubuntu|ubuntukylin|kubuntu|kubuntu-plasma5|ubuntu-gnome|ubuntu-desktop-next|ubuntu-mate)
+	ubuntu|ubuntu-netbook|xubuntu|xubuntu-base|ubuntukylin|kubuntu|kubuntu-plasma5|ubuntu-gnome|ubuntu-desktop-next|ubuntu-mate|ubuntu-mate-base)
 	    HIDDEN_TIMEOUT=2
 	    ;;
 	mythbuntu)
@@ -318,7 +318,7 @@
 screen-colour=0x2D3335
 EOF
 fi
-if [ "$PROJECT" = ubuntu-mate ]; then
+if [ "$PROJECT" = ubuntu-mate ] || [ "$PROJECT" = ubuntu-mate-base ]; then
     cat >> boot$N/isolinux/gfxboot.cfg <<EOF
 foreground=0xffffff
 background=0x87a556
@@ -341,7 +341,7 @@
     cat >> boot$N/isolinux/gfxboot.cfg <<EOF
 access-options=v1 v2 brltty m1
 EOF
-elif [ "$PROJECT" = xubuntu ]; then
+elif [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = xubuntu-base ]; then
     # v1 and m1 don't have the necessary sed calls for Xubuntu yet.
     cat >> boot$N/isolinux/gfxboot.cfg <<EOF
 access-options=v2 v3 brltty m2
@@ -467,7 +467,7 @@
 EOF
     fi
 fi
-if [ "$CDIMAGE_INSTALL" = 1 ] && ([ "$PROJECT" = ubuntu ] || [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = edubuntu ] || [ "$PROJECT" = ubuntu-mate ]); then
+if [ "$CDIMAGE_INSTALL" = 1 ] && ([ "$PROJECT" = ubuntu ] || [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = xubuntu-base ] || [ "$PROJECT" = edubuntu ] || [ "$PROJECT" = ubuntu-mate ] || [ "$PROJECT" = ubuntu-mate-base ]); then
     cat >> boot$N/isolinux/gfxboot.cfg <<EOF
 label ltsp=Install an LTSP server
 replace ltsp=file=/cdrom/preseed/ltsp.seed
 
=== modified file 'tools/boot/xenial/boot-powerpc'
--- tools/boot/xenial/boot-powerpc	2015-10-22 16:03:46 +0000
+++ tools/boot/xenial/boot-powerpc	2016-01-29 11:39:09 +0000
@@ -188,7 +188,7 @@
  if [ "$CDIMAGE_INSTALL_BASE" = 1 ] && [ "$PROJECT" != ubuntu-server ]; then
      cat $BASEDIR/data/$CODENAME/yaboot/yaboot.conf.cli
  fi
- if [ "$CDIMAGE_INSTALL" = 1 ] && ([ "$PROJECT" = ubuntu ] || [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = ubuntu-mate ]); then
+ if [ "$CDIMAGE_INSTALL" = 1 ] && ([ "$PROJECT" = ubuntu ] || [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = xubuntu-base ] || [ "$PROJECT" = ubuntu-mate ] || [ "$PROJECT" = ubuntu-mate-base ]); then
      cat $BASEDIR/data/$CODENAME/yaboot/yaboot.conf.ltsp
  fi
  if [ "$CDIMAGE_LIVE" = 1 ]; then
 
=== modified file 'tools/boot/xenial/common.sh'
--- tools/boot/xenial/common.sh	2015-12-11 12:28:40 +0000
+++ tools/boot/xenial/common.sh	2016-01-29 11:39:09 +0000
@@ -33,6 +33,9 @@
 	xubuntu)
 	    DEFAULT_PRESEED='file=/cdrom/preseed/xubuntu.seed'
 	    ;;
+	xubuntu-base)
+	    DEFAULT_PRESEED='file=/cdrom/preseed/xubuntu-base.seed'
+	    ;;        
 	ubuntu-server)
 	    DEFAULT_PRESEED='file=/cdrom/preseed/ubuntu-server.seed'
 	    ;;
@@ -60,6 +63,9 @@
 	ubuntu-mate)
 	    DEFAULT_PRESEED='file=/cdrom/preseed/ubuntu-mate.seed'
 	    ;;
+	ubuntu-mate-base)
+	    DEFAULT_PRESEED='file=/cdrom/preseed/ubuntu-mate-base.seed'
+	    ;;        
 	*)
 	    DEFAULT_PRESEED=
 	    ;;