diff -Nru ubiquity-2.21.54/autopilot/ubiquity_autopilot_tests/configs/english_label_conf.py ubiquity-2.21.55/autopilot/ubiquity_autopilot_tests/configs/english_label_conf.py --- ubiquity-2.21.54/autopilot/ubiquity_autopilot_tests/configs/english_label_conf.py 2016-01-26 23:31:14.000000000 +0000 +++ ubiquity-2.21.55/autopilot/ubiquity_autopilot_tests/configs/english_label_conf.py 2016-04-12 06:12:04.000000000 +0000 @@ -56,9 +56,10 @@ 'The software is subject to license terms included with its ' \ 'documentation.'.format(distro_flavor) stepPrepare['prepare_download_updates'] = \ - 'Download updates while installing' + 'Download updates while installing {}'.format(distro_flavor) stepPrepare['prepare_nonfree_software'] = \ - 'Install this third-party software' + 'Install third-party software for graphics and Wi-Fi hardware, ' \ + 'Flash, MP3 and other media' stepPrepare['prepare_network_connection'] = \ 'is connected to the Internet' stepPrepare['prepare_sufficient_space'] = \ diff -Nru ubiquity-2.21.54/autopilot/ubiquity_autopilot_tests/tests/__init__.py ubiquity-2.21.55/autopilot/ubiquity_autopilot_tests/tests/__init__.py --- ubiquity-2.21.54/autopilot/ubiquity_autopilot_tests/tests/__init__.py 2016-01-26 23:31:14.000000000 +0000 +++ ubiquity-2.21.55/autopilot/ubiquity_autopilot_tests/tests/__init__.py 2016-04-12 06:12:04.000000000 +0000 @@ -252,8 +252,11 @@ preparing_page = self.main_window.select_single( 'GtkAlignment', BuilderName='stepPrepare') - objList = ['prepare_best_results', 'prepare_foss_disclaimer', - 'prepare_download_updates', 'prepare_nonfree_software'] + objList = [ + 'prepare_foss_disclaimer_license', + 'prepare_download_updates', + 'prepare_nonfree_software' + ] self.check_visible_object_with_label(objList) if updates: @@ -268,15 +271,6 @@ 'GtkCheckButton', BuilderName='prepare_nonfree_software') self.pointing_device.click_object(thrdprty_checkbutton) - self._check_preparing_statebox('prepare_network_connection', - visible=networkConnection) - # and sufficient space - self._check_preparing_statebox('prepare_sufficient_space', - visible=sufficientSpace) - # and power source - self._check_preparing_statebox('prepare_power_source', - visible=powerSource) - self._check_page_titles() self._check_navigation_buttons() @@ -644,7 +638,7 @@ self._track_install_progress() print("First loop complete waiting for pbar to go back to 0") self.assertThat(progress_bar.fraction, Eventually( - Equals(0.0), timeout=180)) + Equals(0.0), timeout=260)) print("Now entering the second loop...........") # And now the install progress bar self._track_install_progress() @@ -1002,45 +996,6 @@ # "[Page:'{0}'] Expect page title to be visible " # "but it wasn't".format(self.current_step)) - def _check_preparing_statebox(self, stateboxName, visible=True, - imagestock='gtk-yes'): - """ Checks the preparing page statebox's """ - logger.debug("Running checks on {0} StateBox".format(stateboxName)) - preparing_page = self.main_window.select_single( - 'GtkAlignment', BuilderName='stepPrepare') - state_box = preparing_page.select_single( - 'StateBox', BuilderName=stateboxName) - logger.debug('check({0}, {1})'.format(visible, imagestock)) - logger.debug("Running checks.......") - if visible: - self.expectThat(state_box.visible, Equals(visible), - "StateBox.check(): Expected {0} statebox to be " - "visible but it wasn't" - .format(state_box.name)) - label = state_box.select_single('GtkLabel') - self.expectThat(label.label, NotEquals(u''), - "[Page:'{0}'] Expected {1} Statebox's label to " - "contain text but it didn't" - .format(self.current_step, stateboxName)) - self.expectThat(label.visible, Equals(visible), - "[Page:'{0}'] Expected {1} Statebox label's " - "visible property to be {2} " - .format(self.current_step, stateboxName, - str(visible))) - self.expectIsInstance(label.label, str, - "[Page:'{0}'] Expected {1} Statebox's label " - "to be unicode but it wasn't" - .format(self.current_step, stateboxName)) - image = state_box.select_single('GtkImage') - self.expectThat(image.stock, Equals(imagestock)) - self.expectThat(image.visible, Equals(visible)) - - else: - self.expectThat(state_box.visible, Equals(False), - "[Page:'{0}'] Expected {1} statebox to not be " - "visible but it was" - .format(self.current_step, stateboxName)) - def get_distribution(self, ): """Returns the name of the running distribution.""" logger.debug("Detecting flavor") diff -Nru ubiquity-2.21.54/debian/changelog ubiquity-2.21.55/debian/changelog --- ubiquity-2.21.54/debian/changelog 2016-04-06 04:07:35.000000000 +0000 +++ ubiquity-2.21.55/debian/changelog 2016-04-12 06:36:48.000000000 +0000 @@ -1,3 +1,15 @@ +ubiquity (2.21.55) xenial; urgency=medium + + [ Jean-Baptiste Lallement ] + * autopilot: Merged autopilot tests fixes from Chris Lee. Thanks + + [ Timo Jyrinki ] + * Fix Kubuntu slideshow not translated, thanks to Lasse Liehu for the + patch (LP: #1512834) + * Automatic update of included source packages: netcfg 1.135ubuntu3. + + -- Timo Jyrinki Tue, 12 Apr 2016 09:36:38 +0300 + ubiquity (2.21.54) xenial; urgency=medium * ubiquity/frontends/gtk_ui.py: diff -Nru ubiquity-2.21.54/d-i/manifest ubiquity-2.21.55/d-i/manifest --- ubiquity-2.21.54/d-i/manifest 2016-04-06 03:10:24.000000000 +0000 +++ ubiquity-2.21.55/d-i/manifest 2016-04-12 06:36:12.000000000 +0000 @@ -9,7 +9,7 @@ grub-installer 1.128ubuntu5 hw-detect 1.117ubuntu1 localechooser 2.65ubuntu3 -netcfg 1.135ubuntu2 +netcfg 1.135ubuntu3 partconf 1.49 partman-auto 134ubuntu1 partman-auto-crypto 22ubuntu1 diff -Nru ubiquity-2.21.54/d-i/source/netcfg/debian/changelog ubiquity-2.21.55/d-i/source/netcfg/debian/changelog --- ubiquity-2.21.54/d-i/source/netcfg/debian/changelog 2016-03-31 12:59:16.000000000 +0000 +++ ubiquity-2.21.55/d-i/source/netcfg/debian/changelog 2016-04-08 06:55:25.000000000 +0000 @@ -1,3 +1,12 @@ +netcfg (1.135ubuntu3) xenial; urgency=medium + + * On s390x ask the user if DHCP network autoconfiguration should be + proceeded or not. DHCP should be supported in KVM|MAAS|OpenStack + deployements, however at the same time most LPAR|z/VM deployments use + static network configuration on s390x. LP: #1567688 + + -- Dimitri John Ledkov Fri, 08 Apr 2016 07:53:27 +0100 + netcfg (1.135ubuntu2) xenial; urgency=medium Cherrypick commits from debian netcfg master. diff -Nru ubiquity-2.21.54/d-i/source/netcfg/netcfg.c ubiquity-2.21.55/d-i/source/netcfg/netcfg.c --- ubiquity-2.21.54/d-i/source/netcfg/netcfg.c 2016-03-31 12:54:22.000000000 +0000 +++ ubiquity-2.21.55/d-i/source/netcfg/netcfg.c 2016-04-08 06:52:12.000000000 +0000 @@ -40,7 +40,11 @@ { int iret; +#ifdef __s390__ + iret = debconf_input(client, "high", "netcfg/use_autoconfig"); +#else iret = debconf_input(client, "medium", "netcfg/use_autoconfig"); +#endif if (debconf_go(client) == CMD_GOBACK) return GO_BACK; diff -Nru ubiquity-2.21.54/ubiquity/frontend/kde_ui.py ubiquity-2.21.55/ubiquity/frontend/kde_ui.py --- ubiquity-2.21.54/ubiquity/frontend/kde_ui.py 2016-04-05 02:36:21.000000000 +0000 +++ ubiquity-2.21.55/ubiquity/frontend/kde_ui.py 2016-04-12 06:15:19.000000000 +0000 @@ -633,7 +633,7 @@ parameters.append('rtl') parameters_encoded = '&'.join(parameters) - slides = 'file://%s# %s' % (slideshow_main, parameters_encoded) + slides = 'file://%s#%s' % (slideshow_main, parameters_encoded) def openLink(qUrl): QtGui.QDesktopServices.openUrl(qUrl)