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

Proposed by fossfreedom on 2017-01-29
Status: Merged
Merged at revision: 1957
Proposed branch: lp:~fossfreedom/debian-cd/ubuntu-budgie
Merge into: lp:~ubuntu-cdimage/debian-cd/ubuntu
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) Resubmit on 2017-02-09
Steve Langasek 2017-01-29 Needs Fixing on 2017-02-07
Mathieu Trudel-Lapierre (community) Approve on 2017-02-07
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.
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
Steve Langasek (vorlon) :
review: Needs Fixing
1957. By fossfreedom on 2017-02-08

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

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

fossfreedom (fossfreedom) wrote :

resubmit

review: Resubmit

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory 'data/zesty/preseed/ubuntu-budgie'
2=== added file 'data/zesty/preseed/ubuntu-budgie/ubuntu-budgie.seed'
3--- data/zesty/preseed/ubuntu-budgie/ubuntu-budgie.seed 1970-01-01 00:00:00 +0000
4+++ data/zesty/preseed/ubuntu-budgie/ubuntu-budgie.seed 2017-02-08 07:45:31 +0000
5@@ -0,0 +1,8 @@
6+# Install the Ubuntu Budgie desktop.
7+tasksel tasksel/first multiselect ubuntu-budgie-desktop
8+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
9+# On live DVDs, don't spend huge amounts of time removing substantial
10+# application packages pulled in by language packs. Given that we clearly
11+# have the space to include them on the DVD, they're useful and we might as
12+# well keep them installed.
13+#ubiquity ubiquity/keep-installed string icedtea6-plugin openoffice.org
14
15=== added file 'data/zesty/ubuntu-budgie.pcx'
16Binary 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
17=== added file 'data/zesty/ubuntu-budgie.png'
18Binary 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
19=== modified file 'tools/add_live_filesystem'
20--- tools/add_live_filesystem 2016-04-18 10:21:34 +0000
21+++ tools/add_live_filesystem 2017-02-08 07:45:31 +0000
22@@ -105,7 +105,7 @@
23 # installation locale code.
24 RELEASE_NOTES=
25 case $PROJECT in
26- ubuntu|kubuntu|edubuntu|xubuntu|gobuntu|ubuntustudio|mythbuntu|lubuntu|ubuntu-gnome|ubuntukylin|ubuntu-desktop-next|ubuntu-mate)
27+ ubuntu|kubuntu|edubuntu|xubuntu|gobuntu|ubuntustudio|mythbuntu|lubuntu|ubuntu-gnome|ubuntukylin|ubuntu-desktop-next|ubuntu-mate|ubuntu-budgie)
28 case $DIST in
29 warty|hoary|breezy|dapper|edgy)
30 ;;
31
32=== modified file 'tools/boot/zesty/boot-amd64'
33--- tools/boot/zesty/boot-amd64 2016-10-25 19:09:23 +0000
34+++ tools/boot/zesty/boot-amd64 2017-02-08 07:45:31 +0000
35@@ -185,7 +185,7 @@
36 HIDDEN_TIMEOUT=
37 if [ "$CDIMAGE_LIVE" = 1 ] && [ "$CDIMAGE_DVD" != 1 ]; then
38 case $PROJECT in
39- ubuntu|ubuntu-netbook|xubuntu|ubuntukylin|kubuntu|kubuntu-plasma5|ubuntu-gnome|ubuntu-desktop-next|ubuntu-mate)
40+ ubuntu|ubuntu-netbook|xubuntu|ubuntukylin|kubuntu|kubuntu-plasma5|ubuntu-gnome|ubuntu-desktop-next|ubuntu-mate|ubuntu-budgie)
41 HIDDEN_TIMEOUT=2
42 ;;
43 mythbuntu)
44@@ -338,6 +338,13 @@
45 screen-colour=0x2D3335
46 EOF
47 fi
48+if [ "$PROJECT" = ubuntu-budgie ]; then
49+ cat >> boot$N/isolinux/gfxboot.cfg <<EOF
50+foreground=0xffffff
51+background=0xd3dae3
52+screen-colour=0x383c4a
53+EOF
54+fi
55 if [ "$PROJECT" = ubuntu-mate ]; then
56 cat >> boot$N/isolinux/gfxboot.cfg <<EOF
57 foreground=0xffffff
58
59=== modified file 'tools/boot/zesty/boot-amd64+mac'
60--- tools/boot/zesty/boot-amd64+mac 2016-10-25 19:09:23 +0000
61+++ tools/boot/zesty/boot-amd64+mac 2017-02-08 07:45:31 +0000
62@@ -173,7 +173,7 @@
63 HIDDEN_TIMEOUT=
64 if [ "$CDIMAGE_LIVE" = 1 ] && [ "$CDIMAGE_DVD" != 1 ]; then
65 case $PROJECT in
66- ubuntu|ubuntu-netbook|xubuntu|ubuntukylin|kubuntu|kubuntu-plasma5|ubuntu-gnome|ubuntu-mate)
67+ ubuntu|ubuntu-netbook|xubuntu|ubuntukylin|kubuntu|kubuntu-plasma5|ubuntu-gnome|ubuntu-mate|ubuntu-budgie)
68 HIDDEN_TIMEOUT=2
69 ;;
70 mythbuntu)
71@@ -313,6 +313,13 @@
72 screen-colour=0x270A1E
73 EOF
74 fi
75+if [ "$PROJECT" = ubuntu-budgie ]; then
76+ cat >> boot$N/isolinux/gfxboot.cfg <<EOF
77+foreground=0xffffff
78+background=0xd3dae3
79+screen-colour=0x383c4a
80+EOF
81+fi
82 if [ "$PROJECT" = ubuntu-mate ]; then
83 cat >> boot$N/isolinux/gfxboot.cfg <<EOF
84 foreground=0xffffff
85
86=== modified file 'tools/boot/zesty/boot-i386'
87--- tools/boot/zesty/boot-i386 2016-10-25 19:09:23 +0000
88+++ tools/boot/zesty/boot-i386 2017-02-08 07:45:31 +0000
89@@ -174,7 +174,7 @@
90 HIDDEN_TIMEOUT=
91 if [ "$CDIMAGE_LIVE" = 1 ] && [ "$CDIMAGE_DVD" != 1 ]; then
92 case $PROJECT in
93- ubuntu|ubuntu-netbook|xubuntu|ubuntukylin|kubuntu|kubuntu-plasma5|ubuntu-gnome|ubuntu-desktop-next|ubuntu-mate)
94+ ubuntu|ubuntu-netbook|xubuntu|ubuntukylin|kubuntu|kubuntu-plasma5|ubuntu-gnome|ubuntu-desktop-next|ubuntu-mate|ubuntu-budgie)
95 HIDDEN_TIMEOUT=2
96 ;;
97 mythbuntu)
98@@ -318,6 +318,13 @@
99 screen-colour=0x2D3335
100 EOF
101 fi
102+if [ "$PROJECT" = ubuntu-budgie ]; then
103+ cat >> boot$N/isolinux/gfxboot.cfg <<EOF
104+foreground=0xffffff
105+background=0xd3dae3
106+screen-colour=0x383c4a
107+EOF
108+fi
109 if [ "$PROJECT" = ubuntu-mate ]; then
110 cat >> boot$N/isolinux/gfxboot.cfg <<EOF
111 foreground=0xffffff
112
113=== modified file 'tools/boot/zesty/common.sh'
114--- tools/boot/zesty/common.sh 2016-10-25 19:09:23 +0000
115+++ tools/boot/zesty/common.sh 2017-02-08 07:45:31 +0000
116@@ -60,6 +60,9 @@
117 ubuntu-mate)
118 DEFAULT_PRESEED='file=/cdrom/preseed/ubuntu-mate.seed'
119 ;;
120+ ubuntu-budgie)
121+ DEFAULT_PRESEED='file=/cdrom/preseed/ubuntu-budgie.seed'
122+ ;;
123 *)
124 DEFAULT_PRESEED=
125 ;;

Subscribers

People subscribed via source and target branches