From 209be49ea36490e791d51243f4f4a7be181f0e4f Mon Sep 17 00:00:00 2001
From: Mike Hiretsky <mh@calculate.ru>
Date: Tue, 29 Dec 2009 12:57:53 +0300
Subject: [PATCH] Restore old keymaps

---
 Change.log                                 | 1 -
 install/calculate                          | 5 ++++-
 install/profile/2locale/etc/conf.d/keymaps | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Change.log b/Change.log
index 29445bb..6c9deb2 100644
--- a/Change.log
+++ b/Change.log
@@ -9,7 +9,6 @@ CHANGE LOG
 * Remove lzma compressing for initrd.
 * Add cl-kernel for kernel building.
 * Add depend on swap for calculate.
-* Fix russian keymap.
 
 1.3.2
 * Correct assembly given that calculate within the meta-package
diff --git a/install/calculate b/install/calculate
index 6d76e1e..8c21501 100755
--- a/install/calculate
+++ b/install/calculate
@@ -1086,8 +1086,11 @@ sub checksystem{
 	'pl_PL' => ["pl_PL.UTF-8", "pl", "", "lat2-16", "8859-2_to_uni", "us,pl",
 		    "", "us,pl", "pl", "pl", "pl"],
 	#Russian
-	'ru_RU' => ["ru_RU.UTF-8", "-u ruwin_cplk-UTF-8", "koi8-r", "ter-k14n", "", "us,ru(winkeys)",
+	'ru_RU' => ["ru_RU.UTF-8", "-u ru4", "koi8-r", "ter-k14n", "", "us,ru(winkeys)",
 		    "ru(winkeys):us", "us,ru(winkeys)", "ru", "ru", "en"],
+	# http://www.calculate-linux.org/boards/16/topics/1689
+	#'ru_RU' => ["ru_RU.UTF-8", "-u ruwin_cplk-UTF-8", "koi8-r", "ter-k14n", "", "us,ru(winkeys)",
+	#           "ru(winkeys):us", "us,ru(winkeys)", "ru", "ru", "en"],
 	#Spanish
 	'es_ES' => ["es_ES.UTF-8", "es euro2", "", "lat0-16", "", "es,us",
 		    "", "us,es", "es", "es", "es"],
diff --git a/install/profile/2locale/etc/conf.d/keymaps b/install/profile/2locale/etc/conf.d/keymaps
index df23f31..32c7899 100644
--- a/install/profile/2locale/etc/conf.d/keymaps
+++ b/install/profile/2locale/etc/conf.d/keymaps
@@ -3,4 +3,4 @@
 KEYMAP="#-keymap-#"
 SET_WINDOWSKEYS="yes"
 EXTENDED_KEYMAPS=""
-DUMPKEYS_CHARSET=""
+DUMPKEYS_CHARSET="#-dumpkeys_charset-#"