Merge lp:~aaronhoneycutt/ubiquity-slideshow-ubuntu/zesty into lp:ubiquity-slideshow-ubuntu

[Aaron Honeycutt]

Change Kubuntu 16.10 to 17.04. Also updated the kubuntu-slideshow.py from PyQt4 to PyQt5. It opens at least now.

[Mathieu Trudel-Lapierre (cyphermox)]

Approve.

review: Approve

[lp:~aaronhoneycutt/ubiquity-slideshow-ubuntu/zesty]

761. By Mathieu Trudel-Lapierre on 2017-02-23

* Port Kubuntu slideshow to Qt5.
* Update Kubuntu slideshow for 17.04.

=== modified file 'kubuntu-slideshow.py'
--- kubuntu-slideshow.py	2010-02-24 05:38:31 +0000
+++ kubuntu-slideshow.py	2017-02-23 03:59:02 +0000
@@ -4,10 +4,12 @@
 import os, sys
 import ConfigParser
 
-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
-from PyQt4.QtWebKit import *
-from PyQt4 import uic
+from PyQt5.QtCore import *
+from PyQt5.QtWidgets import *
+from PyQt5.QtGui import *
+from PyQt5.QtWebKit import *
+from PyQt5.QtWebKitWidgets import *
+from PyQt5 import uic
 
 base_directory = os.path.dirname (sys.argv[0])
 slideshow_path = os.path.abspath(base_directory + "/slideshows")

=== modified file 'slideshows/kubuntu/slides/welcome.html'
--- slideshows/kubuntu/slides/welcome.html	2016-09-13 16:03:22 +0000
+++ slideshows/kubuntu/slides/welcome.html	2017-02-23 03:59:02 +0000
@@ -3,14 +3,14 @@
 <div class="main">
     <div class="content">
 	<ul>
-	    <li>Thank you for choosing Kubuntu 16.10. We hope you enjoy
+	    <li>Thank you for choosing Kubuntu 17.04. We hope you enjoy
 	    the experience.</li>
 	    <li>We believe every computer user should be free to work in the
 	    environment they choose, and be free to download, change, study and
 	    share their software with anyone, for any purpose.</li>
 	    <li>We want Kubuntu to work for you. So while your software is
 	    installing, this slideshow will introduce you to Kubuntu
-	    16.10.</li>
+	    17.04.</li>
 	</ul>
 	    <p class="special">Kubuntu is designed to be easy. Feel free to
 	    explore!</p>