[Pkg-kbd-commit] r231 - people/zinoviev/console-setup/debian

[Anton Zinoviev]

Author: zinoviev
Date: 2007-04-27 14:19:23 +0000 (Fri, 27 Apr 2007)
New Revision: 231

Modified:
   people/zinoviev/console-setup/debian/changelog
   people/zinoviev/console-setup/debian/config.proto
Log:
console-setup: fix #420824.


Modified: people/zinoviev/console-setup/debian/changelog
===================================================================
--- people/zinoviev/console-setup/debian/changelog	2007-04-26 08:58:17 UTC (rev 230)
+++ people/zinoviev/console-setup/debian/changelog	2007-04-27 14:19:23 UTC (rev 231)
@@ -1,15 +1,15 @@
-console-setup (1.16) unstable; urgency=low
+console-setup (1.16) UNRELEASED; urgency=low
 
   * Thanks to Colin Watson and Ubuntu team for the many bugs and
     improvements fixed in this release.  Patches were provided by Colin
     Watson:
     - Do not sorce the debconf library in the middle of the postinst,
       closes: #420831.
-    - Removed from the source package several directories
+    - Remove from the source package several directories
       debian/UDEB-PACKAGE-NAME.  (The udebs were removed from
-      debian/control running the clean target.)  Closes: #420912.
-    - In config.proto map fr_CH locale to Swiss French default keyboard
-      layout.  Closes: #420828.
+      debian/control before running the clean target.)  Closes: #420912.
+    - Map fr_CH locale to Swiss French default keyboard
+      layout in config.proto.  Closes: #420828.
     - Pass xkbdir variable on the make-command line, because else its
       value is overriden and the keymap definitions in Keyboard/ckb are
       used.  Closes: #420827.
@@ -20,14 +20,16 @@
     - The Devanagary layout variant is 'deva', not 'dev'.  Closes: #420797.
     - Do not leave empty default codeset for unsupported locales.
       Closes: #420802.  
-    - Use 'jp(latin)' instead of 'us' for Latin mode of Japanese keyboards.
+    - Use 'jp(latin)' instead of 'us' in the Latin mode of Japanese
+      keyboards.  Override the keyboard model if it was chosen by default
+      and the layout is Japanese or Brasilian.  Closes: #420824.
   * Two additions to the FAQ:
     - Add a suggestion for the VBERestore option.  Thanks to Dmitry
       Semyonov, closes: #402143.
     - Document CapsLock working as ShiftLock in Unicode mode.
   * Added Dutch translation.  Thanks to : Bart Cornelis, closes: #415518.
 
- -- Anton Zinoviev <zinoviev at debian.org>  Thu, 26 Apr 2007 10:09:54 +0300
+ --
 
 console-setup (1.15) unstable; urgency=low
 

Modified: people/zinoviev/console-setup/debian/config.proto
===================================================================
--- people/zinoviev/console-setup/debian/config.proto	2007-04-26 08:58:17 UTC (rev 230)
+++ people/zinoviev/console-setup/debian/config.proto	2007-04-27 14:19:23 UTC (rev 231)
@@ -1746,4 +1746,21 @@
 
 if [ $STATE -eq 0 ]; then
     exit 10
+else
+    # we don't do the following corrections during the state 2 or 3 of
+    # the loop because if the user backs up and selects another layout
+    # the keyboard model will be wrong.  We also want the combinations
+    # Brasilian layout on Japanese keyboard and Japanese layout on
+    # Brasilian keyboard to be possible.
+    db_get console-setup/modelcode
+    if [ "$RET" = "$default_model" ]; then
+	if [ "$layout" = br ]; then 
+	    model=abnt2
+	elif [ "$layout" = jp ]; then 
+	    model=jp106
+	fi
+	db_set console-setup/modelcode "$model"
+    fi
 fi
+
+exit 0