From 44f22ebb80711e085a752e8c0c8f779af19caf11 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@canonical.com>
Date: Mon, 28 Mar 2011 19:46:25 +0100
Subject: [PATCH] Preseed keyboard-configuration/* questions for layout,
 variant, and model, not the obsolete console-setup/* questions (LP: #742558).

---
 common.inc       | 8 ++++----
 debian/changelog | 7 +++++++
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/common.inc b/common.inc
index dc312ae..c0016eb 100644
--- a/common.inc
+++ b/common.inc
@@ -373,14 +373,14 @@
       config.keymap .km.name get
       dup "_" strstr dup 0 eq {
         pop
-        keymap.op "console-setup/layoutcode%s%s " bc.cmd dup length add sprintf
+        keymap.op "keyboard-configuration/layoutcode%s%s " bc.cmd dup length add sprintf
       } {
         over over 1 sub 0 put
-        over keymap.op "console-setup/layoutcode%s%s " bc.cmd dup length add sprintf
-        add keymap.op "console-setup/variantcode%s%s " bc.cmd dup length add sprintf
+        over keymap.op "keyboard-configuration/layoutcode%s%s " bc.cmd dup length add sprintf
+        add keymap.op "keyboard-configuration/variantcode%s%s " bc.cmd dup length add sprintf
       } ifelse
       config.keymap .km.model get dup {
-        keymap.op "console-setup/modelcode%s%s " bc.cmd dup length add sprintf
+        keymap.op "keyboard-configuration/modelcode%s%s " bc.cmd dup length add sprintf
       } {
         pop
       } ifelse
diff --git a/debian/changelog b/debian/changelog
index 5eff6e3..89f4ffe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gfxboot-theme-ubuntu (0.11.3) UNRELEASED; urgency=low
+
+  * Preseed keyboard-configuration/* questions for layout, variant, and
+    model, not the obsolete console-setup/* questions (LP: #742558).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Mon, 28 Mar 2011 19:45:31 +0100
+
 gfxboot-theme-ubuntu (0.11.2) natty; urgency=low
 
   * Update keymaps from console-setup 1.57ubuntu17.