diff -urN ubiquity/debian/changelog ../ubiquity-2.14.7/debian/changelog --- ubiquity/debian/changelog 2013-04-23 13:23:24.000000000 +0100 +++ ../ubiquity-2.14.7/debian/changelog 2013-04-24 14:47:30.000000000 +0100 @@ -1,3 +1,16 @@ +ubiquity (2.14.7) raring; urgency=low + + * [Qt Frontend] Do not allow to proceed from partitioning page when + password is required, yet missing or does not match confirmation + password. (LP: #1172059) + + * [Qt Frontend] Clear use as combo box, on each iteration to avoid + duplicated entries. (LP: #1171989) Thanks merryidleness for the patch. + * Automatic update of included source packages: base-installer + 1.122ubuntu15, flash-kernel 3.0~rc.4ubuntu33. + + -- Dmitrijs Ledkovs Wed, 24 Apr 2013 11:40:29 +0100 + ubiquity (2.14.6) raring; urgency=low * Automatic update of included source packages: partman-auto 105ubuntu3 diff -urN ubiquity/d-i/manifest ../ubiquity-2.14.7/d-i/manifest --- ubiquity/d-i/manifest 2013-04-23 13:22:14.000000000 +0100 +++ ../ubiquity-2.14.7/d-i/manifest 2013-04-24 14:38:08.000000000 +0100 @@ -1,11 +1,11 @@ apt-setup 1:0.56ubuntu2 -base-installer 1.122ubuntu14 +base-installer 1.122ubuntu15 bterm-unifont 1.2 choose-mirror 2.44ubuntu1 clock-setup 0.113ubuntu1 console-setup 1.70ubuntu7 debian-installer-utils 1.94ubuntu1 -flash-kernel 3.0~rc.4ubuntu31 +flash-kernel 3.0~rc.4ubuntu33 grub-installer 1.78ubuntu6 hw-detect 1.92ubuntu1 localechooser 2.49ubuntu4 diff -urN ubiquity/d-i/source/base-installer/debian/changelog ../ubiquity-2.14.7/d-i/source/base-installer/debian/changelog --- ubiquity/d-i/source/base-installer/debian/changelog 2012-11-16 16:02:14.000000000 +0000 +++ ../ubiquity-2.14.7/d-i/source/base-installer/debian/changelog 2013-04-18 21:26:41.000000000 +0100 @@ -1,3 +1,9 @@ +base-installer (1.122ubuntu15) raring; urgency=low + + * Replace "highbank" flavor with "generic" (LP: #1166597) + + -- dann frazier Tue, 09 Apr 2013 00:01:08 -0600 + base-installer (1.122ubuntu14) raring; urgency=low [ Ben Collins ] diff -urN ubiquity/d-i/source/base-installer/kernel/armel.sh ../ubiquity-2.14.7/d-i/source/base-installer/kernel/armel.sh --- ubiquity/d-i/source/base-installer/kernel/armel.sh 2012-09-19 11:04:53.000000000 +0100 +++ ../ubiquity-2.14.7/d-i/source/base-installer/kernel/armel.sh 2013-04-18 21:25:22.000000000 +0100 @@ -1,6 +1,6 @@ arch_get_kernel_flavour () { case "$SUBARCH" in - armadaxp|dove|highbank|imx51|omap|omap4|iop32x|iop33x|ixp4xx|kirkwood|orion5x|versatile|mx5) + armadaxp|dove|generic|imx51|omap|omap4|iop32x|iop33x|ixp4xx|kirkwood|orion5x|versatile|mx5) echo "$SUBARCH" return 0 ;; ads) diff -urN ubiquity/d-i/source/base-installer/kernel/armhf.sh ../ubiquity-2.14.7/d-i/source/base-installer/kernel/armhf.sh --- ubiquity/d-i/source/base-installer/kernel/armhf.sh 2012-09-19 11:04:53.000000000 +0100 +++ ../ubiquity-2.14.7/d-i/source/base-installer/kernel/armhf.sh 2013-04-18 21:25:22.000000000 +0100 @@ -1,6 +1,6 @@ arch_get_kernel_flavour () { case "$SUBARCH" in - armadaxp|dove|highbank|imx51|omap|omap4|iop32x|iop33x|ixp4xx|kirkwood|orion5x|versatile|mx5) + armadaxp|dove|generic|imx51|omap|omap4|iop32x|iop33x|ixp4xx|kirkwood|orion5x|versatile|mx5) echo "$SUBARCH" return 0 ;; ads) diff -urN ubiquity/d-i/source/flash-kernel/debian/changelog ../ubiquity-2.14.7/d-i/source/flash-kernel/debian/changelog --- ubiquity/d-i/source/flash-kernel/debian/changelog 2013-04-04 11:06:37.000000000 +0100 +++ ../ubiquity-2.14.7/d-i/source/flash-kernel/debian/changelog 2013-04-22 17:32:23.000000000 +0100 @@ -1,3 +1,16 @@ +flash-kernel (3.0~rc.4ubuntu33) raring; urgency=low + + * Also update XB-Subarchitecture to use "generic" instead of 'highbank" + (LP: #1170515) + + -- dann frazier Sun, 21 Apr 2013 09:36:29 -0600 + +flash-kernel (3.0~rc.4ubuntu32) raring; urgency=low + + * flash-plugin-installer: make installable on armhf/generic for highbank + + -- dann frazier Thu, 18 Apr 2013 16:39:18 -0600 + flash-kernel (3.0~rc.4ubuntu31) raring; urgency=low * Accept "generic" as a valid kernel flavor on highbank (LP: #1164074) diff -urN ubiquity/d-i/source/flash-kernel/debian/control ../ubiquity-2.14.7/d-i/source/flash-kernel/debian/control --- ubiquity/d-i/source/flash-kernel/debian/control 2013-04-04 11:06:37.000000000 +0100 +++ ../ubiquity-2.14.7/d-i/source/flash-kernel/debian/control 2013-04-22 17:32:05.000000000 +0100 @@ -30,7 +30,7 @@ Priority: standard XC-Package-Type: udeb Architecture: arm armel armeb armhf -XB-Subarchitecture: armadaxp highbank iop32x ixp4xx kirkwood orion5x s3c24xx mx5 omap omap4 +XB-Subarchitecture: armadaxp generic iop32x ixp4xx kirkwood orion5x s3c24xx mx5 omap omap4 Provides: bootable-system Depends: cdebconf-udeb, installed-base XB-Installer-Menu-Item: 7300 diff -urN ubiquity/d-i/source/flash-kernel/debian/flash-kernel-installer.isinstallable ../ubiquity-2.14.7/d-i/source/flash-kernel/debian/flash-kernel-installer.isinstallable --- ubiquity/d-i/source/flash-kernel/debian/flash-kernel-installer.isinstallable 2013-04-04 11:06:37.000000000 +0100 +++ ../ubiquity-2.14.7/d-i/source/flash-kernel/debian/flash-kernel-installer.isinstallable 2013-04-18 23:55:57.000000000 +0100 @@ -5,7 +5,7 @@ arm*/armadaxp) exit 0 ;; - arm*/highbank) + arm*/generic) exit 0 ;; arm*/iop32x) diff -urN ubiquity/ubiquity/frontend/kde_components/PartAuto.py ../ubiquity-2.14.7/ubiquity/frontend/kde_components/PartAuto.py --- ubiquity/ubiquity/frontend/kde_components/PartAuto.py 2013-02-19 11:26:50.000000000 +0000 +++ ../ubiquity-2.14.7/ubiquity/frontend/kde_components/PartAuto.py 2013-04-24 14:37:27.000000000 +0100 @@ -288,15 +288,25 @@ self.password.setEnabled(True) self.verified_password.setEnabled(True) self.badPassword.setEnabled(True) + self.verify_password() else: self.passwordIcon.setEnabled(False) self.password.setEnabled(False) self.verified_password.setEnabled(False) self.badPassword.setEnabled(False) + self.controller.allow_go_forward(True) #show warning if passwords do not match def verify_password(self): - if self.password.text() != self.verified_password.text(): - self.badPassword.show() - else: + complete = False + + if self.password.text() == self.verified_password.text(): self.badPassword.hide() + complete = True + else: + self.badPassword.show() + + if not self.password.text(): + complete = False + + self.controller.allow_go_forward(complete) diff -urN ubiquity/ubiquity/frontend/kde_components/PartMan.py ../ubiquity-2.14.7/ubiquity/frontend/kde_components/PartMan.py --- ubiquity/ubiquity/frontend/kde_components/PartMan.py 2013-02-19 11:26:50.000000000 +0000 +++ ../ubiquity-2.14.7/ubiquity/frontend/kde_components/PartMan.py 2013-04-24 14:50:12.000000000 +0100 @@ -178,6 +178,10 @@ dialog.partition_create_place_beginning.setChecked(True) self.create_use_method_names = {} + + # Remove any previous entries + dialog.partition_create_use_combo.clear() + for method, name, description in ( self.ctrlr.dbfilter.use_as(devpart, True)): self.create_use_method_names[description] = name