Merge lp:~fossfreedom/debian-cd/ubuntu-budgie into lp:~ubuntu-cdimage/debian-cd/ubun3

[fossfreedom]

This merge proposal on behalf of Ubuntu Budgie hopefully resolves the linked bug report. I have taken the approach of grep'ing through the source for "ubuntu-gnome" and added "ubuntu-budgie" equivalents.

I used the project name "ubuntu-budgie" simply because our current cdimages are similarly named - http://cdimage.ubuntu.com/ubuntu-budgie/

[Mathieu Trudel-Lapierre (cyphermox)]

This merge looks fine to me (but I can't merge it). The only piece that actually affects the linked bug is to set HIDDEN_TIMEOUT=2 so that if no key is pressed (in accessiblity scenarios) then the system will continue to maybe-ubiquity (the panel that lets you choose between Try and Install). It *will not* always boot to that panel, if a key is pressed when the accessibility icon shows you will still have the option of choosing exactly how you want to start.

review: Approve

[Steve Langasek (vorlon)]

review: Needs Fixing

[lp:~fossfreedom/debian-cd/ubuntu-budgie]

1957. By fossfreedom on 2017-02-08

remove obsolete extra repo, comment out keep-installed line that contains obsolete packages

[fossfreedom (fossfreedom)]

Thanks Steve,

 didnt know about the extras repo - so deleted that line

For the openoffice package I've commented out that line

[fossfreedom (fossfreedom)]

resubmit

review: Needs Resubmitting

=== added directory 'data/zesty/preseed/ubuntu-budgie'
=== added file 'data/zesty/preseed/ubuntu-budgie/ubuntu-budgie.seed'
--- data/zesty/preseed/ubuntu-budgie/ubuntu-budgie.seed	1970-01-01 00:00:00 +0000
+++ data/zesty/preseed/ubuntu-budgie/ubuntu-budgie.seed	2017-02-08 07:45:31 +0000
@@ -0,0 +1,8 @@
+# Install the Ubuntu Budgie desktop.
+tasksel	tasksel/first	multiselect ubuntu-budgie-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
+# On live DVDs, don't spend huge amounts of time removing substantial
+# application packages pulled in by language packs. Given that we clearly
+# have the space to include them on the DVD, they're useful and we might as
+# well keep them installed.
+#ubiquity	ubiquity/keep-installed	string icedtea6-plugin openoffice.org

=== added file 'data/zesty/ubuntu-budgie.pcx'
Binary files data/zesty/ubuntu-budgie.pcx	1970-01-01 00:00:00 +0000 and data/zesty/ubuntu-budgie.pcx	2017-02-08 07:45:31 +0000 differ
=== added file 'data/zesty/ubuntu-budgie.png'
Binary files data/zesty/ubuntu-budgie.png	1970-01-01 00:00:00 +0000 and data/zesty/ubuntu-budgie.png	2017-02-08 07:45:31 +0000 differ
=== modified file 'tools/add_live_filesystem'
--- tools/add_live_filesystem	2016-04-18 10:21:34 +0000
+++ tools/add_live_filesystem	2017-02-08 07:45:31 +0000
@@ -105,7 +105,7 @@
 # installation locale code.
 RELEASE_NOTES=
 case $PROJECT in
-	ubuntu|kubuntu|edubuntu|xubuntu|gobuntu|ubuntustudio|mythbuntu|lubuntu|ubuntu-gnome|ubuntukylin|ubuntu-desktop-next|ubuntu-mate)
+	ubuntu|kubuntu|edubuntu|xubuntu|gobuntu|ubuntustudio|mythbuntu|lubuntu|ubuntu-gnome|ubuntukylin|ubuntu-desktop-next|ubuntu-mate|ubuntu-budgie)
 		case $DIST in
 			warty|hoary|breezy|dapper|edgy)
 				;;

=== modified file 'tools/boot/zesty/boot-amd64'
--- tools/boot/zesty/boot-amd64	2016-10-25 19:09:23 +0000
+++ tools/boot/zesty/boot-amd64	2017-02-08 07:45:31 +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|ubuntukylin|kubuntu|kubuntu-plasma5|ubuntu-gnome|ubuntu-desktop-next|ubuntu-mate|ubuntu-budgie)
 	    HIDDEN_TIMEOUT=2
 	    ;;
 	mythbuntu)
@@ -338,6 +338,13 @@
 screen-colour=0x2D3335
 EOF
 fi
+if [ "$PROJECT" = ubuntu-budgie ]; then
+    cat >> boot$N/isolinux/gfxboot.cfg <<EOF
+foreground=0xffffff
+background=0xd3dae3
+screen-colour=0x383c4a
+EOF
+fi
 if [ "$PROJECT" = ubuntu-mate ]; then
     cat >> boot$N/isolinux/gfxboot.cfg <<EOF
 foreground=0xffffff

=== modified file 'tools/boot/zesty/boot-amd64+mac'
--- tools/boot/zesty/boot-amd64+mac	2016-10-25 19:09:23 +0000
+++ tools/boot/zesty/boot-amd64+mac	2017-02-08 07:45:31 +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|ubuntukylin|kubuntu|kubuntu-plasma5|ubuntu-gnome|ubuntu-mate|ubuntu-budgie)
 	    HIDDEN_TIMEOUT=2
 	    ;;
 	mythbuntu)
@@ -313,6 +313,13 @@
 screen-colour=0x270A1E
 EOF
 fi
+if [ "$PROJECT" = ubuntu-budgie ]; then
+    cat >> boot$N/isolinux/gfxboot.cfg <<EOF
+foreground=0xffffff
+background=0xd3dae3
+screen-colour=0x383c4a
+EOF
+fi
 if [ "$PROJECT" = ubuntu-mate ]; then
     cat >> boot$N/isolinux/gfxboot.cfg <<EOF
 foreground=0xffffff

=== modified file 'tools/boot/zesty/boot-i386'
--- tools/boot/zesty/boot-i386	2016-10-25 19:09:23 +0000
+++ tools/boot/zesty/boot-i386	2017-02-08 07:45:31 +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|ubuntukylin|kubuntu|kubuntu-plasma5|ubuntu-gnome|ubuntu-desktop-next|ubuntu-mate|ubuntu-budgie)
 	    HIDDEN_TIMEOUT=2
 	    ;;
 	mythbuntu)
@@ -318,6 +318,13 @@
 screen-colour=0x2D3335
 EOF
 fi
+if [ "$PROJECT" = ubuntu-budgie ]; then
+    cat >> boot$N/isolinux/gfxboot.cfg <<EOF
+foreground=0xffffff
+background=0xd3dae3
+screen-colour=0x383c4a
+EOF
+fi
 if [ "$PROJECT" = ubuntu-mate ]; then
     cat >> boot$N/isolinux/gfxboot.cfg <<EOF
 foreground=0xffffff

=== modified file 'tools/boot/zesty/common.sh'
--- tools/boot/zesty/common.sh	2016-10-25 19:09:23 +0000
+++ tools/boot/zesty/common.sh	2017-02-08 07:45:31 +0000
@@ -60,6 +60,9 @@
 	ubuntu-mate)
 	    DEFAULT_PRESEED='file=/cdrom/preseed/ubuntu-mate.seed'
 	    ;;
+	ubuntu-budgie)
+	    DEFAULT_PRESEED='file=/cdrom/preseed/ubuntu-budgie.seed'
+	    ;;
 	*)
 	    DEFAULT_PRESEED=
 	    ;;