debian/changelog | 14 ++++++++++++++ debian/xkb-data.postinst.in | 27 +++++++++++++++++++++++++++ rules/base.ml_s.part | 1 - 3 files changed, 41 insertions(+), 1 deletion(-)
New commits: commit 9e4b55bc13796436c7383ba10c45d6c8033d4400 Author: Christopher James Halse Rogers <[email protected]> Date: Fri May 20 17:27:00 2011 +1000 Migrate settings from 'dvorak-intl' to 'dvorak-alt-intl' on upgrade to match upstream rename diff --git a/debian/changelog b/debian/changelog index 65ec555..55d1d5d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +xkeyboard-config (2.1-1ubuntu4) UNRELEASED; urgency=low + + * debian/xkb-data.postinst.in: + - Migrate console-setup/keyboard-configuration settings from dvorak-intl + to dvorak-alt-intl to match rename in xkeyboard-config 1.9. (LP: #742683) + + -- Christopher James Halse Rogers <[email protected]> Fri, 20 May 2011 17:26:05 +1000 + xkeyboard-config (2.1-1ubuntu3) natty; urgency=low * Fix broken HTC Dream stanza. diff --git a/debian/xkb-data.postinst.in b/debian/xkb-data.postinst.in index ef5279e..0dd35c9 100644 --- a/debian/xkb-data.postinst.in +++ b/debian/xkb-data.postinst.in @@ -2,6 +2,9 @@ set -e +# Source debconf library. +. /usr/share/debconf/confmodule + THIS_PACKAGE=xkb-data THIS_SCRIPT=postinst @@ -17,6 +20,30 @@ case $1 in rmdir --ignore-fail-on-non-empty /etc/X11/xkb fi fi + if dpkg --compare-versions "$2" lt-nl 1.9; then + # dvorak-intl was renamed to dvorak-alt-intl in 1.9 + # Transition users to the new layout name. + # + # We cannot guarantee that console-setup/keyboard-configuration's + # config script has either run or not run. Thus, we need to update + # both the configuration files and debconf. + for CONFIGFILE in /etc/default/keyboard /etc/default/console-setup ; do + if [ -f $CONFIGFILE ]; then + cp -a -f $CONFIGFILE $CONFIGFILE.tmp + sed -e "s|^ *XKBVARIANT=.*dvorak-intl.*|XKBVARIANT=\"dvorak-alt-intl\"|" \ + < $CONFIGFILE > $CONFIGFILE.tmp + mv -f $CONFIGFILE.tmp $CONFIGFILE + fi + done + db_get keyboard_configuration/variantcode || true + if [ "$RET" = "dvorak-intl" ]; then + db_set keyboard-configuration/variantcode "dvorak-alt-intl" + fi + db_get console-setup/variantcode || true + if [ "$RET" = "dvorak-intl" ]; then + db_set console-setup/variantcode "dvorak-alt-intl" + fi + fi ;; esac commit a52a9b925b2f412b63978aff7e0a056fd0e20ea3 Author: Christopher James Halse Rogers <[email protected]> Date: Fri May 20 17:20:01 2011 +1000 Merge 2.1-1ubuntu3 upload into git diff --git a/debian/changelog b/debian/changelog index 5b375ed..65ec555 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xkeyboard-config (2.1-1ubuntu3) natty; urgency=low + + * Fix broken HTC Dream stanza. + + -- Evan Dandrea <[email protected]> Tue, 08 Feb 2011 12:22:12 +0000 + xkeyboard-config (2.1-1ubuntu2) natty; urgency=low * Refresh patches 104, 105, 108 to apply diff --git a/rules/base.ml_s.part b/rules/base.ml_s.part index fdc82d2..5d3b46d 100644 --- a/rules/base.ml_s.part +++ b/rules/base.ml_s.part @@ -39,4 +39,3 @@ htcdream $htcdreamlayouts = %l(htcdream) * $nonlatin = pc+us+%l%(v):2 * * = pc+%l%(v) - htcdream us de it = %l(htcdream) -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
