debian-cd

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

  1. ubuntu-budgie
  2. Merge into ubun3
Proposed by fossfreedom
Status: Merged
Merged at revision: 1957
Proposed branch: lp:~fossfreedom/debian-cd/ubuntu-budgie
Merge into: lp:~ubuntu-cdimage/debian-cd/ubun3
Diff against target: 125 lines (+36/-4)
6 files modified
data/zesty/preseed/ubuntu-budgie/ubuntu-budgie.seed (+8/-0)
tools/add_live_filesystem (+1/-1)
tools/boot/zesty/boot-amd64 (+8/-1)
tools/boot/zesty/boot-amd64+mac (+8/-1)
tools/boot/zesty/boot-i386 (+8/-1)
tools/boot/zesty/common.sh (+3/-0)
To merge this branch: bzr merge lp:~fossfreedom/debian-cd/ubuntu-budgie
Reviewer Review Type Date Requested Status
fossfreedom (community) Needs Resubmitting
Steve Langasek Needs Fixing
Mathieu Trudel-Lapierre (community) Approve
Review via email: mp+315852@code.launchpad.net

Description of the change

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/

To post a comment you must log in.
Revision history for this message
Mathieu Trudel-Lapierre (cyphermox) wrote :

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
Revision history for this message
Steve Langasek (vorlon) :
review: Needs Fixing
lp:~fossfreedom/debian-cd/ubuntu-budgie updated
1957. By fossfreedom

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

Revision history for this message
fossfreedom (fossfreedom) wrote :

Thanks Steve,

 didnt know about the extras repo - so deleted that line

For the openoffice package I've commented out that line

Revision history for this message
fossfreedom (fossfreedom) wrote :

resubmit

review: Needs Resubmitting

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1# Install the Ubuntu Budgie desktop.
2tasksel tasksel/first multiselect ubuntu-budgie-desktop
3d-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
4# On live DVDs, don't spend huge amounts of time removing substantial
5# application packages pulled in by language packs. Given that we clearly
6# have the space to include them on the DVD, they're useful and we might as
7# well keep them installed.
8#ubiquity ubiquity/keep-installed string icedtea6-plugin openoffice.org
09
=== added file 'data/zesty/ubuntu-budgie.pcx'
1Binary 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 differ10Binary 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'
2Binary 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 differ11Binary 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 @@
105# installation locale code.105# installation locale code.
106RELEASE_NOTES=106RELEASE_NOTES=
107case $PROJECT in107case $PROJECT in
108 ubuntu|kubuntu|edubuntu|xubuntu|gobuntu|ubuntustudio|mythbuntu|lubuntu|ubuntu-gnome|ubuntukylin|ubuntu-desktop-next|ubuntu-mate)108 ubuntu|kubuntu|edubuntu|xubuntu|gobuntu|ubuntustudio|mythbuntu|lubuntu|ubuntu-gnome|ubuntukylin|ubuntu-desktop-next|ubuntu-mate|ubuntu-budgie)
109 case $DIST in109 case $DIST in
110 warty|hoary|breezy|dapper|edgy)110 warty|hoary|breezy|dapper|edgy)
111 ;;111 ;;
112112
=== 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 @@
185HIDDEN_TIMEOUT=185HIDDEN_TIMEOUT=
186if [ "$CDIMAGE_LIVE" = 1 ] && [ "$CDIMAGE_DVD" != 1 ]; then186if [ "$CDIMAGE_LIVE" = 1 ] && [ "$CDIMAGE_DVD" != 1 ]; then
187 case $PROJECT in187 case $PROJECT in
188 ubuntu|ubuntu-netbook|xubuntu|ubuntukylin|kubuntu|kubuntu-plasma5|ubuntu-gnome|ubuntu-desktop-next|ubuntu-mate)188 ubuntu|ubuntu-netbook|xubuntu|ubuntukylin|kubuntu|kubuntu-plasma5|ubuntu-gnome|ubuntu-desktop-next|ubuntu-mate|ubuntu-budgie)
189 HIDDEN_TIMEOUT=2189 HIDDEN_TIMEOUT=2
190 ;;190 ;;
191 mythbuntu)191 mythbuntu)
@@ -338,6 +338,13 @@
338screen-colour=0x2D3335338screen-colour=0x2D3335
339EOF339EOF
340fi340fi
341if [ "$PROJECT" = ubuntu-budgie ]; then
342 cat >> boot$N/isolinux/gfxboot.cfg <<EOF
343foreground=0xffffff
344background=0xd3dae3
345screen-colour=0x383c4a
346EOF
347fi
341if [ "$PROJECT" = ubuntu-mate ]; then348if [ "$PROJECT" = ubuntu-mate ]; then
342 cat >> boot$N/isolinux/gfxboot.cfg <<EOF349 cat >> boot$N/isolinux/gfxboot.cfg <<EOF
343foreground=0xffffff350foreground=0xffffff
344351
=== 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 @@
173HIDDEN_TIMEOUT=173HIDDEN_TIMEOUT=
174if [ "$CDIMAGE_LIVE" = 1 ] && [ "$CDIMAGE_DVD" != 1 ]; then174if [ "$CDIMAGE_LIVE" = 1 ] && [ "$CDIMAGE_DVD" != 1 ]; then
175 case $PROJECT in175 case $PROJECT in
176 ubuntu|ubuntu-netbook|xubuntu|ubuntukylin|kubuntu|kubuntu-plasma5|ubuntu-gnome|ubuntu-mate)176 ubuntu|ubuntu-netbook|xubuntu|ubuntukylin|kubuntu|kubuntu-plasma5|ubuntu-gnome|ubuntu-mate|ubuntu-budgie)
177 HIDDEN_TIMEOUT=2177 HIDDEN_TIMEOUT=2
178 ;;178 ;;
179 mythbuntu)179 mythbuntu)
@@ -313,6 +313,13 @@
313screen-colour=0x270A1E313screen-colour=0x270A1E
314EOF314EOF
315fi315fi
316if [ "$PROJECT" = ubuntu-budgie ]; then
317 cat >> boot$N/isolinux/gfxboot.cfg <<EOF
318foreground=0xffffff
319background=0xd3dae3
320screen-colour=0x383c4a
321EOF
322fi
316if [ "$PROJECT" = ubuntu-mate ]; then323if [ "$PROJECT" = ubuntu-mate ]; then
317 cat >> boot$N/isolinux/gfxboot.cfg <<EOF324 cat >> boot$N/isolinux/gfxboot.cfg <<EOF
318foreground=0xffffff325foreground=0xffffff
319326
=== 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 @@
174HIDDEN_TIMEOUT=174HIDDEN_TIMEOUT=
175if [ "$CDIMAGE_LIVE" = 1 ] && [ "$CDIMAGE_DVD" != 1 ]; then175if [ "$CDIMAGE_LIVE" = 1 ] && [ "$CDIMAGE_DVD" != 1 ]; then
176 case $PROJECT in176 case $PROJECT in
177 ubuntu|ubuntu-netbook|xubuntu|ubuntukylin|kubuntu|kubuntu-plasma5|ubuntu-gnome|ubuntu-desktop-next|ubuntu-mate)177 ubuntu|ubuntu-netbook|xubuntu|ubuntukylin|kubuntu|kubuntu-plasma5|ubuntu-gnome|ubuntu-desktop-next|ubuntu-mate|ubuntu-budgie)
178 HIDDEN_TIMEOUT=2178 HIDDEN_TIMEOUT=2
179 ;;179 ;;
180 mythbuntu)180 mythbuntu)
@@ -318,6 +318,13 @@
318screen-colour=0x2D3335318screen-colour=0x2D3335
319EOF319EOF
320fi320fi
321if [ "$PROJECT" = ubuntu-budgie ]; then
322 cat >> boot$N/isolinux/gfxboot.cfg <<EOF
323foreground=0xffffff
324background=0xd3dae3
325screen-colour=0x383c4a
326EOF
327fi
321if [ "$PROJECT" = ubuntu-mate ]; then328if [ "$PROJECT" = ubuntu-mate ]; then
322 cat >> boot$N/isolinux/gfxboot.cfg <<EOF329 cat >> boot$N/isolinux/gfxboot.cfg <<EOF
323foreground=0xffffff330foreground=0xffffff
324331
=== 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 @@
60 ubuntu-mate)60 ubuntu-mate)
61 DEFAULT_PRESEED='file=/cdrom/preseed/ubuntu-mate.seed'61 DEFAULT_PRESEED='file=/cdrom/preseed/ubuntu-mate.seed'
62 ;;62 ;;
63 ubuntu-budgie)
64 DEFAULT_PRESEED='file=/cdrom/preseed/ubuntu-budgie.seed'
65 ;;
63 *)66 *)
64 DEFAULT_PRESEED=67 DEFAULT_PRESEED=
65 ;;68 ;;

Subscribers

People subscribed via source and target branches