diff -Nru ubiquity-18.04.14.5/debian/changelog ubiquity-18.04.14.6/debian/changelog --- ubiquity-18.04.14.5/debian/changelog 2018-07-24 02:40:36.000000000 +0000 +++ ubiquity-18.04.14.6/debian/changelog 2018-07-24 23:10:16.000000000 +0000 @@ -1,3 +1,10 @@ +ubiquity (18.04.14.6) bionic; urgency=medium + + * Automatic update of included source packages: console-setup + 1.178ubuntu2.3, localechooser 2.71ubuntu3. + + -- Adam Conrad Tue, 24 Jul 2018 17:10:16 -0600 + ubiquity (18.04.14.5) bionic; urgency=medium * Drop .bzrignore, .bzr-builddeb now that we've got code in git. diff -Nru ubiquity-18.04.14.5/d-i/manifest ubiquity-18.04.14.6/d-i/manifest --- ubiquity-18.04.14.5/d-i/manifest 2018-07-24 02:40:36.000000000 +0000 +++ ubiquity-18.04.14.6/d-i/manifest 2018-07-24 23:10:16.000000000 +0000 @@ -3,12 +3,12 @@ bterm-unifont 1.4 choose-mirror 2.78ubuntu3 clock-setup 0.131ubuntu1 -console-setup 1.178ubuntu2.2 +console-setup 1.178ubuntu2.3 debian-installer-utils 1.124ubuntu1 flash-kernel 3.90ubuntu3 grub-installer 1.128ubuntu8.18.04.2 hw-detect 1.117ubuntu6 -localechooser 2.71ubuntu2 +localechooser 2.71ubuntu3 netcfg 1.142ubuntu7 partconf 1.50 partman-auto 134ubuntu8.1 diff -Nru ubiquity-18.04.14.5/d-i/source/console-setup/CHANGES ubiquity-18.04.14.6/d-i/source/console-setup/CHANGES --- ubiquity-18.04.14.5/d-i/source/console-setup/CHANGES 2018-07-20 20:22:45.000000000 +0000 +++ ubiquity-18.04.14.6/d-i/source/console-setup/CHANGES 2018-07-24 20:46:09.000000000 +0000 @@ -1,3 +1,11 @@ +console-setup (1.178ubuntu2.3) bionic; urgency=medium + + * Revert changes from 1.178ubuntu2.2 and 1.178ubuntu2.1 as those seem to + have caused a regression in ubiquity's default locale-based keyboard layout + pre-selection (LP: #1783326). + + -- Łukasz 'sil2100' Zemczak Tue, 24 Jul 2018 22:46:09 +0200 + console-setup (1.178ubuntu2.2) bionic; urgency=medium * debian/console-setup-udeb.postinst: Guard the dpkg call in the postinst, diff -Nru ubiquity-18.04.14.5/d-i/source/console-setup/debian/changelog ubiquity-18.04.14.6/d-i/source/console-setup/debian/changelog --- ubiquity-18.04.14.5/d-i/source/console-setup/debian/changelog 2018-07-20 20:22:45.000000000 +0000 +++ ubiquity-18.04.14.6/d-i/source/console-setup/debian/changelog 2018-07-24 20:46:09.000000000 +0000 @@ -1,3 +1,11 @@ +console-setup (1.178ubuntu2.3) bionic; urgency=medium + + * Revert changes from 1.178ubuntu2.2 and 1.178ubuntu2.1 as those seem to + have caused a regression in ubiquity's default locale-based keyboard layout + pre-selection (LP: #1783326). + + -- Łukasz 'sil2100' Zemczak Tue, 24 Jul 2018 22:46:09 +0200 + console-setup (1.178ubuntu2.2) bionic; urgency=medium * debian/console-setup-udeb.postinst: Guard the dpkg call in the postinst, diff -Nru ubiquity-18.04.14.5/d-i/source/console-setup/debian/console-setup-udeb.postinst ubiquity-18.04.14.6/d-i/source/console-setup/debian/console-setup-udeb.postinst --- ubiquity-18.04.14.5/d-i/source/console-setup/debian/console-setup-udeb.postinst 2018-07-20 20:22:45.000000000 +0000 +++ ubiquity-18.04.14.6/d-i/source/console-setup/debian/console-setup-udeb.postinst 2018-02-15 22:16:55.000000000 +0000 @@ -36,15 +36,7 @@ CONFIGFILE=/etc/default/keyboard -# Don't change /etc/default/keyboard at package upgrades on desktops -if [ ! -d /lib/debian-installer.d ] && type dpkg-query >/dev/null 2>&1; then - PKGVERSION=$(dpkg-query --show --showformat='${Version}' $DPKG_MAINTSCRIPT_PACKAGE) - if dpkg --compare-versions "$2" lt-nl "$PKGVERSION" && [ -n "XDG_CURRENT_DESKTOP" ]; then - NOCHANGE=true - fi -fi - -if [ "$1" = "configure" -a ! -L "$CONFIGFILE" -a "$NOCHANGE" != true ]; then +if [ "$1" = "configure" -a ! -L "$CONFIGFILE" ]; then db_get keyboard-configuration/modelcode model="$RET" diff -Nru ubiquity-18.04.14.5/d-i/source/console-setup/debian/keyboard-configuration.postinst ubiquity-18.04.14.6/d-i/source/console-setup/debian/keyboard-configuration.postinst --- ubiquity-18.04.14.5/d-i/source/console-setup/debian/keyboard-configuration.postinst 2018-07-20 20:22:45.000000000 +0000 +++ ubiquity-18.04.14.6/d-i/source/console-setup/debian/keyboard-configuration.postinst 2018-02-15 22:16:55.000000000 +0000 @@ -36,15 +36,7 @@ CONFIGFILE=/etc/default/keyboard -# Don't change /etc/default/keyboard at package upgrades on desktops -if [ ! -d /lib/debian-installer.d ] && type dpkg-query >/dev/null 2>&1; then - PKGVERSION=$(dpkg-query --show --showformat='${Version}' $DPKG_MAINTSCRIPT_PACKAGE) - if dpkg --compare-versions "$2" lt-nl "$PKGVERSION" && [ -n "XDG_CURRENT_DESKTOP" ]; then - NOCHANGE=true - fi -fi - -if [ "$1" = "configure" -a ! -L "$CONFIGFILE" -a "$NOCHANGE" != true ]; then +if [ "$1" = "configure" -a ! -L "$CONFIGFILE" ]; then db_get keyboard-configuration/modelcode model="$RET" diff -Nru ubiquity-18.04.14.5/d-i/source/localechooser/debian/changelog ubiquity-18.04.14.6/d-i/source/localechooser/debian/changelog --- ubiquity-18.04.14.5/d-i/source/localechooser/debian/changelog 2018-04-20 15:08:00.000000000 +0000 +++ ubiquity-18.04.14.6/d-i/source/localechooser/debian/changelog 2018-07-24 22:20:33.000000000 +0000 @@ -1,3 +1,9 @@ +localechooser (2.71ubuntu3) bionic; urgency=medium + + * Fix a missing operator in localechooser that throws spurious errors. + + -- Adam Conrad Tue, 24 Jul 2018 16:20:33 -0600 + localechooser (2.71ubuntu2) bionic; urgency=medium * Allow localechooser to write out preferences to /etc/default/locale diff -Nru ubiquity-18.04.14.5/d-i/source/localechooser/localechooser ubiquity-18.04.14.6/d-i/source/localechooser/localechooser --- ubiquity-18.04.14.5/d-i/source/localechooser/localechooser 2018-04-20 15:08:00.000000000 +0000 +++ ubiquity-18.04.14.6/d-i/source/localechooser/localechooser 2018-07-24 22:20:33.000000000 +0000 @@ -907,7 +907,7 @@ else extra_lang=${LANGUAGE%%_*}_$COUNTRYCODE fi - if [ "$LOCALE" != C ] && [ "$LOCALE" != C.UTF-8 ] \ + if [ "$LOCALE" != C ] && [ "$LOCALE" != C.UTF-8 ] && \ [ "$LANGUAGE" ] && [ "$COUNTRYCODE" ] && \ [ "$COUNTRYCODE" != "$DEFAULT_COUNTRY" ] && \ ! echo ":$LANGUAGELIST:" | grep -q ":$extra_lang:" && \