Merge lp:~ubuntubudgie-dev/ubiquity-slideshow-ubuntu/ubuntu-budgie.artful into lp:ubiquity-slideshow-ubuntu
Status: | Merged |
---|---|
Approved by: | Mathieu Trudel-Lapierre |
Approved revision: | 785 |
Merged at revision: | 784 |
Proposed branch: | lp:~ubuntubudgie-dev/ubiquity-slideshow-ubuntu/ubuntu-budgie.artful |
Merge into: | lp:ubiquity-slideshow-ubuntu |
Diff against target: |
158 lines (+18/-3) 6 files modified
Makefile (+2/-1) debian/control (+10/-0) debian/oem-config-slideshow-ubuntu-budgie.install (+1/-0) slideshows/oem-config-ubuntu-budgie/slideshow.conf (+3/-0) slideshows/ubuntu-budgie/slides/06_photos.html (+1/-1) slideshows/ubuntu-budgie/slides/08_gethelp.html (+1/-1) |
To merge this branch: | bzr merge lp:~ubuntubudgie-dev/ubiquity-slideshow-ubuntu/ubuntu-budgie.artful |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Mathieu Trudel-Lapierre | Approve | ||
Review via email: mp+326191@code.launchpad.net |
Commit message
17.10 Ubuntu Budgie updates includes word and picture changes together with the introduction of an oem package for Ubuntu Budgie
Description of the change
Two areas of change for Ubuntu Budgie 17.10
First area - create an oem package for Ubuntu Budgie. OEM's has asked us to display Ubuntu Budgie slides as part of the final OEM install for users rather than the default Ubuntu OEM slideshow.
This package has been derived from Ubuntu MATE oem package i.e. symlinks back to the ubuntu-budgie slideshow so that the oem package shares common sources.
The second area of change are slight changes to words for the 17.10 Ubuntu Budgie slideshow together with updated pictures.
Both the oem and ubuntu-budgie runs fine via ./test-slideshow.
I can confirm no additional copyright or other changes are required due to the changed words and pictures.
Looks fine.