Merge lp:~ubuntubudgie-dev/ubiquity-slideshow-ubuntu/ubuntu-budgie.artful into lp:ubiquity-slideshow-ubuntu

[fossfreedom]

17.10 Ubuntu Budgie updates includes word and picture changes together with the introduction of an oem package for Ubuntu Budgie

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.

[Mathieu Trudel-Lapierre (cyphermox)]

Looks fine.

review: Approve

=== modified file 'Makefile'
--- Makefile	2016-11-24 21:09:55 +0000
+++ Makefile	2017-06-22 22:39:38 +0000
@@ -12,7 +12,8 @@
 	ubuntukylin \
 	ubuntu-mate \
 	oem-config-ubuntu \
-	oem-config-ubuntu-mate
+	oem-config-ubuntu-mate \
+	oem-config-ubuntu-budgie
 
 SOURCE ?= .
 SOURCESLIDES ?= $(SOURCE)/slideshows
 
=== modified file 'debian/control'
--- debian/control	2016-11-24 21:09:55 +0000
+++ debian/control	2017-06-22 22:39:38 +0000
@@ -128,3 +128,13 @@
  A slideshow intended for the post-OEM-install configuration, designed
  as a quick introduction to Ubuntu MATE.
 
+Package: oem-config-slideshow-ubuntu-budgie
+Architecture: all
+Provides: oem-config-slideshow
+Conflicts: oem-config-slideshow-ubuntu
+Replaces: oem-config-slideshow-ubuntu
+Depends: ${misc:Depends}
+Description: OEM slideshow for Ubuntu Budgie
+ A slideshow intended for the post-OEM-install configuration, designed
+ as a quick introduction to Ubuntu Budgie.
+
 
=== added file 'debian/oem-config-slideshow-ubuntu-budgie.install'
--- debian/oem-config-slideshow-ubuntu-budgie.install	1970-01-01 00:00:00 +0000
+++ debian/oem-config-slideshow-ubuntu-budgie.install	2017-06-22 22:39:38 +0000
@@ -0,0 +1,1 @@
+build/oem-config-ubuntu-budgie/* /usr/share/oem-config-slideshow
 
=== added directory 'po/oem-config-ubuntu-budgie'
=== added directory 'slideshows/oem-config-ubuntu-budgie'
=== added directory 'slideshows/oem-config-ubuntu-budgie/slides'
=== added symlink 'slideshows/oem-config-ubuntu-budgie/slides/01_welcome.html'
=== target is u'../../ubuntu-budgie/slides/01_welcome.html'
=== added symlink 'slideshows/oem-config-ubuntu-budgie/slides/02_desktop.html'
=== target is u'../../ubuntu-budgie/slides/02_desktop.html'
=== added symlink 'slideshows/oem-config-ubuntu-budgie/slides/03_browse.html'
=== target is u'../../ubuntu-budgie/slides/03_browse.html'
=== added symlink 'slideshows/oem-config-ubuntu-budgie/slides/04_office.html'
=== target is u'../../ubuntu-budgie/slides/04_office.html'
=== added symlink 'slideshows/oem-config-ubuntu-budgie/slides/05_media.html'
=== target is u'../../ubuntu-budgie/slides/05_media.html'
=== added symlink 'slideshows/oem-config-ubuntu-budgie/slides/06_photos.html'
=== target is u'../../ubuntu-budgie/slides/06_photos.html'
=== added symlink 'slideshows/oem-config-ubuntu-budgie/slides/07_software.html'
=== target is u'../../ubuntu-budgie/slides/07_software.html'
=== added symlink 'slideshows/oem-config-ubuntu-budgie/slides/08_gethelp.html'
=== target is u'../../ubuntu-budgie/slides/08_gethelp.html'
=== added symlink 'slideshows/oem-config-ubuntu-budgie/slides/arrow-back.png'
=== target is u'../../ubuntu-budgie/slides/link/arrow-back.png'
=== added symlink 'slideshows/oem-config-ubuntu-budgie/slides/arrow-next.png'
=== target is u'../../ubuntu-budgie/slides/link/arrow-next.png'
=== added symlink 'slideshows/oem-config-ubuntu-budgie/slides/base.css'
=== target is u'../../ubuntu-budgie/slides/link/base.css'
=== added symlink 'slideshows/oem-config-ubuntu-budgie/slides/browse.png'
=== target is u'../../ubuntu-budgie/slides/screenshots/browse.png'
=== added symlink 'slideshows/oem-config-ubuntu-budgie/slides/chromium.png'
=== target is u'../../ubuntu-budgie/slides/icons/chromium.png'
=== added symlink 'slideshows/oem-config-ubuntu-budgie/slides/desktop.png'
=== target is u'../../ubuntu-budgie/slides/screenshots/desktop.png'
=== added symlink 'slideshows/oem-config-ubuntu-budgie/slides/eog.png'
=== target is u'../../ubuntu-budgie/slides/icons/eog.png'
=== added symlink 'slideshows/oem-config-ubuntu-budgie/slides/evince.png'
=== target is u'../../ubuntu-budgie/slides/icons/evince.png'
=== added symlink 'slideshows/oem-config-ubuntu-budgie/slides/firefox.png'
=== target is u'../../ubuntu-budgie/slides/icons/firefox.png'
=== added symlink 'slideshows/oem-config-ubuntu-budgie/slides/gimp.png'
=== target is u'../../ubuntu-budgie/slides/icons/gimp.png'
=== added symlink 'slideshows/oem-config-ubuntu-budgie/slides/gnome-documents.png'
=== target is u'../../ubuntu-budgie/slides/icons/gnome-documents.png'
=== added symlink 'slideshows/oem-config-ubuntu-budgie/slides/gnome-photos.png'
=== target is u'../../ubuntu-budgie/slides/icons/gnome-photos.png'
=== added symlink 'slideshows/oem-config-ubuntu-budgie/slides/gnome-software.png'
=== target is u'../../ubuntu-budgie/slides/icons/gnome-software.png'
=== added symlink 'slideshows/oem-config-ubuntu-budgie/slides/gnome-videos.png'
=== target is u'../../ubuntu-budgie/slides/icons/gnome-videos.png'
=== added symlink 'slideshows/oem-config-ubuntu-budgie/slides/icons'
=== target is u'../../ubuntu-budgie/slides/icons'
=== added symlink 'slideshows/oem-config-ubuntu-budgie/slides/index.html'
=== target is u'../../ubuntu-budgie/slides/index.html'
=== added symlink 'slideshows/oem-config-ubuntu-budgie/slides/libreoffice.png'
=== target is u'../../ubuntu-budgie/slides/icons/libreoffice.png'
=== added symlink 'slideshows/oem-config-ubuntu-budgie/slides/link'
=== target is u'../../ubuntu-budgie/slides/link'
=== added symlink 'slideshows/oem-config-ubuntu-budgie/slides/link-core'
=== target is u'../../ubuntu-budgie/slides/link-core'
=== added symlink 'slideshows/oem-config-ubuntu-budgie/slides/media.png'
=== target is u'../../ubuntu-budgie/slides/screenshots/media.png'
=== added symlink 'slideshows/oem-config-ubuntu-budgie/slides/office.png'
=== target is u'../../ubuntu-budgie/slides/screenshots/office.png'
=== added symlink 'slideshows/oem-config-ubuntu-budgie/slides/photos.png'
=== target is u'../../ubuntu-budgie/slides/screenshots/photos.png'
=== added symlink 'slideshows/oem-config-ubuntu-budgie/slides/pitivi.png'
=== target is u'../../ubuntu-budgie/slides/icons/pitivi.png'
=== added symlink 'slideshows/oem-config-ubuntu-budgie/slides/rhythmbox.png'
=== target is u'../../ubuntu-budgie/slides/icons/rhythmbox.png'
=== added symlink 'slideshows/oem-config-ubuntu-budgie/slides/screenshots'
=== target is u'../../ubuntu-budgie/slides/screenshots'
=== added symlink 'slideshows/oem-config-ubuntu-budgie/slides/software.png'
=== target is u'../../ubuntu-budgie/slides/screenshots/software.png'
=== added symlink 'slideshows/oem-config-ubuntu-budgie/slides/system-software-update.png'
=== target is u'../../ubuntu-budgie/slides/icons/system-software-update.png'
=== added symlink 'slideshows/oem-config-ubuntu-budgie/slides/ubuntu-budgie-logo.svg'
=== target is u'../../ubuntu-budgie/slides/icons/ubuntu-budgie-logo.svg'
=== added symlink 'slideshows/oem-config-ubuntu-budgie/slides/welcome.png'
=== target is u'../../ubuntu-budgie/slides/screenshots/welcome.png'
=== added file 'slideshows/oem-config-ubuntu-budgie/slideshow.conf'
--- slideshows/oem-config-ubuntu-budgie/slideshow.conf	1970-01-01 00:00:00 +0000
+++ slideshows/oem-config-ubuntu-budgie/slideshow.conf	2017-06-22 22:39:38 +0000
@@ -0,0 +1,3 @@
+[Slideshow]
+width:752
+height:442
 
=== modified file 'slideshows/ubuntu-budgie/slides/06_photos.html'
--- slideshows/ubuntu-budgie/slides/06_photos.html	2016-11-24 21:09:55 +0000
+++ slideshows/ubuntu-budgie/slides/06_photos.html	2017-06-22 22:39:38 +0000
@@ -5,7 +5,7 @@
 <div class="main">
 	<div class="text">
 		<div>
-			<p>Tired of finding the right application to organize your photos? With <strong>GNOME Photos</strong>, you can quickly and easily import, organize, edit and view your pictures. And you can share your favorite snaps on all popular photo sites and social networks.</p>
+			<p>Tired of finding the right application to organize your photos? With <strong>gThumb</strong>, you can quickly and easily import, organize, edit and view your pictures. And you can share your favorite snaps on all popular photo sites and social networks.</p>
 		</div>
 
 		<div class="bigicon">
 
=== modified file 'slideshows/ubuntu-budgie/slides/08_gethelp.html'
--- slideshows/ubuntu-budgie/slides/08_gethelp.html	2016-11-24 21:09:55 +0000
+++ slideshows/ubuntu-budgie/slides/08_gethelp.html	2017-06-22 22:39:38 +0000
@@ -6,7 +6,7 @@
     <div class="text">
         <div>
             Thanks for choosing and installing <strong>Ubuntu Budgie</strong>!<br/><br/>
-            <li>Get help and support on our Google+ community (Google "google+ Ubuntu Budgie") or on <strong>Launchpad</strong>: <a href="https://launchpad.net/Ubuntu Budgie">launchpad.net/ubuntubudgie</a></li><br />
+            <li>Get help and support on our Google+ community (plus.google.com/+UbuntuBudgie) or on <strong>Launchpad</strong>: <a href="https://launchpad.net/ubuntubudgie">launchpad.net/ubuntubudgie</a></li><br />
             <li>For more information and pointers to other useful resources, please visit our homepage: <a href="https://ubuntubudgie.org">ubuntubudgie.org</a></li><br />
             Enjoy and have fun! 😃
         </div>
 
=== modified file 'slideshows/ubuntu-budgie/slides/screenshots/browse.png' (properties changed: +x to -x)
 Binary files slideshows/ubuntu-budgie/slides/screenshots/browse.png	2016-11-24 21:09:55 +0000 and slideshows/ubuntu-budgie/slides/screenshots/browse.png	2017-06-22 22:39:38 +0000 differ
=== modified file 'slideshows/ubuntu-budgie/slides/screenshots/desktop.png' (properties changed: +x to -x)
 Binary files slideshows/ubuntu-budgie/slides/screenshots/desktop.png	2016-11-24 21:09:55 +0000 and slideshows/ubuntu-budgie/slides/screenshots/desktop.png	2017-06-22 22:39:38 +0000 differ
=== modified file 'slideshows/ubuntu-budgie/slides/screenshots/media.png' (properties changed: +x to -x)
 Binary files slideshows/ubuntu-budgie/slides/screenshots/media.png	2016-11-24 21:09:55 +0000 and slideshows/ubuntu-budgie/slides/screenshots/media.png	2017-06-22 22:39:38 +0000 differ
=== modified file 'slideshows/ubuntu-budgie/slides/screenshots/office.png' (properties changed: +x to -x)
=== modified file 'slideshows/ubuntu-budgie/slides/screenshots/photos.png'
 Binary files slideshows/ubuntu-budgie/slides/screenshots/photos.png	2016-11-24 21:09:55 +0000 and slideshows/ubuntu-budgie/slides/screenshots/photos.png	2017-06-22 22:39:38 +0000 differ