Radix cross Linux

Index: 2.4.0/Makefile
===================================================================
--- 2.4.0/Makefile	(nonexistent)
+++ 2.4.0/Makefile	(revision 5)
@@ -0,0 +1,292 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_INTEL_PC32)
+COMPONENT_TARGETS += $(HARDWARE_INTEL_PC64)
+COMPONENT_TARGETS += $(HARDWARE_EBOX_3350DX2)
+COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
+COMPONENT_TARGETS += $(HARDWARE_CB3X)
+COMPONENT_TARGETS += $(HARDWARE_ORANGE_PP2E)
+COMPONENT_TARGETS += $(HARDWARE_NANOPI_NEO)
+COMPONENT_TARGETS += $(HARDWARE_ORANGE_PP)
+COMPONENT_TARGETS += $(HARDWARE_ORANGE_PL2)
+COMPONENT_TARGETS += $(HARDWARE_WECHIP_TX6)
+COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
+COMPONENT_TARGETS += $(HARDWARE_POIN2)
+COMPONENT_TARGETS += $(HARDWARE_RK3328_CC)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_EDGE)
+COMPONENT_TARGETS += $(HARDWARE_LEEZ_P710)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM2)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
+COMPONENT_TARGETS += $(HARDWARE_OKMX6DL_C)
+COMPONENT_TARGETS += $(HARDWARE_OKMX6Q_C)
+COMPONENT_TARGETS += $(HARDWARE_BONE_BLACK)
+COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
+COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BAIKAL_T1)
+COMPONENT_TARGETS += $(HARDWARE_BAIKAL_M1)
+COMPONENT_TARGETS += $(HARDWARE_S824L)
+COMPONENT_TARGETS += $(HARDWARE_VESNIN)
+COMPONENT_TARGETS += $(HARDWARE_S824L_LSB)
+COMPONENT_TARGETS += $(HARDWARE_VESNIN_LSB)
+COMPONENT_TARGETS += $(HARDWARE_TL2WK2)
+COMPONENT_TARGETS += $(HARDWARE_TL2SV2)
+COMPONENT_TARGETS += $(HARDWARE_TL2WK2_LSB)
+COMPONENT_TARGETS += $(HARDWARE_TL2SV2_LSB)
+COMPONENT_TARGETS += $(HARDWARE_SIFIVE_U740)
+
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+
+include ../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/packages/a/kbd
+
+REQUIRES           = dev/check/0.15.2
+REQUIRES          += secure/pam/1.5.1
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 2.4.0
+tar_xz_archive     = $(SRC_PACKAGE_PATH)/packages/a/kbd/kbd-$(version).tar.xz
+SRC_ARCHIVE        = $(tar_xz_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/kbd-$(version)
+src_dir_name       = kbd-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+PATCHES = PATCHES
+
+build_dir          = $(TARGET_BUILD_DIR)/build
+build_target       = $(TARGET_BUILD_DIR)/.build_done
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+maps_i386_qwerty   = $(CURDIR)/keymaps/i386/qwerty
+
+####### Targets
+
+PKG_GROUP = app
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+KBD_PKG_NAME                = kbd
+KBD_PKG_VERSION             = 2.4.0
+KBD_PKG_ARCH                = $(PKGARCH)
+KBD_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+KBD_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+KBD_PKG_GROUP               = $(PKG_GROUP)
+###                          |---handy-ruler-------------------------------|
+KBD_PKG_SHORT_DESCRIPTION   = keyboard maps and console fonts
+KBD_PKG_URL                 = $(BUG_URL)
+KBD_PKG_LICENSE             = GPLv2
+KBD_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(KBD_PKG_NAME)-pkg-description
+KBD_PKG_DESCRIPTION_FILE_IN = $(KBD_PKG_NAME)-pkg-description.in
+KBD_PKG_INSTALL_SCRIPT      = $(KBD_PKG_NAME)-pkg-install.sh
+
+KBD_PKG          = $(CURDIR)/$(TARGET_BUILD_DIR)/$(KBD_PKG_NAME)-package
+
+pkg_basename     = $(KBD_PKG_NAME)-$(KBD_PKG_VERSION)-$(KBD_PKG_ARCH)-$(KBD_PKG_DISTRO_NAME)-$(KBD_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_certificate  = $(call cert-name,$(pkg_archive))
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS    = $(build_target)
+BUILD_TARGETS   += $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../build-system/core.mk
+
+
+env_sysroot = DESTDIR=$(KBD_PKG)
+
+extra_configure_switches  = --libdir=/usr/lib$(LIBSUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --mandir=/usr/share/man
+extra_configure_switches += --disable-dependency-tracking
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localedir=/usr/share/locale
+extra_configure_switches += --datadir=/usr/share/kbd
+extra_configure_switches += --enable-libkeymap
+extra_configure_switches += --disable-rpath
+extra_configure_switches += --enable-nls
+
+ifeq ($(__ENABLE_STATIC__),yes)
+extra_configure_switches += --enable-static=yes
+else
+extra_configure_switches += --enable-static=no
+endif
+extra_configure_switches += --enable-shared=yes
+
+
+LDFLAGS += -Wl,-rpath,/lib$(LIBSUFFIX):/usr/lib$(LIBSUFFIX)
+
+
+TARGET_BIN_RPATH = /lib$(LIBSUFFIX):/usr/lib$(LIBSUFFIX)
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	# ======= Rename conflicting keymaps =======
+	@( cd $(SRC_DIR)/data/keymaps/i386 ; \
+	   mv -fv  qwertz/cz{,-qwertz}.map         ; \
+	   mv -fv  olpc/es{,-olpc}.map             ; \
+	   mv -fv  olpc/pt{,-olpc}.map             ; \
+	   mv -fv  fgGIod/trf{,-fgGIod}.map        ; \
+	   mv -fv  colemak/{en-latin9,colemak}.map ; \
+	   cp -fav qwerty/pt-latin9.map qwerty/pt.map        ; \
+	   cp -fav qwerty/sv-latin1.map qwerty/se-latin1.map ; \
+	   mv -fv  azerty/fr{,-old}.map            ; \
+	   cp -fav azerty/fr-latin9.map azerty/fr.map        ; \
+	   cp -fav azerty/fr-latin9.map azerty/fr-latin0.map ; \
+	 )
+	@touch $@
+
+$(build_target): $(src_done)
+	@mkdir -p $(build_dir)
+	@cd $(build_dir) && \
+	  $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+	  --prefix=/usr               \
+	  --build=$(BUILD)            \
+	  --host=$(TARGET)            \
+	  $(extra_configure_switches)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+	@touch $@
+
+$(install_target): $(build_target)
+	@mkdir -p $(KBD_PKG)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+	# ======= The rhpl keyboard layout table is indexed by kbd layout names, =======
+	# ======= so we need a Korean keyboard                                   =======
+	@( cd $(KBD_PKG)/usr/share/kbd/keymaps/i386/qwerty ; \
+	   ln -sf us.map.gz ko.map.gz ; \
+	 )
+	# ======= Install Russian i386/qwerty keymaps =======
+	@for map in $(maps_i386_qwerty)/*.map ; do \
+	   cat $$map | gzip -9c > $(KBD_PKG)/usr/share/kbd/keymaps/i386/qwerty/`basename $$map`.gz ; \
+	 done
+	# ======= Move loadkeys into /bin directory =======
+	@mkdir -p $(KBD_PKG)/bin
+	@( cd $(KBD_PKG)/usr/bin ; \
+	   mv -f loadkeys ../../bin ; \
+	   ln -sf ../../bin/loadkeys . ; \
+	 )
+ifeq ($(filter $(TOOLCHAIN),$(TOOLCHAIN_I586_GLIBC) $(TOOLCHAIN_I686_GLIBC) $(TOOLCHAIN_X86_64_GLIBC)),)
+	@rm -f $(KBD_PKG)/usr/share/man/man8/resizecons.*
+endif
+	# ======= Install Documentation =======
+	@if [ -d $(KBD_PKG)/usr/share/man ]; then \
+	  ( cd $(KBD_PKG)/usr/share/man ; \
+	    for manpagedir in `find . -type d -name "man*"` ; do \
+	      ( cd $$manpagedir ; \
+	        for eachpage in `find . -type l -maxdepth 1` ; do \
+	          ln -s `readlink $$eachpage`.gz $$eachpage.gz ; \
+	          rm $$eachpage ; \
+	        done ; \
+	        gzip -9 *.?  ; \
+	      ) \
+	    done \
+	  ) \
+	 fi
+	@mkdir -p $(KBD_PKG)/usr/doc/$(src_dir_name)
+	@cp -a $(SRC_DIR)/AUTHORS $(SRC_DIR)/COPYING \
+	       $(KBD_PKG)/usr/doc/$(src_dir_name)
+	@mkdir -p $(KBD_PKG)/usr/share/doc/$(src_dir_name)
+	@( cd $(SRC_DIR) ; \
+	   cp -a AUTHORS COPYING CREDITS README src/vlock/README.vlock docs/doc \
+	         $(KBD_PKG)/usr/share/doc/$(src_dir_name) \
+	 )
+	@( cd $(KBD_PKG)/usr/share/doc/$(src_dir_name) ; \
+	   mv html libkeymap ; \
+	   mv doc docs ; \
+	 )
+	@( cd $(SRC_DIR) ; \
+	   if [ -r ChangeLog ]; then \
+	     DOCSDIR=`echo $(KBD_PKG)/usr/share/doc/$(src_dir_name)` ; \
+	     cat ChangeLog | head -n 1000 > $$DOCSDIR/ChangeLog ; \
+	     touch -r ChangeLog $$DOCSDIR/ChangeLog ; \
+	   fi \
+	 )
+	# ======= remove target path from target libtool *.la files =======
+	@( cd $(KBD_PKG)/usr/lib$(LIBSUFFIX) ; \
+	   sed -i "s,$(TARGET_DEST_DIR),,g" libkbdfile.la libkeymap.la ; \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(KBD_PKG))
+	# ======= tune libtool *.la search path to the target destination for development =======
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX) ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g"   libkbdfile.la libkeymap.la ; \
+	   sed -i "s,L/lib,L$(TARGET_DEST_DIR)/lib,g" libkbdfile.la libkeymap.la ; \
+	 )
+	# ======= tune pkg-config *.pc search path to the target destination for development =======
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX)/pkgconfig ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" libkeymap.pc ; \
+	 )
+	# ======= Strip binaries =======
+	@( cd $(KBD_PKG) ; \
+	   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	 )
+ifeq ($(__ENABLE_STATIC__),yes)
+	@( cd $(KBD_PKG) ; \
+	   find . | xargs file | grep "current ar archive" | cut -f 1 -d : | xargs $(STRIP) -g 2> /dev/null ; \
+	 )
+endif
+ifneq ($(PATCHELF),)
+	# ======= Set RPATH/RUNPATH for target binaries =======
+	@( cd $(KBD_PKG)/usr/bin ; \
+	   for file in `find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs echo` ; do \
+	     rpath=`$(PATCHELF) --print-rpath $$file 2> /dev/null` ; \
+	     if echo "$$rpath" | grep -q "$(TARGET_DEST_DIR)" ; then \
+	       $(PATCHELF) --set-rpath $(TARGET_BIN_RPATH) $$file 1> /dev/null 2> /dev/null ; \
+	     fi ; \
+	   done ; \
+	 )
+endif
+	@touch $@
+
+$(KBD_PKG_DESCRIPTION_FILE): $(KBD_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_certificate) : $(pkg_archive) ;
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(KBD_PKG_DESCRIPTION_FILE) $(KBD_PKG_INSTALL_SCRIPT)
+	@cp $(KBD_PKG_DESCRIPTION_FILE) $(KBD_PKG)/.DESCRIPTION
+	@cp $(KBD_PKG_INSTALL_SCRIPT) $(KBD_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(KBD_PKG)/.REQUIRES
+	@echo "pkgname=$(KBD_PKG_NAME)"                            >  $(KBD_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(KBD_PKG_VERSION)"                          >> $(KBD_PKG)/.PKGINFO ; \
+	 echo "arch=$(KBD_PKG_ARCH)"                               >> $(KBD_PKG)/.PKGINFO ; \
+	 echo "distroname=$(KBD_PKG_DISTRO_NAME)"                  >> $(KBD_PKG)/.PKGINFO ; \
+	 echo "distrover=$(KBD_PKG_DISTRO_VERSION)"                >> $(KBD_PKG)/.PKGINFO ; \
+	 echo "group=$(KBD_PKG_GROUP)"                             >> $(KBD_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(KBD_PKG_SHORT_DESCRIPTION)\"" >> $(KBD_PKG)/.PKGINFO ; \
+	 echo "url=$(KBD_PKG_URL)"                                 >> $(KBD_PKG)/.PKGINFO ; \
+	 echo "license=$(KBD_PKG_LICENSE)"                         >> $(KBD_PKG)/.PKGINFO
+	@$(PSEUDO) sh -c "cd $(KBD_PKG) && \
+	                  chown -R root:root . && \
+	                  $(MAKE_PACKAGE) -J --linkadd=yes $(GNUPG_OPTIONS) -m -d .. ."
Index: 2.4.0/PATCHES
===================================================================
--- 2.4.0/PATCHES	(nonexistent)
+++ 2.4.0/PATCHES	(revision 5)
@@ -0,0 +1,2 @@
+
+../../../sources/packages/a/kbd/patches/kbd-2.4.0.patch -p0
Index: 2.4.0/kbd-pkg-description.in
===================================================================
--- 2.4.0/kbd-pkg-description.in	(nonexistent)
+++ 2.4.0/kbd-pkg-description.in	(revision 5)
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+   |-----handy-ruler------------------------------------------------------|
+kbd: kbd @VERSION@ (keyboard maps and console fonts)
+kbd:
+kbd: Load and save keyboard mappings. Needed if you are not using the
+kbd: US keyboard map. This package also contains utilities to change
+kbd: your console fonts - if you install it you'll get a menu later on
+kbd: that lets you select from many different fonts. If you like one,
+kbd: you can make it your default font. A new default font can be
+kbd: chosen at any time by typing 'setconsolefont'.
+kbd:
+kbd:
+kbd:
Index: 2.4.0/kbd-pkg-install.sh
===================================================================
--- 2.4.0/kbd-pkg-install.sh	(nonexistent)
+++ 2.4.0/kbd-pkg-install.sh	(revision 5)
@@ -0,0 +1,53 @@
+#!/bin/sh
+
+# Preserve new files
+install_file() {
+  NEW="$1"
+  OLD="`dirname $NEW`/`basename $NEW .new`"
+  # If there's no file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "`cat $OLD | md5sum`" = "`cat $NEW | md5sum`" ]; then # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+
+# arg 1:  the new package version
+pre_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+post_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+pre_update() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_update() {
+  post_install
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  /bin/true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  /bin/true
+}
+
+
+operation=$1
+shift
+
+$operation $*

Property changes on: 2.4.0/kbd-pkg-install.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: 2.4.0/keymaps/i386/qwerty/README
===================================================================
--- 2.4.0/keymaps/i386/qwerty/README	(nonexistent)
+++ 2.4.0/keymaps/i386/qwerty/README	(revision 5)
@@ -0,0 +1,7 @@
+
+/* begin *
+
+   Russian KeyMap.
+   "Cyrillic" mode is toggled by Right_Alt key and shifted by AltGr key.
+
+ * end */
Index: 2.4.0/keymaps/i386/qwerty/ru-rAlt-cp1251.map
===================================================================
--- 2.4.0/keymaps/i386/qwerty/ru-rAlt-cp1251.map	(nonexistent)
+++ 2.4.0/keymaps/i386/qwerty/ru-rAlt-cp1251.map	(revision 5)
@@ -0,0 +1,300 @@
+#
+# ru-rAlt-cp1251.map
+#
+# Russian KeyMap.
+# "Cyrillic" mode is toggled by Right_Alt key and shifted by AltGr key.
+#
+# charset=windows-1251.
+#
+# Andrew V.Kosteltsev <kosteltsev@gmail.com>
+#
+#
+keymaps 0-4,6,8,10,12
+strings as usual
+
+		keycode	1 =	Escape	Escape		Escape	Escape
+	alt	keycode	1 =	Meta_Escape
+		keycode	2 =	one	exclam		one	exclam
+	alt	keycode	2 =	Meta_one	
+		keycode	3 =	two	at		two	quotedbl
+	control	keycode	3 =	nul	
+	alt	keycode	3 =	Meta_two	
+		keycode	4 =	three	numbersign	three	+0xB9
+	control	keycode	4 =	Escape
+	alt	keycode	4 =	Meta_three
+		keycode	5 =	four	dollar		four	semicolon	
+	control	keycode	5 =	Control_backslash
+	alt	keycode	5 =	Meta_four
+		keycode	6 =	five	percent		five	percent
+	control	keycode	6 =	Control_bracketright
+	alt	keycode	6 =	Meta_five
+		keycode	7 =	six	asciicircum	six	colon
+	control	keycode	7 =	Control_asciicircum
+	alt	keycode	7 =	Meta_six	
+		keycode	8 =	seven	ampersand	seven	question
+	control	keycode	8 =	Control_underscore
+	alt	keycode	8 =	Meta_seven
+		keycode	9 =	eight	asterisk	eight	asterisk
+	control	keycode	9 =	Delete	
+	alt	keycode	9 =	Meta_eight
+		keycode	10 =	nine	parenleft	nine	parenleft
+	alt	keycode	10 =	Meta_nine
+		keycode	11 =	zero	parenright	zero	parenright
+	alt	keycode	11 =	Meta_zero
+		keycode	12 =	minus	underscore	minus	underscore
+	control	keycode	12 =	Control_underscore
+	alt	keycode	12 =	Meta_minus
+		keycode	13 =	equal	plus		equal	plus
+	alt	keycode	13 =	Meta_equal
+		keycode	14 =	BackSpace BackSpace	BackSpace BackSpace
+	alt	keycode	14 =	Meta_Delete
+		keycode	15 =	Tab	Tab		Tab	Tab	
+	alt	keycode	15 =	Meta_Tab	
+		keycode	16 =	+q	+Q		+0xE9	+0xC9
+	control	keycode	16 =	Control_q
+altgr	control	keycode	16 =	Control_q
+		keycode	17 =	+w	+W		+0xF6	+0xD6
+	control	keycode	17 =	Control_w
+altgr	control	keycode	17 =	Control_w
+		keycode	18 =	+e	+E		+0xF3	+0xD3
+	control	keycode	18 =	Control_e
+altgr	control	keycode	18 =	Control_e
+		keycode	19 =	+r	+R		+0xEA	+0xCA
+	control	keycode	19 =	Control_r
+altgr	control	keycode	19 =	Control_r
+		keycode	20 =	+t	+T		+0xE5	+0xC5
+	control	keycode	20 =	Control_t
+altgr	control	keycode	20 =	Control_t
+		keycode	21 =	+y	+Y		+0xED	+0xCD
+	control	keycode	21 =	Control_y
+altgr	control	keycode	21 =	Control_y
+		keycode	22 =	+u	+U		+0xE3	+0xC3
+	control	keycode	22 =	Control_u
+altgr	control	keycode	22 =	Control_u
+		keycode	23 =	+i	+I		+0xF8	+0xD8
+	control	keycode	23 =	Tab
+altgr	control	keycode	23 =	Tab
+		keycode	24 =	+o	+O		+0xF9	+0xD9
+	control	keycode	24 =	Control_o
+altgr	control	keycode	24 =	Control_o
+		keycode	25 =	+p	+P		+0xE7	+0xC7
+	control	keycode	25 =	Control_p
+altgr	control	keycode	25 =	Control_p
+		keycode	26 =	bracketleft braceleft	+0xF5	+0xD5
+	control	keycode	26 =	Escape	
+altgr	control	keycode	26 =	Escape	
+	alt	keycode	26 =	Meta_bracketleft
+		keycode	27 =	bracketright braceright	+0xFA	+0xDA
+	control	keycode	27 =	Control_bracketright
+altgr	control	keycode	27 =	Control_bracketright
+	alt	keycode	27 =	Meta_bracketright
+		keycode	28 =	Return	
+	alt	keycode	28 =	Meta_Control_m	
+		keycode	29 =	Control	
+		keycode	30 =	+a	+A		+0xF4	+0xD4
+	control	keycode	30 =	Control_a
+altgr	control	keycode	30 =	Control_a
+		keycode	31 =	+s	+S		+0xFB	+0xDB
+	control	keycode	31 =	Control_s
+altgr	control	keycode	31 =	Control_s
+		keycode	32 =	+d	+D		+0xE2	+0xC2
+	control	keycode	32 =	Control_d
+altgr	control	keycode	32 =	Control_d
+		keycode	33 =	+f	+F		+0xE0	+0xC0
+	control	keycode	33 =	Control_f
+altgr	control	keycode	33 =	Control_f
+		keycode	34 =	+g	+G		+0xEF	+0xCF
+	control	keycode	34 =	Control_g
+altgr	control	keycode	34 =	Control_g
+		keycode	35 =	+h	+H		+0xF0	+0xD0
+	control	keycode	35 =	BackSpace
+altgr	control	keycode	35 =	BackSpace
+		keycode	36 =	+j	+J		+0xEE	+0xCE
+	control	keycode	36 =	Linefeed
+altgr	control	keycode	36 =	Linefeed
+		keycode	37 =	+k	+K		+0xEB	+0xCB
+	control	keycode	37 =	Control_k
+altgr	control	keycode	37 =	Control_k
+		keycode	38 =	+l	+L		+0xE4	+0xC4
+	control	keycode	38 =	Control_l
+altgr	control	keycode	38 =	Control_l
+		keycode	39 =	semicolon colon		+0xE6	+0xC6
+	alt	keycode	39 =	Meta_semicolon
+		keycode	40 =	apostrophe quotedbl	+0xFD	+0xDD
+	control	keycode	40 =	Control_g
+altgr	control	keycode	40 =	Control_g
+	alt	keycode	40 =	Meta_apostrophe
+		keycode	41 =	grave	asciitilde	+0xB8	+0xA8
+	control	keycode	41 =	nul	
+	alt	keycode	41 =	Meta_grave
+		keycode	42 =	Shift	
+		keycode	43 =	backslash bar		slash bar	
+	control	keycode	43 =	Control_backslash
+	alt	keycode	43 =	Meta_backslash
+		keycode	44 =	+z	+Z		+0xFF	+0xDF
+	control	keycode	44 =	Control_z
+altgr	control	keycode	44 =	Control_z
+		keycode	45 =	+x	+X		+0xF7	+0xD7
+	control	keycode	45 =	Control_x
+altgr	control	keycode	45 =	Control_x
+		keycode	46 =	+c	+C		+0xF1	+0xD1
+	control	keycode	46 =	Control_c
+altgr	control	keycode	46 =	Control_c
+		keycode	47 =	+v	+V		+0xEC	+0xCC
+	control	keycode	47 =	Control_v
+altgr	control	keycode	47 =	Control_v
+		keycode	48 =	+b	+B		+0xE8	+0xC8
+	control	keycode	48 =	Control_b
+altgr	control	keycode	48 =	Control_b
+		keycode	49 =	+n	+N		+0xF2	+0xD2
+	control	keycode	49 =	Control_n
+altgr	control	keycode	49 =	Control_n
+		keycode	50 =	+m	+M		+0xFC	+0xDC
+	control	keycode	50 =	Control_m
+altgr	control	keycode	50 =	Control_m
+		keycode	51 =	comma	less		+0xE1	+0xC1
+	alt	keycode	51 =	Meta_comma
+		keycode	52 =	period	greater		+0xFE	+0xDE
+	alt	keycode	52 =	Meta_period
+		keycode	53 =	slash	question	period	comma
+	control	keycode	53 =	Delete	
+	alt	keycode	53 =	Meta_slash
+		keycode	54 =	Shift
+		keycode	55 =	KP_Multiply
+		keycode	56 =	Alt	
+		keycode	57 =	space	space		space	space	
+	control	keycode	57 =	nul	
+	alt	keycode	57 =	Meta_space
+		keycode	58 =	Caps_Lock
+#
+# Virtual Consoles
+#
+		keycode	59 =	F1	F11	F1	F11
+    control	keycode	59 =	F1	
+	alt	keycode	59 =	Console_1
+altgr	alt	keycode	59 =	Console_1
+		keycode	60 =	F2	F12	F2	F12
+    control	keycode	60 =	F2	
+	alt	keycode	60 =	Console_2
+altgr	alt	keycode	60 =	Console_2
+		keycode	61 =	F3	F13	F3	F13
+    control	keycode	61 =	F3	
+	alt	keycode	61 =	Console_3
+altgr	alt	keycode	61 =	Console_3
+		keycode	62 =	F4	F14	F4	F14
+    control	keycode	62 =	F4	
+	alt	keycode	62 =	Console_4
+altgr	alt	keycode	62 =	Console_4
+		keycode	63 =	F5	F15	F5	F15
+    control	keycode	63 =	F5	
+	alt	keycode	63 =	Console_5
+altgr	alt	keycode	63 =	Console_5
+		keycode	64 =	F6	F16	F6	F16
+    control	keycode	64 =	F6	
+	alt	keycode	64 =	Console_6
+altgr	alt	keycode	64 =	Console_6
+		keycode	65 =	F7	F17	F7	F17
+    control	keycode	65 =	F7	
+	alt	keycode	65 =	Console_7
+altgr	alt	keycode	65 =	Console_7
+		keycode	66 =	F8	F18	F8	F18
+    control	keycode	66 =	F8	
+	alt	keycode	66 =	Console_8
+altgr	alt	keycode	66 =	Console_8
+		keycode	67 =	F9	F19	F9	F19
+    control	keycode	67 =	F9	
+	alt	keycode	67 =	Console_9
+altgr	alt	keycode	67 =	Console_9
+		keycode	68 =	F10	F20	F10	F20
+    control	keycode	68 =	F10	
+	alt	keycode	68 =	Console_10
+altgr	alt	keycode	68 =	Console_10
+
+		keycode	69 =	Num_Lock	
+		keycode	70 =	Scroll_Lock	Show_Memory	Show_Registers
+	control	keycode	70 =	Show_State
+	alt	keycode	70 =	Scroll_Lock
+		keycode	71 =	KP_7	
+	alt	keycode	71 =	Ascii_7	
+		keycode	72 =	KP_8	
+	alt	keycode	72 =	Ascii_8	
+		keycode	73 =	KP_9	
+	alt	keycode	73 =	Ascii_9	
+		keycode	74 =	KP_Subtract
+		keycode	75 =	KP_4	
+	alt	keycode	75 =	Ascii_4	
+		keycode	76 =	KP_5	
+	alt	keycode	76 =	Ascii_5	
+		keycode	77 =	KP_6	
+	alt	keycode	77 =	Ascii_6	
+		keycode	78 =	KP_Add	
+		keycode	79 =	KP_1	
+	alt	keycode	79 =	Ascii_1	
+		keycode	80 =	KP_2	
+	alt	keycode	80 =	Ascii_2	
+		keycode	81 =	KP_3	
+	alt	keycode	81 =	Ascii_3	
+		keycode	82 =	KP_0	
+	alt	keycode	82 =	Ascii_0	
+		keycode	83 =	KP_Period
+altgr	control	keycode	83 =	Boot	
+control	alt	keycode	83 =	Boot	
+		keycode	84 =	Last_Console
+		keycode	85 =
+		keycode	86 =	less	greater	bar	
+	alt	keycode	86 =	Meta_less
+		keycode	87 =	F11	F11	F11	F11
+	control	keycode	87 =	F11	
+	alt	keycode	87 =	Console_11
+altgr	alt	keycode	87 =	Console_11
+		keycode	88 =	F12	F12	F12	F12
+	control	keycode	88 =	F12	
+	alt	keycode	88 =	Console_12
+altgr	alt	keycode	88 =	Console_12
+		keycode	89 =
+		keycode	90 =
+		keycode	91 =
+		keycode	92 =
+		keycode	93 =
+		keycode	94 =
+		keycode	95 =
+		keycode	96 =	KP_Enter	
+		keycode	97 =
+		keycode	98 =	KP_Divide
+		keycode	99 =	Control_backslash
+	control	keycode	99 =	Control_backslash
+	alt	keycode	99 =	Control_backslash
+		keycode	100 =	AltGr_Lock
+		keycode	101 =	Break	
+		keycode	102 =	Find	
+		keycode	103 =	Up	
+		keycode	104 =	Prior	
+	shift	keycode	104 =	Scroll_Backward
+		keycode	105 =	Left	
+        alt     keycode 105 =	Decr_Console
+		keycode 106 =	Right
+        alt     keycode 106 =	Incr_Console
+		keycode	107 =	Select	
+		keycode	108 =	Down	
+		keycode	109 =	Next	
+	shift	keycode	109 =	Scroll_Forward
+		keycode	110 =	Insert	
+		keycode	111 =	Remove	
+altgr	control	keycode	111 =	Boot	
+control	alt	keycode	111 =	Boot	
+		keycode	112 =
+		keycode	113 =
+		keycode	114 =
+		keycode	115 =
+		keycode	116 =
+		keycode	117 =
+		keycode	118 =
+		keycode	119 =
+		keycode	120 =
+		keycode	121 =
+		keycode	122 =
+		keycode	123 =
+		keycode	124 =
+		keycode	125 =
+		keycode	126 =
+		keycode	127 =
Index: 2.4.0/keymaps/i386/qwerty/ru-rAlt-iso88595.map
===================================================================
--- 2.4.0/keymaps/i386/qwerty/ru-rAlt-iso88595.map	(nonexistent)
+++ 2.4.0/keymaps/i386/qwerty/ru-rAlt-iso88595.map	(revision 5)
@@ -0,0 +1,300 @@
+#
+# ru-rAlt-iso88595.map
+#
+# Russian KeyMap.
+# "Cyrillic" mode is toggled by Right_Alt key and shifted by AltGr key.
+#
+# charset=ISO-8859-5.
+#
+# Andrew V.Kosteltsev <kosteltsev@gmail.com>
+#
+#
+keymaps 0-4,6,8,10,12
+strings as usual
+
+		keycode	1 =	Escape	Escape		Escape	Escape
+	alt	keycode	1 =	Meta_Escape
+		keycode	2 =	one	exclam		one	exclam
+	alt	keycode	2 =	Meta_one	
+		keycode	3 =	two	at		two	quotedbl
+	control	keycode	3 =	nul	
+	alt	keycode	3 =	Meta_two	
+		keycode	4 =	three	numbersign	three	+0xF0
+	control	keycode	4 =	Escape
+	alt	keycode	4 =	Meta_three
+		keycode	5 =	four	dollar		four	semicolon	
+	control	keycode	5 =	Control_backslash
+	alt	keycode	5 =	Meta_four
+		keycode	6 =	five	percent		five	percent
+	control	keycode	6 =	Control_bracketright
+	alt	keycode	6 =	Meta_five
+		keycode	7 =	six	asciicircum	six	colon
+	control	keycode	7 =	Control_asciicircum
+	alt	keycode	7 =	Meta_six	
+		keycode	8 =	seven	ampersand	seven	question
+	control	keycode	8 =	Control_underscore
+	alt	keycode	8 =	Meta_seven
+		keycode	9 =	eight	asterisk	eight	asterisk
+	control	keycode	9 =	Delete	
+	alt	keycode	9 =	Meta_eight
+		keycode	10 =	nine	parenleft	nine	parenleft
+	alt	keycode	10 =	Meta_nine
+		keycode	11 =	zero	parenright	zero	parenright
+	alt	keycode	11 =	Meta_zero
+		keycode	12 =	minus	underscore	minus	underscore
+	control	keycode	12 =	Control_underscore
+	alt	keycode	12 =	Meta_minus
+		keycode	13 =	equal	plus		equal	plus
+	alt	keycode	13 =	Meta_equal
+		keycode	14 =	BackSpace BackSpace	BackSpace BackSpace
+	alt	keycode	14 =	Meta_Delete
+		keycode	15 =	Tab	Tab		Tab	Tab	
+	alt	keycode	15 =	Meta_Tab	
+		keycode	16 =	+q	+Q		+0xD9	+0xB9
+	control	keycode	16 =	Control_q
+altgr	control	keycode	16 =	Control_q
+		keycode	17 =	+w	+W		+0xE6	+0xC6
+	control	keycode	17 =	Control_w
+altgr	control	keycode	17 =	Control_w
+		keycode	18 =	+e	+E		+0xE3	+0xC3
+	control	keycode	18 =	Control_e
+altgr	control	keycode	18 =	Control_e
+		keycode	19 =	+r	+R		+0xDA	+0xBA
+	control	keycode	19 =	Control_r
+altgr	control	keycode	19 =	Control_r
+		keycode	20 =	+t	+T		+0xD5	+0xB5
+	control	keycode	20 =	Control_t
+altgr	control	keycode	20 =	Control_t
+		keycode	21 =	+y	+Y		+0xDD	+0xBD
+	control	keycode	21 =	Control_y
+altgr	control	keycode	21 =	Control_y
+		keycode	22 =	+u	+U		+0xD3	+0xB3
+	control	keycode	22 =	Control_u
+altgr	control	keycode	22 =	Control_u
+		keycode	23 =	+i	+I		+0xE8	+0xC8
+	control	keycode	23 =	Tab
+altgr	control	keycode	23 =	Tab
+		keycode	24 =	+o	+O		+0xE9	+0xC9
+	control	keycode	24 =	Control_o
+altgr	control	keycode	24 =	Control_o
+		keycode	25 =	+p	+P		+0xD7	+0xB7
+	control	keycode	25 =	Control_p
+altgr	control	keycode	25 =	Control_p
+		keycode	26 =	bracketleft braceleft	+0xE5	+0xC5
+	control	keycode	26 =	Escape	
+altgr	control	keycode	26 =	Escape	
+	alt	keycode	26 =	Meta_bracketleft
+		keycode	27 =	bracketright braceright	+0xEA	+0xCA
+	control	keycode	27 =	Control_bracketright
+altgr	control	keycode	27 =	Control_bracketright
+	alt	keycode	27 =	Meta_bracketright
+		keycode	28 =	Return	
+	alt	keycode	28 =	Meta_Control_m	
+		keycode	29 =	Control	
+		keycode	30 =	+a	+A		+0xE4	+0xC4
+	control	keycode	30 =	Control_a
+altgr	control	keycode	30 =	Control_a
+		keycode	31 =	+s	+S		+0xEB	+0xCB
+	control	keycode	31 =	Control_s
+altgr	control	keycode	31 =	Control_s
+		keycode	32 =	+d	+D		+0xD2	+0xB2
+	control	keycode	32 =	Control_d
+altgr	control	keycode	32 =	Control_d
+		keycode	33 =	+f	+F		+0xD0	+0xB0
+	control	keycode	33 =	Control_f
+altgr	control	keycode	33 =	Control_f
+		keycode	34 =	+g	+G		+0xDF	+0xBF
+	control	keycode	34 =	Control_g
+altgr	control	keycode	34 =	Control_g
+		keycode	35 =	+h	+H		+0xE0	+0xC0
+	control	keycode	35 =	BackSpace
+altgr	control	keycode	35 =	BackSpace
+		keycode	36 =	+j	+J		+0xDE	+0xBE
+	control	keycode	36 =	Linefeed
+altgr	control	keycode	36 =	Linefeed
+		keycode	37 =	+k	+K		+0xDB	+0xBB
+	control	keycode	37 =	Control_k
+altgr	control	keycode	37 =	Control_k
+		keycode	38 =	+l	+L		+0xD4	+0xB4
+	control	keycode	38 =	Control_l
+altgr	control	keycode	38 =	Control_l
+		keycode	39 =	semicolon colon		+0xD6	+0xB6
+	alt	keycode	39 =	Meta_semicolon
+		keycode	40 =	apostrophe quotedbl	+0xED	+0xCD
+	control	keycode	40 =	Control_g
+altgr	control	keycode	40 =	Control_g
+	alt	keycode	40 =	Meta_apostrophe
+		keycode	41 =	grave	asciitilde	+0xF1	+0xA1
+	control	keycode	41 =	nul	
+	alt	keycode	41 =	Meta_grave
+		keycode	42 =	Shift	
+		keycode	43 =	backslash bar		slash bar	
+	control	keycode	43 =	Control_backslash
+	alt	keycode	43 =	Meta_backslash
+		keycode	44 =	+z	+Z		+0xEF	+0xCF
+	control	keycode	44 =	Control_z
+altgr	control	keycode	44 =	Control_z
+		keycode	45 =	+x	+X		+0xE7	+0xC7
+	control	keycode	45 =	Control_x
+altgr	control	keycode	45 =	Control_x
+		keycode	46 =	+c	+C		+0xE1	+0xC1
+	control	keycode	46 =	Control_c
+altgr	control	keycode	46 =	Control_c
+		keycode	47 =	+v	+V		+0xDC	+0xBC
+	control	keycode	47 =	Control_v
+altgr	control	keycode	47 =	Control_v
+		keycode	48 =	+b	+B		+0xD8	+0xB8
+	control	keycode	48 =	Control_b
+altgr	control	keycode	48 =	Control_b
+		keycode	49 =	+n	+N		+0xE2	+0xC2
+	control	keycode	49 =	Control_n
+altgr	control	keycode	49 =	Control_n
+		keycode	50 =	+m	+M		+0xEC	+0xCC
+	control	keycode	50 =	Control_m
+altgr	control	keycode	50 =	Control_m
+		keycode	51 =	comma	less		+0xD1	+0xB1
+	alt	keycode	51 =	Meta_comma
+		keycode	52 =	period	greater		+0xEE	+0xCE
+	alt	keycode	52 =	Meta_period
+		keycode	53 =	slash	question	period	comma
+	control	keycode	53 =	Delete	
+	alt	keycode	53 =	Meta_slash
+		keycode	54 =	Shift
+		keycode	55 =	KP_Multiply
+		keycode	56 =	Alt	
+		keycode	57 =	space	space		space	space	
+	control	keycode	57 =	nul	
+	alt	keycode	57 =	Meta_space
+		keycode	58 =	Caps_Lock
+#
+# Virtual Consoles
+#
+		keycode	59 =	F1	F11	F1	F11
+    control	keycode	59 =	F1	
+	alt	keycode	59 =	Console_1
+altgr	alt	keycode	59 =	Console_1
+		keycode	60 =	F2	F12	F2	F12
+    control	keycode	60 =	F2	
+	alt	keycode	60 =	Console_2
+altgr	alt	keycode	60 =	Console_2
+		keycode	61 =	F3	F13	F3	F13
+    control	keycode	61 =	F3	
+	alt	keycode	61 =	Console_3
+altgr	alt	keycode	61 =	Console_3
+		keycode	62 =	F4	F14	F4	F14
+    control	keycode	62 =	F4	
+	alt	keycode	62 =	Console_4
+altgr	alt	keycode	62 =	Console_4
+		keycode	63 =	F5	F15	F5	F15
+    control	keycode	63 =	F5	
+	alt	keycode	63 =	Console_5
+altgr	alt	keycode	63 =	Console_5
+		keycode	64 =	F6	F16	F6	F16
+    control	keycode	64 =	F6	
+	alt	keycode	64 =	Console_6
+altgr	alt	keycode	64 =	Console_6
+		keycode	65 =	F7	F17	F7	F17
+    control	keycode	65 =	F7	
+	alt	keycode	65 =	Console_7
+altgr	alt	keycode	65 =	Console_7
+		keycode	66 =	F8	F18	F8	F18
+    control	keycode	66 =	F8	
+	alt	keycode	66 =	Console_8
+altgr	alt	keycode	66 =	Console_8
+		keycode	67 =	F9	F19	F9	F19
+    control	keycode	67 =	F9	
+	alt	keycode	67 =	Console_9
+altgr	alt	keycode	67 =	Console_9
+		keycode	68 =	F10	F20	F10	F20
+    control	keycode	68 =	F10	
+	alt	keycode	68 =	Console_10
+altgr	alt	keycode	68 =	Console_10
+
+		keycode	69 =	Num_Lock	
+		keycode	70 =	Scroll_Lock	Show_Memory	Show_Registers
+	control	keycode	70 =	Show_State
+	alt	keycode	70 =	Scroll_Lock
+		keycode	71 =	KP_7	
+	alt	keycode	71 =	Ascii_7	
+		keycode	72 =	KP_8	
+	alt	keycode	72 =	Ascii_8	
+		keycode	73 =	KP_9	
+	alt	keycode	73 =	Ascii_9	
+		keycode	74 =	KP_Subtract
+		keycode	75 =	KP_4	
+	alt	keycode	75 =	Ascii_4	
+		keycode	76 =	KP_5	
+	alt	keycode	76 =	Ascii_5	
+		keycode	77 =	KP_6	
+	alt	keycode	77 =	Ascii_6	
+		keycode	78 =	KP_Add	
+		keycode	79 =	KP_1	
+	alt	keycode	79 =	Ascii_1	
+		keycode	80 =	KP_2	
+	alt	keycode	80 =	Ascii_2	
+		keycode	81 =	KP_3	
+	alt	keycode	81 =	Ascii_3	
+		keycode	82 =	KP_0	
+	alt	keycode	82 =	Ascii_0	
+		keycode	83 =	KP_Period
+altgr	control	keycode	83 =	Boot	
+control	alt	keycode	83 =	Boot	
+		keycode	84 =	Last_Console
+		keycode	85 =
+		keycode	86 =	less	greater	bar	
+	alt	keycode	86 =	Meta_less
+		keycode	87 =	F11	F11	F11	F11
+	control	keycode	87 =	F11	
+	alt	keycode	87 =	Console_11
+altgr	alt	keycode	87 =	Console_11
+		keycode	88 =	F12	F12	F12	F12
+	control	keycode	88 =	F12	
+	alt	keycode	88 =	Console_12
+altgr	alt	keycode	88 =	Console_12
+		keycode	89 =
+		keycode	90 =
+		keycode	91 =
+		keycode	92 =
+		keycode	93 =
+		keycode	94 =
+		keycode	95 =
+		keycode	96 =	KP_Enter	
+		keycode	97 =
+		keycode	98 =	KP_Divide
+		keycode	99 =	Control_backslash
+	control	keycode	99 =	Control_backslash
+	alt	keycode	99 =	Control_backslash
+		keycode	100 =	AltGr_Lock	
+		keycode	101 =	Break	
+		keycode	102 =	Find	
+		keycode	103 =	Up	
+		keycode	104 =	Prior	
+	shift	keycode	104 =	Scroll_Backward
+		keycode	105 =	Left	
+        alt     keycode 105 =	Decr_Console
+		keycode 106 =	Right
+        alt     keycode 106 =	Incr_Console
+		keycode	107 =	Select	
+		keycode	108 =	Down	
+		keycode	109 =	Next	
+	shift	keycode	109 =	Scroll_Forward
+		keycode	110 =	Insert	
+		keycode	111 =	Remove	
+altgr	control	keycode	111 =	Boot	
+control	alt	keycode	111 =	Boot	
+		keycode	112 =
+		keycode	113 =
+		keycode	114 =
+		keycode	115 =
+		keycode	116 =
+		keycode	117 =
+		keycode	118 =
+		keycode	119 =
+		keycode	120 =
+		keycode	121 =
+		keycode	122 =
+		keycode	123 =
+		keycode	124 =
+		keycode	125 =
+		keycode	126 =
+		keycode	127 =
Index: 2.4.0/keymaps/i386/qwerty/ru-rAlt-koi8r.map
===================================================================
--- 2.4.0/keymaps/i386/qwerty/ru-rAlt-koi8r.map	(nonexistent)
+++ 2.4.0/keymaps/i386/qwerty/ru-rAlt-koi8r.map	(revision 5)
@@ -0,0 +1,300 @@
+#
+# ru-rAlt-koi8r.map
+# 
+# Russian KeyMap.
+# "Cyrillic" mode is toggled by Right_Alt key and shifted by AltGr key.
+#
+# charset=KOI8-R.
+#
+# Andrew V.Kosteltsev <kosteltsev@gmail.com>
+#
+#
+keymaps 0-4,6,8,10,12
+strings as usual
+
+		keycode	1 =	Escape	Escape		Escape	Escape
+	alt	keycode	1 =	Meta_Escape
+		keycode	2 =	one	exclam		one	exclam
+	alt	keycode	2 =	Meta_one	
+		keycode	3 =	two	at		two	quotedbl
+	control	keycode	3 =	nul	
+	alt	keycode	3 =	Meta_two	
+		keycode	4 =	three	numbersign	three	numbersign
+	control	keycode	4 =	Escape
+	alt	keycode	4 =	Meta_three
+		keycode	5 =	four	dollar		four	semicolon	
+	control	keycode	5 =	Control_backslash
+	alt	keycode	5 =	Meta_four
+		keycode	6 =	five	percent		five	percent
+	control	keycode	6 =	Control_bracketright
+	alt	keycode	6 =	Meta_five
+		keycode	7 =	six	asciicircum	six	colon
+	control	keycode	7 =	Control_asciicircum
+	alt	keycode	7 =	Meta_six	
+		keycode	8 =	seven	ampersand	seven	question
+	control	keycode	8 =	Control_underscore
+	alt	keycode	8 =	Meta_seven
+		keycode	9 =	eight	asterisk	eight	asterisk
+	control	keycode	9 =	Delete	
+	alt	keycode	9 =	Meta_eight
+		keycode	10 =	nine	parenleft	nine	parenleft
+	alt	keycode	10 =	Meta_nine
+		keycode	11 =	zero	parenright	zero	parenright
+	alt	keycode	11 =	Meta_zero
+		keycode	12 =	minus	underscore	minus	underscore
+	control	keycode	12 =	Control_underscore
+	alt	keycode	12 =	Meta_minus
+		keycode	13 =	equal	plus		equal	plus
+	alt	keycode	13 =	Meta_equal
+		keycode	14 =	BackSpace BackSpace	BackSpace BackSpace
+	alt	keycode	14 =	Meta_Delete
+		keycode	15 =	Tab	Tab		Tab	Tab	
+	alt	keycode	15 =	Meta_Tab	
+		keycode	16 =	+q	+Q		+202	+234
+	control	keycode	16 =	Control_q
+altgr	control	keycode	16 =	Control_q
+		keycode	17 =	+w	+W		+195	+227
+	control	keycode	17 =	Control_w
+altgr	control	keycode	17 =	Control_w
+		keycode	18 =	+e	+E		+213	+245
+	control	keycode	18 =	Control_e
+altgr	control	keycode	18 =	Control_e
+		keycode	19 =	+r	+R		+203	+235
+	control	keycode	19 =	Control_r
+altgr	control	keycode	19 =	Control_r
+		keycode	20 =	+t	+T		+197	+229
+	control	keycode	20 =	Control_t
+altgr	control	keycode	20 =	Control_t
+		keycode	21 =	+y	+Y		+206	+238
+	control	keycode	21 =	Control_y
+altgr	control	keycode	21 =	Control_y
+		keycode	22 =	+u	+U		+199	+231
+	control	keycode	22 =	Control_u
+altgr	control	keycode	22 =	Control_u
+		keycode	23 =	+i	+I		+219	+251
+	control	keycode	23 =	Tab
+altgr	control	keycode	23 =	Tab
+		keycode	24 =	+o	+O		+221	+253
+	control	keycode	24 =	Control_o
+altgr	control	keycode	24 =	Control_o
+		keycode	25 =	+p	+P		+218	+250
+	control	keycode	25 =	Control_p
+altgr	control	keycode	25 =	Control_p
+		keycode	26 =	bracketleft braceleft	+200	+232
+	control	keycode	26 =	Escape	
+altgr	control	keycode	26 =	Escape	
+	alt	keycode	26 =	Meta_bracketleft
+		keycode	27 =	bracketright braceright	+223	+255
+	control	keycode	27 =	Control_bracketright
+altgr	control	keycode	27 =	Control_bracketright
+	alt	keycode	27 =	Meta_bracketright
+		keycode	28 =	Return	
+	alt	keycode	28 =	Meta_Control_m	
+		keycode	29 =	Control	
+		keycode	30 =	+a	+A		+198	+230
+	control	keycode	30 =	Control_a
+altgr	control	keycode	30 =	Control_a
+		keycode	31 =	+s	+S		+217	+249
+	control	keycode	31 =	Control_s
+altgr	control	keycode	31 =	Control_s
+		keycode	32 =	+d	+D		+215	+247
+	control	keycode	32 =	Control_d
+altgr	control	keycode	32 =	Control_d
+		keycode	33 =	+f	+F		+193	+225
+	control	keycode	33 =	Control_f
+altgr	control	keycode	33 =	Control_f
+		keycode	34 =	+g	+G		+208	+240
+	control	keycode	34 =	Control_g
+altgr	control	keycode	34 =	Control_g
+		keycode	35 =	+h	+H		+210	+242
+	control	keycode	35 =	BackSpace
+altgr	control	keycode	35 =	BackSpace
+		keycode	36 =	+j	+J		+207	+239
+	control	keycode	36 =	Linefeed
+altgr	control	keycode	36 =	Linefeed
+		keycode	37 =	+k	+K		+204	+236
+	control	keycode	37 =	Control_k
+altgr	control	keycode	37 =	Control_k
+		keycode	38 =	+l	+L		+196	+228
+	control	keycode	38 =	Control_l
+altgr	control	keycode	38 =	Control_l
+		keycode	39 =	semicolon colon		+214	+246
+	alt	keycode	39 =	Meta_semicolon
+		keycode	40 =	apostrophe quotedbl	+220	+252
+	control	keycode	40 =	Control_g
+altgr	control	keycode	40 =	Control_g
+	alt	keycode	40 =	Meta_apostrophe
+		keycode	41 =	grave	asciitilde	+163	+179
+	control	keycode	41 =	nul	
+	alt	keycode	41 =	Meta_grave
+		keycode	42 =	Shift	
+		keycode	43 =	backslash bar		slash bar	
+	control	keycode	43 =	Control_backslash
+	alt	keycode	43 =	Meta_backslash
+		keycode	44 =	+z	+Z		+209	+241
+	control	keycode	44 =	Control_z
+altgr	control	keycode	44 =	Control_z
+		keycode	45 =	+x	+X		+222	+254
+	control	keycode	45 =	Control_x
+altgr	control	keycode	45 =	Control_x
+		keycode	46 =	+c	+C		+211	+243
+	control	keycode	46 =	Control_c
+altgr	control	keycode	46 =	Control_c
+		keycode	47 =	+v	+V		+205	+237
+	control	keycode	47 =	Control_v
+altgr	control	keycode	47 =	Control_v
+		keycode	48 =	+b	+B		+201	+233
+	control	keycode	48 =	Control_b
+altgr	control	keycode	48 =	Control_b
+		keycode	49 =	+n	+N		+212	+244
+	control	keycode	49 =	Control_n
+altgr	control	keycode	49 =	Control_n
+		keycode	50 =	+m	+M		+216	+248
+	control	keycode	50 =	Control_m
+altgr	control	keycode	50 =	Control_m
+		keycode	51 =	comma	less		+194	+226
+	alt	keycode	51 =	Meta_comma
+		keycode	52 =	period	greater		+192	+224
+	alt	keycode	52 =	Meta_period
+		keycode	53 =	slash	question	period	comma
+	control	keycode	53 =	Delete	
+	alt	keycode	53 =	Meta_slash
+		keycode	54 =	Shift
+		keycode	55 =	KP_Multiply
+		keycode	56 =	Alt	
+		keycode	57 =	space	space		space	space	
+	control	keycode	57 =	nul	
+	alt	keycode	57 =	Meta_space
+		keycode	58 =	Caps_Lock
+#
+# Virtual Consoles
+#
+		keycode	59 =	F1	F11	F1	F11
+    control	keycode	59 =	F1	
+	alt	keycode	59 =	Console_1
+altgr	alt	keycode	59 =	Console_1
+		keycode	60 =	F2	F12	F2	F12
+    control	keycode	60 =	F2	
+	alt	keycode	60 =	Console_2
+altgr	alt	keycode	60 =	Console_2
+		keycode	61 =	F3	F13	F3	F13
+    control	keycode	61 =	F3	
+	alt	keycode	61 =	Console_3
+altgr	alt	keycode	61 =	Console_3
+		keycode	62 =	F4	F14	F4	F14
+    control	keycode	62 =	F4	
+	alt	keycode	62 =	Console_4
+altgr	alt	keycode	62 =	Console_4
+		keycode	63 =	F5	F15	F5	F15
+    control	keycode	63 =	F5	
+	alt	keycode	63 =	Console_5
+altgr	alt	keycode	63 =	Console_5
+		keycode	64 =	F6	F16	F6	F16
+    control	keycode	64 =	F6	
+	alt	keycode	64 =	Console_6
+altgr	alt	keycode	64 =	Console_6
+		keycode	65 =	F7	F17	F7	F17
+    control	keycode	65 =	F7	
+	alt	keycode	65 =	Console_7
+altgr	alt	keycode	65 =	Console_7
+		keycode	66 =	F8	F18	F8	F18
+    control	keycode	66 =	F8	
+	alt	keycode	66 =	Console_8
+altgr	alt	keycode	66 =	Console_8
+		keycode	67 =	F9	F19	F9	F19
+    control	keycode	67 =	F9	
+	alt	keycode	67 =	Console_9
+altgr	alt	keycode	67 =	Console_9
+		keycode	68 =	F10	F20	F10	F20
+    control	keycode	68 =	F10	
+	alt	keycode	68 =	Console_10
+altgr	alt	keycode	68 =	Console_10
+
+		keycode	69 =	Num_Lock	
+		keycode	70 =	Scroll_Lock	Show_Memory	Show_Registers
+	control	keycode	70 =	Show_State
+	alt	keycode	70 =	Scroll_Lock
+		keycode	71 =	KP_7	
+	alt	keycode	71 =	Ascii_7	
+		keycode	72 =	KP_8	
+	alt	keycode	72 =	Ascii_8	
+		keycode	73 =	KP_9	
+	alt	keycode	73 =	Ascii_9	
+		keycode	74 =	KP_Subtract
+		keycode	75 =	KP_4	
+	alt	keycode	75 =	Ascii_4	
+		keycode	76 =	KP_5	
+	alt	keycode	76 =	Ascii_5	
+		keycode	77 =	KP_6	
+	alt	keycode	77 =	Ascii_6	
+		keycode	78 =	KP_Add	
+		keycode	79 =	KP_1	
+	alt	keycode	79 =	Ascii_1	
+		keycode	80 =	KP_2	
+	alt	keycode	80 =	Ascii_2	
+		keycode	81 =	KP_3	
+	alt	keycode	81 =	Ascii_3	
+		keycode	82 =	KP_0	
+	alt	keycode	82 =	Ascii_0	
+		keycode	83 =	KP_Period
+altgr	control	keycode	83 =	Boot	
+control	alt	keycode	83 =	Boot	
+		keycode	84 =	Last_Console
+		keycode	85 =
+		keycode	86 =	less	greater	bar	
+	alt	keycode	86 =	Meta_less
+		keycode	87 =	F11	F11	F11	F11
+	control	keycode	87 =	F11	
+	alt	keycode	87 =	Console_11
+altgr	alt	keycode	87 =	Console_11
+		keycode	88 =	F12	F12	F12	F12
+	control	keycode	88 =	F12	
+	alt	keycode	88 =	Console_12
+altgr	alt	keycode	88 =	Console_12
+		keycode	89 =
+		keycode	90 =
+		keycode	91 =
+		keycode	92 =
+		keycode	93 =
+		keycode	94 =
+		keycode	95 =
+		keycode	96 =	KP_Enter	
+		keycode	97 =
+		keycode	98 =	KP_Divide
+		keycode	99 =	Control_backslash
+	control	keycode	99 =	Control_backslash
+	alt	keycode	99 =	Control_backslash
+		keycode	100 =	AltGr_Lock
+		keycode	101 =	Break	
+		keycode	102 =	Find	
+		keycode	103 =	Up	
+		keycode	104 =	Prior	
+	shift	keycode	104 =	Scroll_Backward
+		keycode	105 =	Left	
+        alt     keycode 105 =	Decr_Console
+		keycode 106 =	Right
+        alt     keycode 106 =	Incr_Console
+		keycode	107 =	Select	
+		keycode	108 =	Down	
+		keycode	109 =	Next	
+	shift	keycode	109 =	Scroll_Forward
+		keycode	110 =	Insert	
+		keycode	111 =	Remove	
+altgr	control	keycode	111 =	Boot	
+control	alt	keycode	111 =	Boot	
+		keycode	112 =
+		keycode	113 =
+		keycode	114 =
+		keycode	115 =
+		keycode	116 =
+		keycode	117 =
+		keycode	118 =
+		keycode	119 =
+		keycode	120 =
+		keycode	121 =
+		keycode	122 =
+		keycode	123 =
+		keycode	124 =
+		keycode	125 =
+		keycode	126 =
+		keycode	127 =
Index: 2.4.0/keymaps/i386/qwerty/ru-rAlt-utf8.map
===================================================================
--- 2.4.0/keymaps/i386/qwerty/ru-rAlt-utf8.map	(nonexistent)
+++ 2.4.0/keymaps/i386/qwerty/ru-rAlt-utf8.map	(revision 5)
@@ -0,0 +1,300 @@
+#
+# ru-rAlt-utf8.map
+#
+# Russian KeyMap.
+# "Cyrillic" mode is toggled by Right_Alt key and shifted by AltGr key.
+#
+# charset=UTF-8.
+#
+# Andrew V.Kosteltsev <kosteltsev@gmail.com>
+#
+#
+keymaps 0-4,6,8,10,12
+strings as usual
+
+		keycode	1 =	Escape	Escape		Escape	Escape
+	alt	keycode	1 =	Meta_Escape
+		keycode	2 =	one	exclam		one	exclam
+	alt	keycode	2 =	Meta_one	
+		keycode	3 =	two	at		two	quotedbl
+	control	keycode	3 =	nul	
+	alt	keycode	3 =	Meta_two	
+		keycode	4 =	three	numbersign	three	U+2116
+	control	keycode	4 =	Escape
+	alt	keycode	4 =	Meta_three
+		keycode	5 =	four	dollar		four	semicolon	
+	control	keycode	5 =	Control_backslash
+	alt	keycode	5 =	Meta_four
+		keycode	6 =	five	percent		five	percent
+	control	keycode	6 =	Control_bracketright
+	alt	keycode	6 =	Meta_five
+		keycode	7 =	six	asciicircum	six	colon
+	control	keycode	7 =	Control_asciicircum
+	alt	keycode	7 =	Meta_six	
+		keycode	8 =	seven	ampersand	seven	question
+	control	keycode	8 =	Control_underscore
+	alt	keycode	8 =	Meta_seven
+		keycode	9 =	eight	asterisk	eight	asterisk
+	control	keycode	9 =	Delete	
+	alt	keycode	9 =	Meta_eight
+		keycode	10 =	nine	parenleft	nine	parenleft
+	alt	keycode	10 =	Meta_nine
+		keycode	11 =	zero	parenright	zero	parenright
+	alt	keycode	11 =	Meta_zero
+		keycode	12 =	minus	underscore	minus	underscore
+	control	keycode	12 =	Control_underscore
+	alt	keycode	12 =	Meta_minus
+		keycode	13 =	equal	plus		equal	plus
+	alt	keycode	13 =	Meta_equal
+		keycode	14 =	BackSpace BackSpace	BackSpace BackSpace
+	alt	keycode	14 =	Meta_Delete
+		keycode	15 =	Tab	Tab		Tab	Tab	
+	alt	keycode	15 =	Meta_Tab	
+		keycode	16 =	+q	+Q		U+0439	U+0419
+	control	keycode	16 =	Control_q
+altgr	control	keycode	16 =	Control_q
+		keycode	17 =	+w	+W		U+0446	U+0426
+	control	keycode	17 =	Control_w
+altgr	control	keycode	17 =	Control_w
+		keycode	18 =	+e	+E		U+0443	U+0423
+	control	keycode	18 =	Control_e
+altgr	control	keycode	18 =	Control_e
+		keycode	19 =	+r	+R		U+043a	U+041a
+	control	keycode	19 =	Control_r
+altgr	control	keycode	19 =	Control_r
+		keycode	20 =	+t	+T		U+0435	U+0415
+	control	keycode	20 =	Control_t
+altgr	control	keycode	20 =	Control_t
+		keycode	21 =	+y	+Y		U+043d	U+041d
+	control	keycode	21 =	Control_y
+altgr	control	keycode	21 =	Control_y
+		keycode	22 =	+u	+U		U+0433	U+0413
+	control	keycode	22 =	Control_u
+altgr	control	keycode	22 =	Control_u
+		keycode	23 =	+i	+I		U+0448	U+0428
+	control	keycode	23 =	Tab
+altgr	control	keycode	23 =	Tab
+		keycode	24 =	+o	+O		U+0449	U+0429
+	control	keycode	24 =	Control_o
+altgr	control	keycode	24 =	Control_o
+		keycode	25 =	+p	+P		U+0437	U+0417
+	control	keycode	25 =	Control_p
+altgr	control	keycode	25 =	Control_p
+		keycode	26 =	bracketleft braceleft	U+0445	U+0425
+	control	keycode	26 =	Escape	
+altgr	control	keycode	26 =	Escape	
+	alt	keycode	26 =	Meta_bracketleft
+		keycode	27 =	bracketright braceright	U+044a	U+042a
+	control	keycode	27 =	Control_bracketright
+altgr	control	keycode	27 =	Control_bracketright
+	alt	keycode	27 =	Meta_bracketright
+		keycode	28 =	Return	
+	alt	keycode	28 =	Meta_Control_m	
+		keycode	29 =	Control	
+		keycode	30 =	+a	+A		U+0444	U+0424
+	control	keycode	30 =	Control_a
+altgr	control	keycode	30 =	Control_a
+		keycode	31 =	+s	+S		U+044b	U+042b
+	control	keycode	31 =	Control_s
+altgr	control	keycode	31 =	Control_s
+		keycode	32 =	+d	+D		U+0432	U+0412
+	control	keycode	32 =	Control_d
+altgr	control	keycode	32 =	Control_d
+		keycode	33 =	+f	+F		U+0430	U+0410
+	control	keycode	33 =	Control_f
+altgr	control	keycode	33 =	Control_f
+		keycode	34 =	+g	+G		U+043f	U+041f
+	control	keycode	34 =	Control_g
+altgr	control	keycode	34 =	Control_g
+		keycode	35 =	+h	+H		U+0440	U+0420
+	control	keycode	35 =	BackSpace
+altgr	control	keycode	35 =	BackSpace
+		keycode	36 =	+j	+J		U+043e	U+041e
+	control	keycode	36 =	Linefeed
+altgr	control	keycode	36 =	Linefeed
+		keycode	37 =	+k	+K		U+043b	U+041b
+	control	keycode	37 =	Control_k
+altgr	control	keycode	37 =	Control_k
+		keycode	38 =	+l	+L		U+0434	U+0414
+	control	keycode	38 =	Control_l
+altgr	control	keycode	38 =	Control_l
+		keycode	39 =	semicolon colon		U+0436	U+0416
+	alt	keycode	39 =	Meta_semicolon
+		keycode	40 =	apostrophe quotedbl	U+044d	U+042d
+	control	keycode	40 =	Control_g
+altgr	control	keycode	40 =	Control_g
+	alt	keycode	40 =	Meta_apostrophe
+		keycode	41 =	grave	asciitilde	U+0451	U+0401
+	control	keycode	41 =	nul	
+	alt	keycode	41 =	Meta_grave
+		keycode	42 =	Shift	
+		keycode	43 =	backslash bar		slash bar	
+	control	keycode	43 =	Control_backslash
+	alt	keycode	43 =	Meta_backslash
+		keycode	44 =	+z	+Z		U+044f	U+042f
+	control	keycode	44 =	Control_z
+altgr	control	keycode	44 =	Control_z
+		keycode	45 =	+x	+X		U+0447	U+0427
+	control	keycode	45 =	Control_x
+altgr	control	keycode	45 =	Control_x
+		keycode	46 =	+c	+C		U+0441	U+0421
+	control	keycode	46 =	Control_c
+altgr	control	keycode	46 =	Control_c
+		keycode	47 =	+v	+V		U+043c	U+041c
+	control	keycode	47 =	Control_v
+altgr	control	keycode	47 =	Control_v
+		keycode	48 =	+b	+B		U+0438	U+0418
+	control	keycode	48 =	Control_b
+altgr	control	keycode	48 =	Control_b
+		keycode	49 =	+n	+N		U+0442	U+0422
+	control	keycode	49 =	Control_n
+altgr	control	keycode	49 =	Control_n
+		keycode	50 =	+m	+M		U+044c	U+042c
+	control	keycode	50 =	Control_m
+altgr	control	keycode	50 =	Control_m
+		keycode	51 =	comma	less		U+0431	U+0411
+	alt	keycode	51 =	Meta_comma
+		keycode	52 =	period	greater		U+044e	U+042e
+	alt	keycode	52 =	Meta_period
+		keycode	53 =	slash	question	period	comma
+	control	keycode	53 =	Delete	
+	alt	keycode	53 =	Meta_slash
+		keycode	54 =	Shift
+		keycode	55 =	KP_Multiply
+		keycode	56 =	Alt	
+		keycode	57 =	space	space		space	space	
+	control	keycode	57 =	nul	
+	alt	keycode	57 =	Meta_space
+		keycode	58 =	Caps_Lock
+#
+# Virtual Consoles
+#
+		keycode	59 =	F1	F11	F1	F11
+    control	keycode	59 =	F1	
+	alt	keycode	59 =	Console_1
+altgr	alt	keycode	59 =	Console_1
+		keycode	60 =	F2	F12	F2	F12
+    control	keycode	60 =	F2	
+	alt	keycode	60 =	Console_2
+altgr	alt	keycode	60 =	Console_2
+		keycode	61 =	F3	F13	F3	F13
+    control	keycode	61 =	F3	
+	alt	keycode	61 =	Console_3
+altgr	alt	keycode	61 =	Console_3
+		keycode	62 =	F4	F14	F4	F14
+    control	keycode	62 =	F4	
+	alt	keycode	62 =	Console_4
+altgr	alt	keycode	62 =	Console_4
+		keycode	63 =	F5	F15	F5	F15
+    control	keycode	63 =	F5	
+	alt	keycode	63 =	Console_5
+altgr	alt	keycode	63 =	Console_5
+		keycode	64 =	F6	F16	F6	F16
+    control	keycode	64 =	F6	
+	alt	keycode	64 =	Console_6
+altgr	alt	keycode	64 =	Console_6
+		keycode	65 =	F7	F17	F7	F17
+    control	keycode	65 =	F7	
+	alt	keycode	65 =	Console_7
+altgr	alt	keycode	65 =	Console_7
+		keycode	66 =	F8	F18	F8	F18
+    control	keycode	66 =	F8	
+	alt	keycode	66 =	Console_8
+altgr	alt	keycode	66 =	Console_8
+		keycode	67 =	F9	F19	F9	F19
+    control	keycode	67 =	F9	
+	alt	keycode	67 =	Console_9
+altgr	alt	keycode	67 =	Console_9
+		keycode	68 =	F10	F20	F10	F20
+    control	keycode	68 =	F10	
+	alt	keycode	68 =	Console_10
+altgr	alt	keycode	68 =	Console_10
+
+		keycode	69 =	Num_Lock	
+		keycode	70 =	Scroll_Lock	Show_Memory	Show_Registers
+	control	keycode	70 =	Show_State
+	alt	keycode	70 =	Scroll_Lock
+		keycode	71 =	KP_7	
+	alt	keycode	71 =	Ascii_7	
+		keycode	72 =	KP_8	
+	alt	keycode	72 =	Ascii_8	
+		keycode	73 =	KP_9	
+	alt	keycode	73 =	Ascii_9	
+		keycode	74 =	KP_Subtract
+		keycode	75 =	KP_4	
+	alt	keycode	75 =	Ascii_4	
+		keycode	76 =	KP_5	
+	alt	keycode	76 =	Ascii_5	
+		keycode	77 =	KP_6	
+	alt	keycode	77 =	Ascii_6	
+		keycode	78 =	KP_Add	
+		keycode	79 =	KP_1	
+	alt	keycode	79 =	Ascii_1	
+		keycode	80 =	KP_2	
+	alt	keycode	80 =	Ascii_2	
+		keycode	81 =	KP_3	
+	alt	keycode	81 =	Ascii_3	
+		keycode	82 =	KP_0	
+	alt	keycode	82 =	Ascii_0	
+		keycode	83 =	KP_Period
+altgr	control	keycode	83 =	Boot	
+control	alt	keycode	83 =	Boot	
+		keycode	84 =	Last_Console
+		keycode	85 =
+		keycode	86 =	less	greater	bar	
+	alt	keycode	86 =	Meta_less
+		keycode	87 =	F11	F11	F11	F11
+	control	keycode	87 =	F11	
+	alt	keycode	87 =	Console_11
+altgr	alt	keycode	87 =	Console_11
+		keycode	88 =	F12	F12	F12	F12
+	control	keycode	88 =	F12	
+	alt	keycode	88 =	Console_12
+altgr	alt	keycode	88 =	Console_12
+		keycode	89 =
+		keycode	90 =
+		keycode	91 =
+		keycode	92 =
+		keycode	93 =
+		keycode	94 =
+		keycode	95 =
+		keycode	96 =	KP_Enter	
+		keycode	97 =
+		keycode	98 =	KP_Divide
+		keycode	99 =	Control_backslash
+	control	keycode	99 =	Control_backslash
+	alt	keycode	99 =	Control_backslash
+		keycode	100 =	AltGr_Lock
+		keycode	101 =	Break	
+		keycode	102 =	Find	
+		keycode	103 =	Up	
+		keycode	104 =	Prior	
+	shift	keycode	104 =	Scroll_Backward
+		keycode	105 =	Left	
+        alt     keycode 105 =	Decr_Console
+		keycode 106 =	Right
+        alt     keycode 106 =	Incr_Console
+		keycode	107 =	Select	
+		keycode	108 =	Down	
+		keycode	109 =	Next	
+	shift	keycode	109 =	Scroll_Forward
+		keycode	110 =	Insert	
+		keycode	111 =	Remove	
+altgr	control	keycode	111 =	Boot	
+control	alt	keycode	111 =	Boot	
+		keycode	112 =
+		keycode	113 =
+		keycode	114 =
+		keycode	115 =
+		keycode	116 =
+		keycode	117 =
+		keycode	118 =
+		keycode	119 =
+		keycode	120 =
+		keycode	121 =
+		keycode	122 =
+		keycode	123 =
+		keycode	124 =
+		keycode	125 =
+		keycode	126 =
+		keycode	127 =
Index: 2.4.0/keymaps/i386/qwerty/ru-rCtrl-cp1251.map
===================================================================
--- 2.4.0/keymaps/i386/qwerty/ru-rCtrl-cp1251.map	(nonexistent)
+++ 2.4.0/keymaps/i386/qwerty/ru-rCtrl-cp1251.map	(revision 5)
@@ -0,0 +1,300 @@
+#
+# ru-rCtrl-cp1251.map
+#
+# Russian KeyMap.
+# "Cyrillic" mode is toggled by Right_Ctrl key and shifted by AltGr key.
+#
+# charset=windows-1251.
+#
+# Andrew V.Kosteltsev <kosteltsev@gmail.com>
+#
+#
+keymaps 0-4,6,8,10,12
+strings as usual
+
+		keycode	1 =	Escape	Escape		Escape	Escape
+	alt	keycode	1 =	Meta_Escape
+		keycode	2 =	one	exclam		one	exclam
+	alt	keycode	2 =	Meta_one	
+		keycode	3 =	two	at		two	quotedbl
+	control	keycode	3 =	nul	
+	alt	keycode	3 =	Meta_two	
+		keycode	4 =	three	numbersign	three	+0xB9
+	control	keycode	4 =	Escape
+	alt	keycode	4 =	Meta_three
+		keycode	5 =	four	dollar		four	semicolon	
+	control	keycode	5 =	Control_backslash
+	alt	keycode	5 =	Meta_four
+		keycode	6 =	five	percent		five	percent
+	control	keycode	6 =	Control_bracketright
+	alt	keycode	6 =	Meta_five
+		keycode	7 =	six	asciicircum	six	colon
+	control	keycode	7 =	Control_asciicircum
+	alt	keycode	7 =	Meta_six	
+		keycode	8 =	seven	ampersand	seven	question
+	control	keycode	8 =	Control_underscore
+	alt	keycode	8 =	Meta_seven
+		keycode	9 =	eight	asterisk	eight	asterisk
+	control	keycode	9 =	Delete	
+	alt	keycode	9 =	Meta_eight
+		keycode	10 =	nine	parenleft	nine	parenleft
+	alt	keycode	10 =	Meta_nine
+		keycode	11 =	zero	parenright	zero	parenright
+	alt	keycode	11 =	Meta_zero
+		keycode	12 =	minus	underscore	minus	underscore
+	control	keycode	12 =	Control_underscore
+	alt	keycode	12 =	Meta_minus
+		keycode	13 =	equal	plus		equal	plus
+	alt	keycode	13 =	Meta_equal
+		keycode	14 =	BackSpace BackSpace	BackSpace BackSpace
+	alt	keycode	14 =	Meta_Delete
+		keycode	15 =	Tab	Tab		Tab	Tab	
+	alt	keycode	15 =	Meta_Tab	
+		keycode	16 =	+q	+Q		+0xE9	+0xC9
+	control	keycode	16 =	Control_q
+altgr	control	keycode	16 =	Control_q
+		keycode	17 =	+w	+W		+0xF6	+0xD6
+	control	keycode	17 =	Control_w
+altgr	control	keycode	17 =	Control_w
+		keycode	18 =	+e	+E		+0xF3	+0xD3
+	control	keycode	18 =	Control_e
+altgr	control	keycode	18 =	Control_e
+		keycode	19 =	+r	+R		+0xEA	+0xCA
+	control	keycode	19 =	Control_r
+altgr	control	keycode	19 =	Control_r
+		keycode	20 =	+t	+T		+0xE5	+0xC5
+	control	keycode	20 =	Control_t
+altgr	control	keycode	20 =	Control_t
+		keycode	21 =	+y	+Y		+0xED	+0xCD
+	control	keycode	21 =	Control_y
+altgr	control	keycode	21 =	Control_y
+		keycode	22 =	+u	+U		+0xE3	+0xC3
+	control	keycode	22 =	Control_u
+altgr	control	keycode	22 =	Control_u
+		keycode	23 =	+i	+I		+0xF8	+0xD8
+	control	keycode	23 =	Tab
+altgr	control	keycode	23 =	Tab
+		keycode	24 =	+o	+O		+0xF9	+0xD9
+	control	keycode	24 =	Control_o
+altgr	control	keycode	24 =	Control_o
+		keycode	25 =	+p	+P		+0xE7	+0xC7
+	control	keycode	25 =	Control_p
+altgr	control	keycode	25 =	Control_p
+		keycode	26 =	bracketleft braceleft	+0xF5	+0xD5
+	control	keycode	26 =	Escape	
+altgr	control	keycode	26 =	Escape	
+	alt	keycode	26 =	Meta_bracketleft
+		keycode	27 =	bracketright braceright	+0xFA	+0xDA
+	control	keycode	27 =	Control_bracketright
+altgr	control	keycode	27 =	Control_bracketright
+	alt	keycode	27 =	Meta_bracketright
+		keycode	28 =	Return	
+	alt	keycode	28 =	Meta_Control_m	
+		keycode	29 =	Control	
+		keycode	30 =	+a	+A		+0xF4	+0xD4
+	control	keycode	30 =	Control_a
+altgr	control	keycode	30 =	Control_a
+		keycode	31 =	+s	+S		+0xFB	+0xDB
+	control	keycode	31 =	Control_s
+altgr	control	keycode	31 =	Control_s
+		keycode	32 =	+d	+D		+0xE2	+0xC2
+	control	keycode	32 =	Control_d
+altgr	control	keycode	32 =	Control_d
+		keycode	33 =	+f	+F		+0xE0	+0xC0
+	control	keycode	33 =	Control_f
+altgr	control	keycode	33 =	Control_f
+		keycode	34 =	+g	+G		+0xEF	+0xCF
+	control	keycode	34 =	Control_g
+altgr	control	keycode	34 =	Control_g
+		keycode	35 =	+h	+H		+0xF0	+0xD0
+	control	keycode	35 =	BackSpace
+altgr	control	keycode	35 =	BackSpace
+		keycode	36 =	+j	+J		+0xEE	+0xCE
+	control	keycode	36 =	Linefeed
+altgr	control	keycode	36 =	Linefeed
+		keycode	37 =	+k	+K		+0xEB	+0xCB
+	control	keycode	37 =	Control_k
+altgr	control	keycode	37 =	Control_k
+		keycode	38 =	+l	+L		+0xE4	+0xC4
+	control	keycode	38 =	Control_l
+altgr	control	keycode	38 =	Control_l
+		keycode	39 =	semicolon colon		+0xE6	+0xC6
+	alt	keycode	39 =	Meta_semicolon
+		keycode	40 =	apostrophe quotedbl	+0xFD	+0xDD
+	control	keycode	40 =	Control_g
+altgr	control	keycode	40 =	Control_g
+	alt	keycode	40 =	Meta_apostrophe
+		keycode	41 =	grave	asciitilde	+0xB8	+0xA8
+	control	keycode	41 =	nul	
+	alt	keycode	41 =	Meta_grave
+		keycode	42 =	Shift	
+		keycode	43 =	backslash bar		slash bar	
+	control	keycode	43 =	Control_backslash
+	alt	keycode	43 =	Meta_backslash
+		keycode	44 =	+z	+Z		+0xFF	+0xDF
+	control	keycode	44 =	Control_z
+altgr	control	keycode	44 =	Control_z
+		keycode	45 =	+x	+X		+0xF7	+0xD7
+	control	keycode	45 =	Control_x
+altgr	control	keycode	45 =	Control_x
+		keycode	46 =	+c	+C		+0xF1	+0xD1
+	control	keycode	46 =	Control_c
+altgr	control	keycode	46 =	Control_c
+		keycode	47 =	+v	+V		+0xEC	+0xCC
+	control	keycode	47 =	Control_v
+altgr	control	keycode	47 =	Control_v
+		keycode	48 =	+b	+B		+0xE8	+0xC8
+	control	keycode	48 =	Control_b
+altgr	control	keycode	48 =	Control_b
+		keycode	49 =	+n	+N		+0xF2	+0xD2
+	control	keycode	49 =	Control_n
+altgr	control	keycode	49 =	Control_n
+		keycode	50 =	+m	+M		+0xFC	+0xDC
+	control	keycode	50 =	Control_m
+altgr	control	keycode	50 =	Control_m
+		keycode	51 =	comma	less		+0xE1	+0xC1
+	alt	keycode	51 =	Meta_comma
+		keycode	52 =	period	greater		+0xFE	+0xDE
+	alt	keycode	52 =	Meta_period
+		keycode	53 =	slash	question	period	comma
+	control	keycode	53 =	Delete	
+	alt	keycode	53 =	Meta_slash
+		keycode	54 =	Shift
+		keycode	55 =	KP_Multiply
+		keycode	56 =	Alt	
+		keycode	57 =	space	space		space	space	
+	control	keycode	57 =	nul	
+	alt	keycode	57 =	Meta_space
+		keycode	58 =	Caps_Lock
+#
+# Virtual Consoles
+#
+		keycode	59 =	F1	F11	F1	F11
+    control	keycode	59 =	F1	
+	alt	keycode	59 =	Console_1
+altgr	alt	keycode	59 =	Console_1
+		keycode	60 =	F2	F12	F2	F12
+    control	keycode	60 =	F2	
+	alt	keycode	60 =	Console_2
+altgr	alt	keycode	60 =	Console_2
+		keycode	61 =	F3	F13	F3	F13
+    control	keycode	61 =	F3	
+	alt	keycode	61 =	Console_3
+altgr	alt	keycode	61 =	Console_3
+		keycode	62 =	F4	F14	F4	F14
+    control	keycode	62 =	F4	
+	alt	keycode	62 =	Console_4
+altgr	alt	keycode	62 =	Console_4
+		keycode	63 =	F5	F15	F5	F15
+    control	keycode	63 =	F5	
+	alt	keycode	63 =	Console_5
+altgr	alt	keycode	63 =	Console_5
+		keycode	64 =	F6	F16	F6	F16
+    control	keycode	64 =	F6	
+	alt	keycode	64 =	Console_6
+altgr	alt	keycode	64 =	Console_6
+		keycode	65 =	F7	F17	F7	F17
+    control	keycode	65 =	F7	
+	alt	keycode	65 =	Console_7
+altgr	alt	keycode	65 =	Console_7
+		keycode	66 =	F8	F18	F8	F18
+    control	keycode	66 =	F8	
+	alt	keycode	66 =	Console_8
+altgr	alt	keycode	66 =	Console_8
+		keycode	67 =	F9	F19	F9	F19
+    control	keycode	67 =	F9	
+	alt	keycode	67 =	Console_9
+altgr	alt	keycode	67 =	Console_9
+		keycode	68 =	F10	F20	F10	F20
+    control	keycode	68 =	F10	
+	alt	keycode	68 =	Console_10
+altgr	alt	keycode	68 =	Console_10
+
+		keycode	69 =	Num_Lock	
+		keycode	70 =	Scroll_Lock	Show_Memory	Show_Registers
+	control	keycode	70 =	Show_State
+	alt	keycode	70 =	Scroll_Lock
+		keycode	71 =	KP_7	
+	alt	keycode	71 =	Ascii_7	
+		keycode	72 =	KP_8	
+	alt	keycode	72 =	Ascii_8	
+		keycode	73 =	KP_9	
+	alt	keycode	73 =	Ascii_9	
+		keycode	74 =	KP_Subtract
+		keycode	75 =	KP_4	
+	alt	keycode	75 =	Ascii_4	
+		keycode	76 =	KP_5	
+	alt	keycode	76 =	Ascii_5	
+		keycode	77 =	KP_6	
+	alt	keycode	77 =	Ascii_6	
+		keycode	78 =	KP_Add	
+		keycode	79 =	KP_1	
+	alt	keycode	79 =	Ascii_1	
+		keycode	80 =	KP_2	
+	alt	keycode	80 =	Ascii_2	
+		keycode	81 =	KP_3	
+	alt	keycode	81 =	Ascii_3	
+		keycode	82 =	KP_0	
+	alt	keycode	82 =	Ascii_0	
+		keycode	83 =	KP_Period
+altgr	control	keycode	83 =	Boot	
+control	alt	keycode	83 =	Boot	
+		keycode	84 =	Last_Console
+		keycode	85 =
+		keycode	86 =	less	greater	bar	
+	alt	keycode	86 =	Meta_less
+		keycode	87 =	F11	F11	F11	F11
+	control	keycode	87 =	F11	
+	alt	keycode	87 =	Console_11
+altgr	alt	keycode	87 =	Console_11
+		keycode	88 =	F12	F12	F12	F12
+	control	keycode	88 =	F12	
+	alt	keycode	88 =	Console_12
+altgr	alt	keycode	88 =	Console_12
+		keycode	89 =
+		keycode	90 =
+		keycode	91 =
+		keycode	92 =
+		keycode	93 =
+		keycode	94 =
+		keycode	95 =
+		keycode	96 =	KP_Enter	
+		keycode	97 =	AltGr_Lock
+		keycode	98 =	KP_Divide
+		keycode	99 =	Control_backslash
+	control	keycode	99 =	Control_backslash
+	alt	keycode	99 =	Control_backslash
+		keycode	100 =	AltGr	
+		keycode	101 =	Break	
+		keycode	102 =	Find	
+		keycode	103 =	Up	
+		keycode	104 =	Prior	
+	shift	keycode	104 =	Scroll_Backward
+		keycode	105 =	Left	
+        alt     keycode 105 =	Decr_Console
+		keycode 106 =	Right
+        alt     keycode 106 =	Incr_Console
+		keycode	107 =	Select	
+		keycode	108 =	Down	
+		keycode	109 =	Next	
+	shift	keycode	109 =	Scroll_Forward
+		keycode	110 =	Insert	
+		keycode	111 =	Remove	
+altgr	control	keycode	111 =	Boot	
+control	alt	keycode	111 =	Boot	
+		keycode	112 =
+		keycode	113 =
+		keycode	114 =
+		keycode	115 =
+		keycode	116 =
+		keycode	117 =
+		keycode	118 =
+		keycode	119 =
+		keycode	120 =
+		keycode	121 =
+		keycode	122 =
+		keycode	123 =
+		keycode	124 =
+		keycode	125 =
+		keycode	126 =
+		keycode	127 =
Index: 2.4.0/keymaps/i386/qwerty/ru-rCtrl-iso88595.map
===================================================================
--- 2.4.0/keymaps/i386/qwerty/ru-rCtrl-iso88595.map	(nonexistent)
+++ 2.4.0/keymaps/i386/qwerty/ru-rCtrl-iso88595.map	(revision 5)
@@ -0,0 +1,300 @@
+#
+# ru-rCtrl-iso88595.map
+#
+# Russian KeyMap.
+# "Cyrillic" mode is toggled by Right_Ctrl key and shifted by AltGr key.
+#
+# charset=ISO-8859-5.
+#
+# Andrew V.Kosteltsev <kosteltsev@gmail.com>
+#
+#
+keymaps 0-4,6,8,10,12
+strings as usual
+
+		keycode	1 =	Escape	Escape		Escape	Escape
+	alt	keycode	1 =	Meta_Escape
+		keycode	2 =	one	exclam		one	exclam
+	alt	keycode	2 =	Meta_one	
+		keycode	3 =	two	at		two	quotedbl
+	control	keycode	3 =	nul	
+	alt	keycode	3 =	Meta_two	
+		keycode	4 =	three	numbersign	three	+0xF0
+	control	keycode	4 =	Escape
+	alt	keycode	4 =	Meta_three
+		keycode	5 =	four	dollar		four	semicolon	
+	control	keycode	5 =	Control_backslash
+	alt	keycode	5 =	Meta_four
+		keycode	6 =	five	percent		five	percent
+	control	keycode	6 =	Control_bracketright
+	alt	keycode	6 =	Meta_five
+		keycode	7 =	six	asciicircum	six	colon
+	control	keycode	7 =	Control_asciicircum
+	alt	keycode	7 =	Meta_six	
+		keycode	8 =	seven	ampersand	seven	question
+	control	keycode	8 =	Control_underscore
+	alt	keycode	8 =	Meta_seven
+		keycode	9 =	eight	asterisk	eight	asterisk
+	control	keycode	9 =	Delete	
+	alt	keycode	9 =	Meta_eight
+		keycode	10 =	nine	parenleft	nine	parenleft
+	alt	keycode	10 =	Meta_nine
+		keycode	11 =	zero	parenright	zero	parenright
+	alt	keycode	11 =	Meta_zero
+		keycode	12 =	minus	underscore	minus	underscore
+	control	keycode	12 =	Control_underscore
+	alt	keycode	12 =	Meta_minus
+		keycode	13 =	equal	plus		equal	plus
+	alt	keycode	13 =	Meta_equal
+		keycode	14 =	BackSpace BackSpace	BackSpace BackSpace
+	alt	keycode	14 =	Meta_Delete
+		keycode	15 =	Tab	Tab		Tab	Tab	
+	alt	keycode	15 =	Meta_Tab	
+		keycode	16 =	+q	+Q		+0xD9	+0xB9
+	control	keycode	16 =	Control_q
+altgr	control	keycode	16 =	Control_q
+		keycode	17 =	+w	+W		+0xE6	+0xC6
+	control	keycode	17 =	Control_w
+altgr	control	keycode	17 =	Control_w
+		keycode	18 =	+e	+E		+0xE3	+0xC3
+	control	keycode	18 =	Control_e
+altgr	control	keycode	18 =	Control_e
+		keycode	19 =	+r	+R		+0xDA	+0xBA
+	control	keycode	19 =	Control_r
+altgr	control	keycode	19 =	Control_r
+		keycode	20 =	+t	+T		+0xD5	+0xB5
+	control	keycode	20 =	Control_t
+altgr	control	keycode	20 =	Control_t
+		keycode	21 =	+y	+Y		+0xDD	+0xBD
+	control	keycode	21 =	Control_y
+altgr	control	keycode	21 =	Control_y
+		keycode	22 =	+u	+U		+0xD3	+0xB3
+	control	keycode	22 =	Control_u
+altgr	control	keycode	22 =	Control_u
+		keycode	23 =	+i	+I		+0xE8	+0xC8
+	control	keycode	23 =	Tab
+altgr	control	keycode	23 =	Tab
+		keycode	24 =	+o	+O		+0xE9	+0xC9
+	control	keycode	24 =	Control_o
+altgr	control	keycode	24 =	Control_o
+		keycode	25 =	+p	+P		+0xD7	+0xB7
+	control	keycode	25 =	Control_p
+altgr	control	keycode	25 =	Control_p
+		keycode	26 =	bracketleft braceleft	+0xE5	+0xC5
+	control	keycode	26 =	Escape	
+altgr	control	keycode	26 =	Escape	
+	alt	keycode	26 =	Meta_bracketleft
+		keycode	27 =	bracketright braceright	+0xEA	+0xCA
+	control	keycode	27 =	Control_bracketright
+altgr	control	keycode	27 =	Control_bracketright
+	alt	keycode	27 =	Meta_bracketright
+		keycode	28 =	Return	
+	alt	keycode	28 =	Meta_Control_m	
+		keycode	29 =	Control	
+		keycode	30 =	+a	+A		+0xE4	+0xC4
+	control	keycode	30 =	Control_a
+altgr	control	keycode	30 =	Control_a
+		keycode	31 =	+s	+S		+0xEB	+0xCB
+	control	keycode	31 =	Control_s
+altgr	control	keycode	31 =	Control_s
+		keycode	32 =	+d	+D		+0xD2	+0xB2
+	control	keycode	32 =	Control_d
+altgr	control	keycode	32 =	Control_d
+		keycode	33 =	+f	+F		+0xD0	+0xB0
+	control	keycode	33 =	Control_f
+altgr	control	keycode	33 =	Control_f
+		keycode	34 =	+g	+G		+0xDF	+0xBF
+	control	keycode	34 =	Control_g
+altgr	control	keycode	34 =	Control_g
+		keycode	35 =	+h	+H		+0xE0	+0xC0
+	control	keycode	35 =	BackSpace
+altgr	control	keycode	35 =	BackSpace
+		keycode	36 =	+j	+J		+0xDE	+0xBE
+	control	keycode	36 =	Linefeed
+altgr	control	keycode	36 =	Linefeed
+		keycode	37 =	+k	+K		+0xDB	+0xBB
+	control	keycode	37 =	Control_k
+altgr	control	keycode	37 =	Control_k
+		keycode	38 =	+l	+L		+0xD4	+0xB4
+	control	keycode	38 =	Control_l
+altgr	control	keycode	38 =	Control_l
+		keycode	39 =	semicolon colon		+0xD6	+0xB6
+	alt	keycode	39 =	Meta_semicolon
+		keycode	40 =	apostrophe quotedbl	+0xED	+0xCD
+	control	keycode	40 =	Control_g
+altgr	control	keycode	40 =	Control_g
+	alt	keycode	40 =	Meta_apostrophe
+		keycode	41 =	grave	asciitilde	+0xF1	+0xA1
+	control	keycode	41 =	nul	
+	alt	keycode	41 =	Meta_grave
+		keycode	42 =	Shift	
+		keycode	43 =	backslash bar		slash bar	
+	control	keycode	43 =	Control_backslash
+	alt	keycode	43 =	Meta_backslash
+		keycode	44 =	+z	+Z		+0xEF	+0xCF
+	control	keycode	44 =	Control_z
+altgr	control	keycode	44 =	Control_z
+		keycode	45 =	+x	+X		+0xE7	+0xC7
+	control	keycode	45 =	Control_x
+altgr	control	keycode	45 =	Control_x
+		keycode	46 =	+c	+C		+0xE1	+0xC1
+	control	keycode	46 =	Control_c
+altgr	control	keycode	46 =	Control_c
+		keycode	47 =	+v	+V		+0xDC	+0xBC
+	control	keycode	47 =	Control_v
+altgr	control	keycode	47 =	Control_v
+		keycode	48 =	+b	+B		+0xD8	+0xB8
+	control	keycode	48 =	Control_b
+altgr	control	keycode	48 =	Control_b
+		keycode	49 =	+n	+N		+0xE2	+0xC2
+	control	keycode	49 =	Control_n
+altgr	control	keycode	49 =	Control_n
+		keycode	50 =	+m	+M		+0xEC	+0xCC
+	control	keycode	50 =	Control_m
+altgr	control	keycode	50 =	Control_m
+		keycode	51 =	comma	less		+0xD1	+0xB1
+	alt	keycode	51 =	Meta_comma
+		keycode	52 =	period	greater		+0xEE	+0xCE
+	alt	keycode	52 =	Meta_period
+		keycode	53 =	slash	question	period	comma
+	control	keycode	53 =	Delete	
+	alt	keycode	53 =	Meta_slash
+		keycode	54 =	Shift
+		keycode	55 =	KP_Multiply
+		keycode	56 =	Alt	
+		keycode	57 =	space	space		space	space	
+	control	keycode	57 =	nul	
+	alt	keycode	57 =	Meta_space
+		keycode	58 =	Caps_Lock
+#
+# Virtual Consoles
+#
+		keycode	59 =	F1	F11	F1	F11
+    control	keycode	59 =	F1	
+	alt	keycode	59 =	Console_1
+altgr	alt	keycode	59 =	Console_1
+		keycode	60 =	F2	F12	F2	F12
+    control	keycode	60 =	F2	
+	alt	keycode	60 =	Console_2
+altgr	alt	keycode	60 =	Console_2
+		keycode	61 =	F3	F13	F3	F13
+    control	keycode	61 =	F3	
+	alt	keycode	61 =	Console_3
+altgr	alt	keycode	61 =	Console_3
+		keycode	62 =	F4	F14	F4	F14
+    control	keycode	62 =	F4	
+	alt	keycode	62 =	Console_4
+altgr	alt	keycode	62 =	Console_4
+		keycode	63 =	F5	F15	F5	F15
+    control	keycode	63 =	F5	
+	alt	keycode	63 =	Console_5
+altgr	alt	keycode	63 =	Console_5
+		keycode	64 =	F6	F16	F6	F16
+    control	keycode	64 =	F6	
+	alt	keycode	64 =	Console_6
+altgr	alt	keycode	64 =	Console_6
+		keycode	65 =	F7	F17	F7	F17
+    control	keycode	65 =	F7	
+	alt	keycode	65 =	Console_7
+altgr	alt	keycode	65 =	Console_7
+		keycode	66 =	F8	F18	F8	F18
+    control	keycode	66 =	F8	
+	alt	keycode	66 =	Console_8
+altgr	alt	keycode	66 =	Console_8
+		keycode	67 =	F9	F19	F9	F19
+    control	keycode	67 =	F9	
+	alt	keycode	67 =	Console_9
+altgr	alt	keycode	67 =	Console_9
+		keycode	68 =	F10	F20	F10	F20
+    control	keycode	68 =	F10	
+	alt	keycode	68 =	Console_10
+altgr	alt	keycode	68 =	Console_10
+
+		keycode	69 =	Num_Lock	
+		keycode	70 =	Scroll_Lock	Show_Memory	Show_Registers
+	control	keycode	70 =	Show_State
+	alt	keycode	70 =	Scroll_Lock
+		keycode	71 =	KP_7	
+	alt	keycode	71 =	Ascii_7	
+		keycode	72 =	KP_8	
+	alt	keycode	72 =	Ascii_8	
+		keycode	73 =	KP_9	
+	alt	keycode	73 =	Ascii_9	
+		keycode	74 =	KP_Subtract
+		keycode	75 =	KP_4	
+	alt	keycode	75 =	Ascii_4	
+		keycode	76 =	KP_5	
+	alt	keycode	76 =	Ascii_5	
+		keycode	77 =	KP_6	
+	alt	keycode	77 =	Ascii_6	
+		keycode	78 =	KP_Add	
+		keycode	79 =	KP_1	
+	alt	keycode	79 =	Ascii_1	
+		keycode	80 =	KP_2	
+	alt	keycode	80 =	Ascii_2	
+		keycode	81 =	KP_3	
+	alt	keycode	81 =	Ascii_3	
+		keycode	82 =	KP_0	
+	alt	keycode	82 =	Ascii_0	
+		keycode	83 =	KP_Period
+altgr	control	keycode	83 =	Boot	
+control	alt	keycode	83 =	Boot	
+		keycode	84 =	Last_Console
+		keycode	85 =
+		keycode	86 =	less	greater	bar	
+	alt	keycode	86 =	Meta_less
+		keycode	87 =	F11	F11	F11	F11
+	control	keycode	87 =	F11	
+	alt	keycode	87 =	Console_11
+altgr	alt	keycode	87 =	Console_11
+		keycode	88 =	F12	F12	F12	F12
+	control	keycode	88 =	F12	
+	alt	keycode	88 =	Console_12
+altgr	alt	keycode	88 =	Console_12
+		keycode	89 =
+		keycode	90 =
+		keycode	91 =
+		keycode	92 =
+		keycode	93 =
+		keycode	94 =
+		keycode	95 =
+		keycode	96 =	KP_Enter	
+		keycode	97 =	AltGr_Lock
+		keycode	98 =	KP_Divide
+		keycode	99 =	Control_backslash
+	control	keycode	99 =	Control_backslash
+	alt	keycode	99 =	Control_backslash
+		keycode	100 =	AltGr	
+		keycode	101 =	Break	
+		keycode	102 =	Find	
+		keycode	103 =	Up	
+		keycode	104 =	Prior	
+	shift	keycode	104 =	Scroll_Backward
+		keycode	105 =	Left	
+        alt     keycode 105 =	Decr_Console
+		keycode 106 =	Right
+        alt     keycode 106 =	Incr_Console
+		keycode	107 =	Select	
+		keycode	108 =	Down	
+		keycode	109 =	Next	
+	shift	keycode	109 =	Scroll_Forward
+		keycode	110 =	Insert	
+		keycode	111 =	Remove	
+altgr	control	keycode	111 =	Boot	
+control	alt	keycode	111 =	Boot	
+		keycode	112 =
+		keycode	113 =
+		keycode	114 =
+		keycode	115 =
+		keycode	116 =
+		keycode	117 =
+		keycode	118 =
+		keycode	119 =
+		keycode	120 =
+		keycode	121 =
+		keycode	122 =
+		keycode	123 =
+		keycode	124 =
+		keycode	125 =
+		keycode	126 =
+		keycode	127 =
Index: 2.4.0/keymaps/i386/qwerty/ru-rCtrl-koi8r.map
===================================================================
--- 2.4.0/keymaps/i386/qwerty/ru-rCtrl-koi8r.map	(nonexistent)
+++ 2.4.0/keymaps/i386/qwerty/ru-rCtrl-koi8r.map	(revision 5)
@@ -0,0 +1,300 @@
+#
+# ru-rCtrl-koi8r.map
+# 
+# Russian KeyMap.
+# "Cyrillic" mode is toggled by Right_Ctrl key and shifted by AltGr key.
+#
+# charset=KOI8-R.
+#
+# Andrew V.Kosteltsev <kosteltsev@gmail.com>
+#
+#
+keymaps 0-4,6,8,10,12
+strings as usual
+
+		keycode	1 =	Escape	Escape		Escape	Escape
+	alt	keycode	1 =	Meta_Escape
+		keycode	2 =	one	exclam		one	exclam
+	alt	keycode	2 =	Meta_one	
+		keycode	3 =	two	at		two	quotedbl
+	control	keycode	3 =	nul	
+	alt	keycode	3 =	Meta_two	
+		keycode	4 =	three	numbersign	three	numbersign
+	control	keycode	4 =	Escape
+	alt	keycode	4 =	Meta_three
+		keycode	5 =	four	dollar		four	semicolon	
+	control	keycode	5 =	Control_backslash
+	alt	keycode	5 =	Meta_four
+		keycode	6 =	five	percent		five	percent
+	control	keycode	6 =	Control_bracketright
+	alt	keycode	6 =	Meta_five
+		keycode	7 =	six	asciicircum	six	colon
+	control	keycode	7 =	Control_asciicircum
+	alt	keycode	7 =	Meta_six	
+		keycode	8 =	seven	ampersand	seven	question
+	control	keycode	8 =	Control_underscore
+	alt	keycode	8 =	Meta_seven
+		keycode	9 =	eight	asterisk	eight	asterisk
+	control	keycode	9 =	Delete	
+	alt	keycode	9 =	Meta_eight
+		keycode	10 =	nine	parenleft	nine	parenleft
+	alt	keycode	10 =	Meta_nine
+		keycode	11 =	zero	parenright	zero	parenright
+	alt	keycode	11 =	Meta_zero
+		keycode	12 =	minus	underscore	minus	underscore
+	control	keycode	12 =	Control_underscore
+	alt	keycode	12 =	Meta_minus
+		keycode	13 =	equal	plus		equal	plus
+	alt	keycode	13 =	Meta_equal
+		keycode	14 =	BackSpace BackSpace	BackSpace BackSpace
+	alt	keycode	14 =	Meta_Delete
+		keycode	15 =	Tab	Tab		Tab	Tab	
+	alt	keycode	15 =	Meta_Tab	
+		keycode	16 =	+q	+Q		+202	+234
+	control	keycode	16 =	Control_q
+altgr	control	keycode	16 =	Control_q
+		keycode	17 =	+w	+W		+195	+227
+	control	keycode	17 =	Control_w
+altgr	control	keycode	17 =	Control_w
+		keycode	18 =	+e	+E		+213	+245
+	control	keycode	18 =	Control_e
+altgr	control	keycode	18 =	Control_e
+		keycode	19 =	+r	+R		+203	+235
+	control	keycode	19 =	Control_r
+altgr	control	keycode	19 =	Control_r
+		keycode	20 =	+t	+T		+197	+229
+	control	keycode	20 =	Control_t
+altgr	control	keycode	20 =	Control_t
+		keycode	21 =	+y	+Y		+206	+238
+	control	keycode	21 =	Control_y
+altgr	control	keycode	21 =	Control_y
+		keycode	22 =	+u	+U		+199	+231
+	control	keycode	22 =	Control_u
+altgr	control	keycode	22 =	Control_u
+		keycode	23 =	+i	+I		+219	+251
+	control	keycode	23 =	Tab
+altgr	control	keycode	23 =	Tab
+		keycode	24 =	+o	+O		+221	+253
+	control	keycode	24 =	Control_o
+altgr	control	keycode	24 =	Control_o
+		keycode	25 =	+p	+P		+218	+250
+	control	keycode	25 =	Control_p
+altgr	control	keycode	25 =	Control_p
+		keycode	26 =	bracketleft braceleft	+200	+232
+	control	keycode	26 =	Escape	
+altgr	control	keycode	26 =	Escape	
+	alt	keycode	26 =	Meta_bracketleft
+		keycode	27 =	bracketright braceright	+223	+255
+	control	keycode	27 =	Control_bracketright
+altgr	control	keycode	27 =	Control_bracketright
+	alt	keycode	27 =	Meta_bracketright
+		keycode	28 =	Return	
+	alt	keycode	28 =	Meta_Control_m	
+		keycode	29 =	Control	
+		keycode	30 =	+a	+A		+198	+230
+	control	keycode	30 =	Control_a
+altgr	control	keycode	30 =	Control_a
+		keycode	31 =	+s	+S		+217	+249
+	control	keycode	31 =	Control_s
+altgr	control	keycode	31 =	Control_s
+		keycode	32 =	+d	+D		+215	+247
+	control	keycode	32 =	Control_d
+altgr	control	keycode	32 =	Control_d
+		keycode	33 =	+f	+F		+193	+225
+	control	keycode	33 =	Control_f
+altgr	control	keycode	33 =	Control_f
+		keycode	34 =	+g	+G		+208	+240
+	control	keycode	34 =	Control_g
+altgr	control	keycode	34 =	Control_g
+		keycode	35 =	+h	+H		+210	+242
+	control	keycode	35 =	BackSpace
+altgr	control	keycode	35 =	BackSpace
+		keycode	36 =	+j	+J		+207	+239
+	control	keycode	36 =	Linefeed
+altgr	control	keycode	36 =	Linefeed
+		keycode	37 =	+k	+K		+204	+236
+	control	keycode	37 =	Control_k
+altgr	control	keycode	37 =	Control_k
+		keycode	38 =	+l	+L		+196	+228
+	control	keycode	38 =	Control_l
+altgr	control	keycode	38 =	Control_l
+		keycode	39 =	semicolon colon		+214	+246
+	alt	keycode	39 =	Meta_semicolon
+		keycode	40 =	apostrophe quotedbl	+220	+252
+	control	keycode	40 =	Control_g
+altgr	control	keycode	40 =	Control_g
+	alt	keycode	40 =	Meta_apostrophe
+		keycode	41 =	grave	asciitilde	+163	+179
+	control	keycode	41 =	nul	
+	alt	keycode	41 =	Meta_grave
+		keycode	42 =	Shift	
+		keycode	43 =	backslash bar		slash bar	
+	control	keycode	43 =	Control_backslash
+	alt	keycode	43 =	Meta_backslash
+		keycode	44 =	+z	+Z		+209	+241
+	control	keycode	44 =	Control_z
+altgr	control	keycode	44 =	Control_z
+		keycode	45 =	+x	+X		+222	+254
+	control	keycode	45 =	Control_x
+altgr	control	keycode	45 =	Control_x
+		keycode	46 =	+c	+C		+211	+243
+	control	keycode	46 =	Control_c
+altgr	control	keycode	46 =	Control_c
+		keycode	47 =	+v	+V		+205	+237
+	control	keycode	47 =	Control_v
+altgr	control	keycode	47 =	Control_v
+		keycode	48 =	+b	+B		+201	+233
+	control	keycode	48 =	Control_b
+altgr	control	keycode	48 =	Control_b
+		keycode	49 =	+n	+N		+212	+244
+	control	keycode	49 =	Control_n
+altgr	control	keycode	49 =	Control_n
+		keycode	50 =	+m	+M		+216	+248
+	control	keycode	50 =	Control_m
+altgr	control	keycode	50 =	Control_m
+		keycode	51 =	comma	less		+194	+226
+	alt	keycode	51 =	Meta_comma
+		keycode	52 =	period	greater		+192	+224
+	alt	keycode	52 =	Meta_period
+		keycode	53 =	slash	question	period	comma
+	control	keycode	53 =	Delete	
+	alt	keycode	53 =	Meta_slash
+		keycode	54 =	Shift
+		keycode	55 =	KP_Multiply
+		keycode	56 =	Alt	
+		keycode	57 =	space	space		space	space	
+	control	keycode	57 =	nul	
+	alt	keycode	57 =	Meta_space
+		keycode	58 =	Caps_Lock
+#
+# Virtual Consoles
+#
+		keycode	59 =	F1	F11	F1	F11
+    control	keycode	59 =	F1	
+	alt	keycode	59 =	Console_1
+altgr	alt	keycode	59 =	Console_1
+		keycode	60 =	F2	F12	F2	F12
+    control	keycode	60 =	F2	
+	alt	keycode	60 =	Console_2
+altgr	alt	keycode	60 =	Console_2
+		keycode	61 =	F3	F13	F3	F13
+    control	keycode	61 =	F3	
+	alt	keycode	61 =	Console_3
+altgr	alt	keycode	61 =	Console_3
+		keycode	62 =	F4	F14	F4	F14
+    control	keycode	62 =	F4	
+	alt	keycode	62 =	Console_4
+altgr	alt	keycode	62 =	Console_4
+		keycode	63 =	F5	F15	F5	F15
+    control	keycode	63 =	F5	
+	alt	keycode	63 =	Console_5
+altgr	alt	keycode	63 =	Console_5
+		keycode	64 =	F6	F16	F6	F16
+    control	keycode	64 =	F6	
+	alt	keycode	64 =	Console_6
+altgr	alt	keycode	64 =	Console_6
+		keycode	65 =	F7	F17	F7	F17
+    control	keycode	65 =	F7	
+	alt	keycode	65 =	Console_7
+altgr	alt	keycode	65 =	Console_7
+		keycode	66 =	F8	F18	F8	F18
+    control	keycode	66 =	F8	
+	alt	keycode	66 =	Console_8
+altgr	alt	keycode	66 =	Console_8
+		keycode	67 =	F9	F19	F9	F19
+    control	keycode	67 =	F9	
+	alt	keycode	67 =	Console_9
+altgr	alt	keycode	67 =	Console_9
+		keycode	68 =	F10	F20	F10	F20
+    control	keycode	68 =	F10	
+	alt	keycode	68 =	Console_10
+altgr	alt	keycode	68 =	Console_10
+
+		keycode	69 =	Num_Lock	
+		keycode	70 =	Scroll_Lock	Show_Memory	Show_Registers
+	control	keycode	70 =	Show_State
+	alt	keycode	70 =	Scroll_Lock
+		keycode	71 =	KP_7	
+	alt	keycode	71 =	Ascii_7	
+		keycode	72 =	KP_8	
+	alt	keycode	72 =	Ascii_8	
+		keycode	73 =	KP_9	
+	alt	keycode	73 =	Ascii_9	
+		keycode	74 =	KP_Subtract
+		keycode	75 =	KP_4	
+	alt	keycode	75 =	Ascii_4	
+		keycode	76 =	KP_5	
+	alt	keycode	76 =	Ascii_5	
+		keycode	77 =	KP_6	
+	alt	keycode	77 =	Ascii_6	
+		keycode	78 =	KP_Add	
+		keycode	79 =	KP_1	
+	alt	keycode	79 =	Ascii_1	
+		keycode	80 =	KP_2	
+	alt	keycode	80 =	Ascii_2	
+		keycode	81 =	KP_3	
+	alt	keycode	81 =	Ascii_3	
+		keycode	82 =	KP_0	
+	alt	keycode	82 =	Ascii_0	
+		keycode	83 =	KP_Period
+altgr	control	keycode	83 =	Boot	
+control	alt	keycode	83 =	Boot	
+		keycode	84 =	Last_Console
+		keycode	85 =
+		keycode	86 =	less	greater	bar	
+	alt	keycode	86 =	Meta_less
+		keycode	87 =	F11	F11	F11	F11
+	control	keycode	87 =	F11	
+	alt	keycode	87 =	Console_11
+altgr	alt	keycode	87 =	Console_11
+		keycode	88 =	F12	F12	F12	F12
+	control	keycode	88 =	F12	
+	alt	keycode	88 =	Console_12
+altgr	alt	keycode	88 =	Console_12
+		keycode	89 =
+		keycode	90 =
+		keycode	91 =
+		keycode	92 =
+		keycode	93 =
+		keycode	94 =
+		keycode	95 =
+		keycode	96 =	KP_Enter	
+		keycode	97 =	AltGr_Lock
+		keycode	98 =	KP_Divide
+		keycode	99 =	Control_backslash
+	control	keycode	99 =	Control_backslash
+	alt	keycode	99 =	Control_backslash
+		keycode	100 =	AltGr	
+		keycode	101 =	Break	
+		keycode	102 =	Find	
+		keycode	103 =	Up	
+		keycode	104 =	Prior	
+	shift	keycode	104 =	Scroll_Backward
+		keycode	105 =	Left	
+        alt     keycode 105 =	Decr_Console
+		keycode 106 =	Right
+        alt     keycode 106 =	Incr_Console
+		keycode	107 =	Select	
+		keycode	108 =	Down	
+		keycode	109 =	Next	
+	shift	keycode	109 =	Scroll_Forward
+		keycode	110 =	Insert	
+		keycode	111 =	Remove	
+altgr	control	keycode	111 =	Boot	
+control	alt	keycode	111 =	Boot	
+		keycode	112 =
+		keycode	113 =
+		keycode	114 =
+		keycode	115 =
+		keycode	116 =
+		keycode	117 =
+		keycode	118 =
+		keycode	119 =
+		keycode	120 =
+		keycode	121 =
+		keycode	122 =
+		keycode	123 =
+		keycode	124 =
+		keycode	125 =
+		keycode	126 =
+		keycode	127 =
Index: 2.4.0/keymaps/i386/qwerty/ru-rCtrl-utf8.map
===================================================================
--- 2.4.0/keymaps/i386/qwerty/ru-rCtrl-utf8.map	(nonexistent)
+++ 2.4.0/keymaps/i386/qwerty/ru-rCtrl-utf8.map	(revision 5)
@@ -0,0 +1,300 @@
+#
+# ru-rCtrl-utf8.map
+#
+# Russian KeyMap.
+# "Cyrillic" mode is toggled by Right_Ctrl key and shifted by AltGr key.
+#
+# charset=UTF-8.
+#
+# Andrew V.Kosteltsev <kosteltsev@gmail.com>
+#
+#
+keymaps 0-4,6,8,10,12
+strings as usual
+
+		keycode	1 =	Escape	Escape		Escape	Escape
+	alt	keycode	1 =	Meta_Escape
+		keycode	2 =	one	exclam		one	exclam
+	alt	keycode	2 =	Meta_one	
+		keycode	3 =	two	at		two	quotedbl
+	control	keycode	3 =	nul	
+	alt	keycode	3 =	Meta_two	
+		keycode	4 =	three	numbersign	three	U+2116
+	control	keycode	4 =	Escape
+	alt	keycode	4 =	Meta_three
+		keycode	5 =	four	dollar		four	semicolon	
+	control	keycode	5 =	Control_backslash
+	alt	keycode	5 =	Meta_four
+		keycode	6 =	five	percent		five	percent
+	control	keycode	6 =	Control_bracketright
+	alt	keycode	6 =	Meta_five
+		keycode	7 =	six	asciicircum	six	colon
+	control	keycode	7 =	Control_asciicircum
+	alt	keycode	7 =	Meta_six	
+		keycode	8 =	seven	ampersand	seven	question
+	control	keycode	8 =	Control_underscore
+	alt	keycode	8 =	Meta_seven
+		keycode	9 =	eight	asterisk	eight	asterisk
+	control	keycode	9 =	Delete	
+	alt	keycode	9 =	Meta_eight
+		keycode	10 =	nine	parenleft	nine	parenleft
+	alt	keycode	10 =	Meta_nine
+		keycode	11 =	zero	parenright	zero	parenright
+	alt	keycode	11 =	Meta_zero
+		keycode	12 =	minus	underscore	minus	underscore
+	control	keycode	12 =	Control_underscore
+	alt	keycode	12 =	Meta_minus
+		keycode	13 =	equal	plus		equal	plus
+	alt	keycode	13 =	Meta_equal
+		keycode	14 =	BackSpace BackSpace	BackSpace BackSpace
+	alt	keycode	14 =	Meta_Delete
+		keycode	15 =	Tab	Tab		Tab	Tab	
+	alt	keycode	15 =	Meta_Tab	
+		keycode	16 =	+q	+Q		U+0439	U+0419
+	control	keycode	16 =	Control_q
+altgr	control	keycode	16 =	Control_q
+		keycode	17 =	+w	+W		U+0446	U+0426
+	control	keycode	17 =	Control_w
+altgr	control	keycode	17 =	Control_w
+		keycode	18 =	+e	+E		U+0443	U+0423
+	control	keycode	18 =	Control_e
+altgr	control	keycode	18 =	Control_e
+		keycode	19 =	+r	+R		U+043a	U+041a
+	control	keycode	19 =	Control_r
+altgr	control	keycode	19 =	Control_r
+		keycode	20 =	+t	+T		U+0435	U+0415
+	control	keycode	20 =	Control_t
+altgr	control	keycode	20 =	Control_t
+		keycode	21 =	+y	+Y		U+043d	U+041d
+	control	keycode	21 =	Control_y
+altgr	control	keycode	21 =	Control_y
+		keycode	22 =	+u	+U		U+0433	U+0413
+	control	keycode	22 =	Control_u
+altgr	control	keycode	22 =	Control_u
+		keycode	23 =	+i	+I		U+0448	U+0428
+	control	keycode	23 =	Tab
+altgr	control	keycode	23 =	Tab
+		keycode	24 =	+o	+O		U+0449	U+0429
+	control	keycode	24 =	Control_o
+altgr	control	keycode	24 =	Control_o
+		keycode	25 =	+p	+P		U+0437	U+0417
+	control	keycode	25 =	Control_p
+altgr	control	keycode	25 =	Control_p
+		keycode	26 =	bracketleft braceleft	U+0445	U+0425
+	control	keycode	26 =	Escape	
+altgr	control	keycode	26 =	Escape	
+	alt	keycode	26 =	Meta_bracketleft
+		keycode	27 =	bracketright braceright	U+044a	U+042a
+	control	keycode	27 =	Control_bracketright
+altgr	control	keycode	27 =	Control_bracketright
+	alt	keycode	27 =	Meta_bracketright
+		keycode	28 =	Return	
+	alt	keycode	28 =	Meta_Control_m	
+		keycode	29 =	Control	
+		keycode	30 =	+a	+A		U+0444	U+0424
+	control	keycode	30 =	Control_a
+altgr	control	keycode	30 =	Control_a
+		keycode	31 =	+s	+S		U+044b	U+042b
+	control	keycode	31 =	Control_s
+altgr	control	keycode	31 =	Control_s
+		keycode	32 =	+d	+D		U+0432	U+0412
+	control	keycode	32 =	Control_d
+altgr	control	keycode	32 =	Control_d
+		keycode	33 =	+f	+F		U+0430	U+0410
+	control	keycode	33 =	Control_f
+altgr	control	keycode	33 =	Control_f
+		keycode	34 =	+g	+G		U+043f	U+041f
+	control	keycode	34 =	Control_g
+altgr	control	keycode	34 =	Control_g
+		keycode	35 =	+h	+H		U+0440	U+0420
+	control	keycode	35 =	BackSpace
+altgr	control	keycode	35 =	BackSpace
+		keycode	36 =	+j	+J		U+043e	U+041e
+	control	keycode	36 =	Linefeed
+altgr	control	keycode	36 =	Linefeed
+		keycode	37 =	+k	+K		U+043b	U+041b
+	control	keycode	37 =	Control_k
+altgr	control	keycode	37 =	Control_k
+		keycode	38 =	+l	+L		U+0434	U+0414
+	control	keycode	38 =	Control_l
+altgr	control	keycode	38 =	Control_l
+		keycode	39 =	semicolon colon		U+0436	U+0416
+	alt	keycode	39 =	Meta_semicolon
+		keycode	40 =	apostrophe quotedbl	U+044d	U+042d
+	control	keycode	40 =	Control_g
+altgr	control	keycode	40 =	Control_g
+	alt	keycode	40 =	Meta_apostrophe
+		keycode	41 =	grave	asciitilde	U+0451	U+0401
+	control	keycode	41 =	nul	
+	alt	keycode	41 =	Meta_grave
+		keycode	42 =	Shift	
+		keycode	43 =	backslash bar		slash bar	
+	control	keycode	43 =	Control_backslash
+	alt	keycode	43 =	Meta_backslash
+		keycode	44 =	+z	+Z		U+044f	U+042f
+	control	keycode	44 =	Control_z
+altgr	control	keycode	44 =	Control_z
+		keycode	45 =	+x	+X		U+0447	U+0427
+	control	keycode	45 =	Control_x
+altgr	control	keycode	45 =	Control_x
+		keycode	46 =	+c	+C		U+0441	U+0421
+	control	keycode	46 =	Control_c
+altgr	control	keycode	46 =	Control_c
+		keycode	47 =	+v	+V		U+043c	U+041c
+	control	keycode	47 =	Control_v
+altgr	control	keycode	47 =	Control_v
+		keycode	48 =	+b	+B		U+0438	U+0418
+	control	keycode	48 =	Control_b
+altgr	control	keycode	48 =	Control_b
+		keycode	49 =	+n	+N		U+0442	U+0422
+	control	keycode	49 =	Control_n
+altgr	control	keycode	49 =	Control_n
+		keycode	50 =	+m	+M		U+044c	U+042c
+	control	keycode	50 =	Control_m
+altgr	control	keycode	50 =	Control_m
+		keycode	51 =	comma	less		U+0431	U+0411
+	alt	keycode	51 =	Meta_comma
+		keycode	52 =	period	greater		U+044e	U+042e
+	alt	keycode	52 =	Meta_period
+		keycode	53 =	slash	question	period	comma
+	control	keycode	53 =	Delete	
+	alt	keycode	53 =	Meta_slash
+		keycode	54 =	Shift
+		keycode	55 =	KP_Multiply
+		keycode	56 =	Alt	
+		keycode	57 =	space	space		space	space	
+	control	keycode	57 =	nul	
+	alt	keycode	57 =	Meta_space
+		keycode	58 =	Caps_Lock
+#
+# Virtual Consoles
+#
+		keycode	59 =	F1	F11	F1	F11
+    control	keycode	59 =	F1	
+	alt	keycode	59 =	Console_1
+altgr	alt	keycode	59 =	Console_1
+		keycode	60 =	F2	F12	F2	F12
+    control	keycode	60 =	F2	
+	alt	keycode	60 =	Console_2
+altgr	alt	keycode	60 =	Console_2
+		keycode	61 =	F3	F13	F3	F13
+    control	keycode	61 =	F3	
+	alt	keycode	61 =	Console_3
+altgr	alt	keycode	61 =	Console_3
+		keycode	62 =	F4	F14	F4	F14
+    control	keycode	62 =	F4	
+	alt	keycode	62 =	Console_4
+altgr	alt	keycode	62 =	Console_4
+		keycode	63 =	F5	F15	F5	F15
+    control	keycode	63 =	F5	
+	alt	keycode	63 =	Console_5
+altgr	alt	keycode	63 =	Console_5
+		keycode	64 =	F6	F16	F6	F16
+    control	keycode	64 =	F6	
+	alt	keycode	64 =	Console_6
+altgr	alt	keycode	64 =	Console_6
+		keycode	65 =	F7	F17	F7	F17
+    control	keycode	65 =	F7	
+	alt	keycode	65 =	Console_7
+altgr	alt	keycode	65 =	Console_7
+		keycode	66 =	F8	F18	F8	F18
+    control	keycode	66 =	F8	
+	alt	keycode	66 =	Console_8
+altgr	alt	keycode	66 =	Console_8
+		keycode	67 =	F9	F19	F9	F19
+    control	keycode	67 =	F9	
+	alt	keycode	67 =	Console_9
+altgr	alt	keycode	67 =	Console_9
+		keycode	68 =	F10	F20	F10	F20
+    control	keycode	68 =	F10	
+	alt	keycode	68 =	Console_10
+altgr	alt	keycode	68 =	Console_10
+
+		keycode	69 =	Num_Lock	
+		keycode	70 =	Scroll_Lock	Show_Memory	Show_Registers
+	control	keycode	70 =	Show_State
+	alt	keycode	70 =	Scroll_Lock
+		keycode	71 =	KP_7	
+	alt	keycode	71 =	Ascii_7	
+		keycode	72 =	KP_8	
+	alt	keycode	72 =	Ascii_8	
+		keycode	73 =	KP_9	
+	alt	keycode	73 =	Ascii_9	
+		keycode	74 =	KP_Subtract
+		keycode	75 =	KP_4	
+	alt	keycode	75 =	Ascii_4	
+		keycode	76 =	KP_5	
+	alt	keycode	76 =	Ascii_5	
+		keycode	77 =	KP_6	
+	alt	keycode	77 =	Ascii_6	
+		keycode	78 =	KP_Add	
+		keycode	79 =	KP_1	
+	alt	keycode	79 =	Ascii_1	
+		keycode	80 =	KP_2	
+	alt	keycode	80 =	Ascii_2	
+		keycode	81 =	KP_3	
+	alt	keycode	81 =	Ascii_3	
+		keycode	82 =	KP_0	
+	alt	keycode	82 =	Ascii_0	
+		keycode	83 =	KP_Period
+altgr	control	keycode	83 =	Boot	
+control	alt	keycode	83 =	Boot	
+		keycode	84 =	Last_Console
+		keycode	85 =
+		keycode	86 =	less	greater	bar	
+	alt	keycode	86 =	Meta_less
+		keycode	87 =	F11	F11	F11	F11
+	control	keycode	87 =	F11	
+	alt	keycode	87 =	Console_11
+altgr	alt	keycode	87 =	Console_11
+		keycode	88 =	F12	F12	F12	F12
+	control	keycode	88 =	F12	
+	alt	keycode	88 =	Console_12
+altgr	alt	keycode	88 =	Console_12
+		keycode	89 =
+		keycode	90 =
+		keycode	91 =
+		keycode	92 =
+		keycode	93 =
+		keycode	94 =
+		keycode	95 =
+		keycode	96 =	KP_Enter	
+		keycode	97 =	AltGr_Lock
+		keycode	98 =	KP_Divide
+		keycode	99 =	Control_backslash
+	control	keycode	99 =	Control_backslash
+	alt	keycode	99 =	Control_backslash
+		keycode	100 =	AltGr	
+		keycode	101 =	Break	
+		keycode	102 =	Find	
+		keycode	103 =	Up	
+		keycode	104 =	Prior	
+	shift	keycode	104 =	Scroll_Backward
+		keycode	105 =	Left	
+        alt     keycode 105 =	Decr_Console
+		keycode 106 =	Right
+        alt     keycode 106 =	Incr_Console
+		keycode	107 =	Select	
+		keycode	108 =	Down	
+		keycode	109 =	Next	
+	shift	keycode	109 =	Scroll_Forward
+		keycode	110 =	Insert	
+		keycode	111 =	Remove	
+altgr	control	keycode	111 =	Boot	
+control	alt	keycode	111 =	Boot	
+		keycode	112 =
+		keycode	113 =
+		keycode	114 =
+		keycode	115 =
+		keycode	116 =
+		keycode	117 =
+		keycode	118 =
+		keycode	119 =
+		keycode	120 =
+		keycode	121 =
+		keycode	122 =
+		keycode	123 =
+		keycode	124 =
+		keycode	125 =
+		keycode	126 =
+		keycode	127 =
Index: 2.4.0/keymaps/i386/qwerty
===================================================================
--- 2.4.0/keymaps/i386/qwerty	(nonexistent)
+++ 2.4.0/keymaps/i386/qwerty	(revision 5)

Property changes on: 2.4.0/keymaps/i386/qwerty
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,73 ##
+
+# install dir
+dist
+
+# Target build dirs
+.a1x-newlib
+.a2x-newlib
+.at91sam7s-newlib
+
+.build-machine
+
+.a1x-glibc
+.a2x-glibc
+.h3-glibc
+.h5-glibc
+.i586-glibc
+.i686-glibc
+.imx6-glibc
+.jz47xx-glibc
+.makefile
+.am335x-glibc
+.omap543x-glibc
+.p5600-glibc
+.power8-glibc
+.power8le-glibc
+.power9-glibc
+.power9le-glibc
+.m1000-glibc
+.riscv64-glibc
+.rk328x-glibc
+.rk33xx-glibc
+.rk339x-glibc
+.s8xx-glibc
+.s9xx-glibc
+.x86_64-glibc
+
+# Hidden files (each file)
+.makefile
+.dist
+.rootfs
+
+# src & hw requires
+.src_requires
+.src_requires_depend
+.requires
+.requires_depend
+
+# Tarballs
+*.gz
+*.bz2
+*.lz
+*.xz
+*.tgz
+*.txz
+
+# Signatures
+*.asc
+*.sig
+*.sign
+*.sha1sum
+
+# Patches
+*.patch
+
+# Descriptions
+*.dsc
+*.txt
+
+# Default linux config files
+*.defconfig
+
+# backup copies
+*~
Index: 2.4.0/keymaps/i386
===================================================================
--- 2.4.0/keymaps/i386	(nonexistent)
+++ 2.4.0/keymaps/i386	(revision 5)

Property changes on: 2.4.0/keymaps/i386
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,73 ##
+
+# install dir
+dist
+
+# Target build dirs
+.a1x-newlib
+.a2x-newlib
+.at91sam7s-newlib
+
+.build-machine
+
+.a1x-glibc
+.a2x-glibc
+.h3-glibc
+.h5-glibc
+.i586-glibc
+.i686-glibc
+.imx6-glibc
+.jz47xx-glibc
+.makefile
+.am335x-glibc
+.omap543x-glibc
+.p5600-glibc
+.power8-glibc
+.power8le-glibc
+.power9-glibc
+.power9le-glibc
+.m1000-glibc
+.riscv64-glibc
+.rk328x-glibc
+.rk33xx-glibc
+.rk339x-glibc
+.s8xx-glibc
+.s9xx-glibc
+.x86_64-glibc
+
+# Hidden files (each file)
+.makefile
+.dist
+.rootfs
+
+# src & hw requires
+.src_requires
+.src_requires_depend
+.requires
+.requires_depend
+
+# Tarballs
+*.gz
+*.bz2
+*.lz
+*.xz
+*.tgz
+*.txz
+
+# Signatures
+*.asc
+*.sig
+*.sign
+*.sha1sum
+
+# Patches
+*.patch
+
+# Descriptions
+*.dsc
+*.txt
+
+# Default linux config files
+*.defconfig
+
+# backup copies
+*~
Index: 2.4.0/keymaps
===================================================================
--- 2.4.0/keymaps	(nonexistent)
+++ 2.4.0/keymaps	(revision 5)

Property changes on: 2.4.0/keymaps
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,73 ##
+
+# install dir
+dist
+
+# Target build dirs
+.a1x-newlib
+.a2x-newlib
+.at91sam7s-newlib
+
+.build-machine
+
+.a1x-glibc
+.a2x-glibc
+.h3-glibc
+.h5-glibc
+.i586-glibc
+.i686-glibc
+.imx6-glibc
+.jz47xx-glibc
+.makefile
+.am335x-glibc
+.omap543x-glibc
+.p5600-glibc
+.power8-glibc
+.power8le-glibc
+.power9-glibc
+.power9le-glibc
+.m1000-glibc
+.riscv64-glibc
+.rk328x-glibc
+.rk33xx-glibc
+.rk339x-glibc
+.s8xx-glibc
+.s9xx-glibc
+.x86_64-glibc
+
+# Hidden files (each file)
+.makefile
+.dist
+.rootfs
+
+# src & hw requires
+.src_requires
+.src_requires_depend
+.requires
+.requires_depend
+
+# Tarballs
+*.gz
+*.bz2
+*.lz
+*.xz
+*.tgz
+*.txz
+
+# Signatures
+*.asc
+*.sig
+*.sign
+*.sha1sum
+
+# Patches
+*.patch
+
+# Descriptions
+*.dsc
+*.txt
+
+# Default linux config files
+*.defconfig
+
+# backup copies
+*~
Index: 2.4.0
===================================================================
--- 2.4.0	(nonexistent)
+++ 2.4.0	(revision 5)

Property changes on: 2.4.0
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,73 ##
+
+# install dir
+dist
+
+# Target build dirs
+.a1x-newlib
+.a2x-newlib
+.at91sam7s-newlib
+
+.build-machine
+
+.a1x-glibc
+.a2x-glibc
+.h3-glibc
+.h5-glibc
+.i586-glibc
+.i686-glibc
+.imx6-glibc
+.jz47xx-glibc
+.makefile
+.am335x-glibc
+.omap543x-glibc
+.p5600-glibc
+.power8-glibc
+.power8le-glibc
+.power9-glibc
+.power9le-glibc
+.m1000-glibc
+.riscv64-glibc
+.rk328x-glibc
+.rk33xx-glibc
+.rk339x-glibc
+.s8xx-glibc
+.s9xx-glibc
+.x86_64-glibc
+
+# Hidden files (each file)
+.makefile
+.dist
+.rootfs
+
+# src & hw requires
+.src_requires
+.src_requires_depend
+.requires
+.requires_depend
+
+# Tarballs
+*.gz
+*.bz2
+*.lz
+*.xz
+*.tgz
+*.txz
+
+# Signatures
+*.asc
+*.sig
+*.sign
+*.sha1sum
+
+# Patches
+*.patch
+
+# Descriptions
+*.dsc
+*.txt
+
+# Default linux config files
+*.defconfig
+
+# backup copies
+*~
Index: 2.4.0-ppc32/Makefile
===================================================================
--- 2.4.0-ppc32/Makefile	(nonexistent)
+++ 2.4.0-ppc32/Makefile	(revision 5)
@@ -0,0 +1,200 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_S824L)
+COMPONENT_TARGETS += $(HARDWARE_VESNIN)
+COMPONENT_TARGETS += $(HARDWARE_TL2WK2)
+COMPONENT_TARGETS += $(HARDWARE_TL2SV2)
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+CREATE_PPC32_PACKAGE = true
+
+
+include ../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/packages/a/kbd
+
+REQUIRES           = app/kbd/2.4.0
+REQUIRES          += dev/check/0.15.2-ppc32
+REQUIRES          += secure/pam/1.5.1-ppc32
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 2.4.0
+tar_xz_archive     = $(SRC_PACKAGE_PATH)/packages/a/kbd/kbd-$(version).tar.xz
+SRC_ARCHIVE        = $(tar_xz_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/kbd-$(version)
+src_dir_name       = kbd-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+PATCHES = PATCHES
+
+build_dir          = $(TARGET_BUILD_DIR)/build
+build_target       = $(TARGET_BUILD_DIR)/.build_done
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = app
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+KBD_32_PKG_NAME                = kbd-x32
+KBD_32_PKG_VERSION             = 2.4.0
+KBD_32_PKG_ARCH                = $(PKGARCH)
+KBD_32_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+KBD_32_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+KBD_32_PKG_GROUP               = $(PKG_GROUP)
+###                             |---handy-ruler-------------------------------|
+KBD_32_PKG_SHORT_DESCRIPTION   = keyboard maps library
+KBD_32_PKG_URL                 = $(BUG_URL)
+KBD_32_PKG_LICENSE             = LGPLv2
+KBD_32_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(KBD_32_PKG_NAME)-pkg-description
+KBD_32_PKG_DESCRIPTION_FILE_IN = $(KBD_32_PKG_NAME)-pkg-description.in
+KBD_32_PKG_INSTALL_SCRIPT      = $(KBD_32_PKG_NAME)-pkg-install.sh
+
+KBD_32_PKG       = $(CURDIR)/$(TARGET_BUILD_DIR)/$(KBD_32_PKG_NAME)-package
+
+pkg_basename     = $(KBD_32_PKG_NAME)-$(KBD_32_PKG_VERSION)-$(KBD_32_PKG_ARCH)-$(KBD_32_PKG_DISTRO_NAME)-$(KBD_32_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_certificate  = $(call cert-name,$(pkg_archive))
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+
+BUILD_TARGETS    = $(build_target)
+BUILD_TARGETS   += $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../build-system/core.mk
+
+
+env_sysroot = DESTDIR=$(KBD_32_PKG)
+
+extra_configure_switches  = --libdir=/usr/lib$(MULTILIB_PPC32_SUFFIX)
+extra_configure_switches += --bindir=/usr/bin/32
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --mandir=/usr/share/man
+extra_configure_switches += --disable-dependency-tracking
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localedir=/usr/share/locale
+extra_configure_switches += --datadir=/usr/share/kbd
+extra_configure_switches += --enable-libkeymap
+extra_configure_switches += --disable-rpath
+extra_configure_switches += --enable-nls
+
+ifeq ($(__ENABLE_STATIC__),yes)
+extra_configure_switches += --enable-static=yes
+else
+extra_configure_switches += --enable-static=no
+endif
+extra_configure_switches += --enable-shared=yes
+
+
+LDFLAGS += -Wl,-rpath,/lib$(MULTILIB_PPC32_SUFFIX):/usr/lib$(MULTILIB_PPC32_SUFFIX)
+
+
+TARGET_BIN_RPATH = /lib$(MULTILIB_PPC32_SUFFIX):/usr/lib$(MULTILIB_PPC32_SUFFIX)
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@touch $@
+
+$(build_target): $(src_done)
+	@mkdir -p $(build_dir)
+	@cd $(build_dir) && \
+	  $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+	  --prefix=/usr               \
+	  --build=$(BUILD)            \
+	  --host=$(TARGET32)          \
+	  $(extra_configure_switches)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+	@touch $@
+
+$(install_target): $(build_target)
+	@mkdir -p $(KBD_32_PKG)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+	# ======= Move loadkeys into /bin/32 directory =======
+	@mkdir -p $(KBD_32_PKG)/bin/32
+	@( cd $(KBD_32_PKG)/usr/bin/32 ; \
+	   mv -f loadkeys ../../../bin/32 ; \
+	   ln -sf ../../../bin/32/loadkeys . ; \
+	 )
+	@rm -rf $(KBD_32_PKG)/etc
+	@rm -rf $(KBD_32_PKG)/usr/include
+	@rm -rf $(KBD_32_PKG)/usr/share
+	# ======= remove target path from target libtool *.la files =======
+	@( cd $(KBD_32_PKG)/usr/lib$(MULTILIB_PPC32_SUFFIX) ; \
+	   sed -i "s,$(TARGET_DEST_DIR),,g" libkbdfile.la libkeymap.la ; \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(KBD_32_PKG))
+	# ======= tune libtool *.la search path to the target destination for development =======
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(MULTILIB_PPC32_SUFFIX) ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g"   libkbdfile.la libkeymap.la ; \
+	   sed -i "s,L/lib,L$(TARGET_DEST_DIR)/lib,g" libkbdfile.la libkeymap.la ; \
+	 )
+	# ======= tune pkg-config *.pc search path to the target destination for development =======
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(MULTILIB_PPC32_SUFFIX)/pkgconfig ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" libkeymap.pc ; \
+	 )
+	# ======= Strip binaries =======
+	@( cd $(KBD_32_PKG) ; \
+	   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	 )
+ifeq ($(__ENABLE_STATIC__),yes)
+	@( cd $(KBD_32_PKG) ; \
+	   find . | xargs file | grep "current ar archive" | cut -f 1 -d : | xargs $(STRIP) -g 2> /dev/null ; \
+	 )
+endif
+ifneq ($(PATCHELF),)
+	# ======= Set RPATH/RUNPATH for target binaries =======
+	@( cd $(KBD_32_PKG)/usr/bin/32 ; \
+	   for file in `find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs echo` ; do \
+	     rpath=`$(PATCHELF) --print-rpath $$file 2> /dev/null` ; \
+	     if echo "$$rpath" | grep -q "$(TARGET_DEST_DIR)" ; then \
+	       $(PATCHELF) --set-rpath $(TARGET_BIN_RPATH) $$file 1> /dev/null 2> /dev/null ; \
+	     fi ; \
+	   done ; \
+	 )
+endif
+	@touch $@
+
+$(KBD_32_PKG_DESCRIPTION_FILE): $(KBD_32_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_certificate) : $(pkg_archive) ;
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(KBD_32_PKG_DESCRIPTION_FILE) $(KBD_32_PKG_INSTALL_SCRIPT)
+	@cp $(KBD_32_PKG_DESCRIPTION_FILE) $(KBD_32_PKG)/.DESCRIPTION
+	@cp $(KBD_32_PKG_INSTALL_SCRIPT) $(KBD_32_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(KBD_32_PKG)/.REQUIRES
+	@echo "pkgname=$(KBD_32_PKG_NAME)"                            >  $(KBD_32_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(KBD_32_PKG_VERSION)"                          >> $(KBD_32_PKG)/.PKGINFO ; \
+	 echo "arch=$(KBD_32_PKG_ARCH)"                               >> $(KBD_32_PKG)/.PKGINFO ; \
+	 echo "distroname=$(KBD_32_PKG_DISTRO_NAME)"                  >> $(KBD_32_PKG)/.PKGINFO ; \
+	 echo "distrover=$(KBD_32_PKG_DISTRO_VERSION)"                >> $(KBD_32_PKG)/.PKGINFO ; \
+	 echo "group=$(KBD_32_PKG_GROUP)"                             >> $(KBD_32_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(KBD_32_PKG_SHORT_DESCRIPTION)\"" >> $(KBD_32_PKG)/.PKGINFO ; \
+	 echo "url=$(KBD_32_PKG_URL)"                                 >> $(KBD_32_PKG)/.PKGINFO ; \
+	 echo "license=$(KBD_32_PKG_LICENSE)"                         >> $(KBD_32_PKG)/.PKGINFO
+	@$(PSEUDO) sh -c "cd $(KBD_32_PKG) && \
+	                  chown -R root:root . && \
+	                  $(MAKE_PACKAGE) -J --linkadd=yes $(GNUPG_OPTIONS) -m -d .. ."
Index: 2.4.0-ppc32/PATCHES
===================================================================
--- 2.4.0-ppc32/PATCHES	(nonexistent)
+++ 2.4.0-ppc32/PATCHES	(revision 5)
@@ -0,0 +1,2 @@
+
+../../../sources/packages/a/kbd/patches/kbd-2.4.0.patch -p0
Index: 2.4.0-ppc32/kbd-x32-pkg-description.in
===================================================================
--- 2.4.0-ppc32/kbd-x32-pkg-description.in	(nonexistent)
+++ 2.4.0-ppc32/kbd-x32-pkg-description.in	(revision 5)
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+       |-----handy-ruler------------------------------------------------------|
+kbd-x32: kbd-x32 @VERSION@ (Libkeymap)
+kbd-x32:
+kbd-x32: Libkeymap is a library for manipulating kernel keymaps. This library
+kbd-x32: was created from the loadkeys/dumpkeys utilities.
+kbd-x32:
+kbd-x32:
+kbd-x32:
+kbd-x32:
+kbd-x32:
+kbd-x32:
+kbd-x32:
Index: 2.4.0-ppc32/kbd-x32-pkg-install.sh
===================================================================
--- 2.4.0-ppc32/kbd-x32-pkg-install.sh	(nonexistent)
+++ 2.4.0-ppc32/kbd-x32-pkg-install.sh	(revision 5)
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+pre_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+post_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+pre_update() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_update() {
+  post_install
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  /bin/true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  /bin/true
+}
+
+
+operation=$1
+shift
+
+$operation $*

Property changes on: 2.4.0-ppc32/kbd-x32-pkg-install.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: 2.4.0-ppc32
===================================================================
--- 2.4.0-ppc32	(nonexistent)
+++ 2.4.0-ppc32	(revision 5)

Property changes on: 2.4.0-ppc32
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,73 ##
+
+# install dir
+dist
+
+# Target build dirs
+.a1x-newlib
+.a2x-newlib
+.at91sam7s-newlib
+
+.build-machine
+
+.a1x-glibc
+.a2x-glibc
+.h3-glibc
+.h5-glibc
+.i586-glibc
+.i686-glibc
+.imx6-glibc
+.jz47xx-glibc
+.makefile
+.am335x-glibc
+.omap543x-glibc
+.p5600-glibc
+.power8-glibc
+.power8le-glibc
+.power9-glibc
+.power9le-glibc
+.m1000-glibc
+.riscv64-glibc
+.rk328x-glibc
+.rk33xx-glibc
+.rk339x-glibc
+.s8xx-glibc
+.s9xx-glibc
+.x86_64-glibc
+
+# Hidden files (each file)
+.makefile
+.dist
+.rootfs
+
+# src & hw requires
+.src_requires
+.src_requires_depend
+.requires
+.requires_depend
+
+# Tarballs
+*.gz
+*.bz2
+*.lz
+*.xz
+*.tgz
+*.txz
+
+# Signatures
+*.asc
+*.sig
+*.sign
+*.sha1sum
+
+# Patches
+*.patch
+
+# Descriptions
+*.dsc
+*.txt
+
+# Default linux config files
+*.defconfig
+
+# backup copies
+*~
Index: 2.4.0-x86_32/Makefile
===================================================================
--- 2.4.0-x86_32/Makefile	(nonexistent)
+++ 2.4.0-x86_32/Makefile	(revision 5)
@@ -0,0 +1,197 @@
+
+COMPONENT_TARGETS  = $(HARDWARE_INTEL_PC64)
+
+NEED_ABS_PATH      = true
+COMPONENT_IS_3PP   = true
+
+CREATE_X86_32_PACKAGE = true
+
+
+include ../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES    = sources/packages/a/kbd
+
+REQUIRES           = app/kbd/2.4.0
+REQUIRES          += dev/check/0.15.2-x86_32
+REQUIRES          += secure/pam/1.5.1-x86_32
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version            = 2.4.0
+tar_xz_archive     = $(SRC_PACKAGE_PATH)/packages/a/kbd/kbd-$(version).tar.xz
+SRC_ARCHIVE        = $(tar_xz_archive)
+SRC_DIR            = $(TARGET_BUILD_DIR)/kbd-$(version)
+src_dir_name       = kbd-$(version)
+src_done           = $(TARGET_BUILD_DIR)/.source_done
+
+PATCHES = PATCHES
+
+build_dir          = $(TARGET_BUILD_DIR)/build
+build_target       = $(TARGET_BUILD_DIR)/.build_done
+install_target     = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = app
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+KBD_32_PKG_NAME                = kbd-x32
+KBD_32_PKG_VERSION             = 2.4.0
+KBD_32_PKG_ARCH                = $(PKGARCH)
+KBD_32_PKG_DISTRO_NAME         = $(DISTRO_NAME)
+KBD_32_PKG_DISTRO_VERSION      = $(DISTRO_VERSION)
+KBD_32_PKG_GROUP               = $(PKG_GROUP)
+###                             |---handy-ruler-------------------------------|
+KBD_32_PKG_SHORT_DESCRIPTION   = keyboard maps library
+KBD_32_PKG_URL                 = $(BUG_URL)
+KBD_32_PKG_LICENSE             = LGPLv2
+KBD_32_PKG_DESCRIPTION_FILE    = $(TARGET_BUILD_DIR)/$(KBD_32_PKG_NAME)-pkg-description
+KBD_32_PKG_DESCRIPTION_FILE_IN = $(KBD_32_PKG_NAME)-pkg-description.in
+KBD_32_PKG_INSTALL_SCRIPT      = $(KBD_32_PKG_NAME)-pkg-install.sh
+
+KBD_32_PKG       = $(CURDIR)/$(TARGET_BUILD_DIR)/$(KBD_32_PKG_NAME)-package
+
+pkg_basename     = $(KBD_32_PKG_NAME)-$(KBD_32_PKG_VERSION)-$(KBD_32_PKG_ARCH)-$(KBD_32_PKG_DISTRO_NAME)-$(KBD_32_PKG_DISTRO_VERSION)
+
+pkg_archive      = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_certificate  = $(call cert-name,$(pkg_archive))
+pkg_signature    = $(call sign-name,$(pkg_archive))
+pkg_description  = $(call desc-name,$(pkg_archive))
+products         = $(call pkg-files,$(pkg_archive))
+
+
+BUILD_TARGETS    = $(build_target)
+BUILD_TARGETS   += $(install_target)
+
+PRODUCT_TARGETS  = $(products)
+
+ROOTFS_TARGETS   = $(pkg_archive)
+
+
+include ../../../build-system/core.mk
+
+
+env_sysroot = DESTDIR=$(KBD_32_PKG)
+
+extra_configure_switches  = --libdir=/usr/lib$(MULTILIB_X86_32_SUFFIX)
+extra_configure_switches += --bindir=/usr/bin/32
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --mandir=/usr/share/man
+extra_configure_switches += --disable-dependency-tracking
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --localedir=/usr/share/locale
+extra_configure_switches += --datadir=/usr/share/kbd
+extra_configure_switches += --enable-libkeymap
+extra_configure_switches += --disable-rpath
+extra_configure_switches += --enable-nls
+
+ifeq ($(__ENABLE_STATIC__),yes)
+extra_configure_switches += --enable-static=yes
+else
+extra_configure_switches += --enable-static=no
+endif
+extra_configure_switches += --enable-shared=yes
+
+
+LDFLAGS += -Wl,-rpath,/lib$(MULTILIB_X86_32_SUFFIX):/usr/lib$(MULTILIB_X86_32_SUFFIX)
+
+
+TARGET_BIN_RPATH = /lib$(MULTILIB_X86_32_SUFFIX):/usr/lib$(MULTILIB_X86_32_SUFFIX)
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+	$(UNPACK_SRC_ARCHIVE)
+	$(APPLY_PATCHES)
+	@touch $@
+
+$(build_target): $(src_done)
+	@mkdir -p $(build_dir)
+	@cd $(build_dir) && \
+	  $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+	  --prefix=/usr               \
+	  --build=$(BUILD)            \
+	  --host=$(TARGET32)          \
+	  $(extra_configure_switches)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+	@touch $@
+
+$(install_target): $(build_target)
+	@mkdir -p $(KBD_32_PKG)
+	@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+	# ======= Move loadkeys into /bin/32 directory =======
+	@mkdir -p $(KBD_32_PKG)/bin/32
+	@( cd $(KBD_32_PKG)/usr/bin/32 ; \
+	   mv -f loadkeys ../../../bin/32 ; \
+	   ln -sf ../../../bin/32/loadkeys . ; \
+	 )
+	@rm -rf $(KBD_32_PKG)/etc
+	@rm -rf $(KBD_32_PKG)/usr/include
+	@rm -rf $(KBD_32_PKG)/usr/share
+	# ======= remove target path from target libtool *.la files =======
+	@( cd $(KBD_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX) ; \
+	   sed -i "s,$(TARGET_DEST_DIR),,g" libkbdfile.la libkeymap.la ; \
+	 )
+	# ======= Install the same to $(TARGET_DEST_DIR) =======
+	$(call install-into-devenv, $(KBD_32_PKG))
+	# ======= tune libtool *.la search path to the target destination for development =======
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(MULTILIB_X86_32_SUFFIX) ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g"   libkbdfile.la libkeymap.la ; \
+	   sed -i "s,L/lib,L$(TARGET_DEST_DIR)/lib,g" libkbdfile.la libkeymap.la ; \
+	 )
+	# ======= tune pkg-config *.pc search path to the target destination for development =======
+	@( cd $(TARGET_DEST_DIR)/usr/lib$(MULTILIB_X86_32_SUFFIX)/pkgconfig ; \
+	   sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" libkeymap.pc ; \
+	 )
+	# ======= Strip binaries =======
+	@( cd $(KBD_32_PKG) ; \
+	   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+	 )
+ifeq ($(__ENABLE_STATIC__),yes)
+	@( cd $(KBD_32_PKG) ; \
+	   find . | xargs file | grep "current ar archive" | cut -f 1 -d : | xargs $(STRIP) -g 2> /dev/null ; \
+	 )
+endif
+ifneq ($(PATCHELF),)
+	# ======= Set RPATH/RUNPATH for target binaries =======
+	@( cd $(KBD_32_PKG)/usr/bin/32 ; \
+	   for file in `find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs echo` ; do \
+	     rpath=`$(PATCHELF) --print-rpath $$file 2> /dev/null` ; \
+	     if echo "$$rpath" | grep -q "$(TARGET_DEST_DIR)" ; then \
+	       $(PATCHELF) --set-rpath $(TARGET_BIN_RPATH) $$file 1> /dev/null 2> /dev/null ; \
+	     fi ; \
+	   done ; \
+	 )
+endif
+	@touch $@
+
+$(KBD_32_PKG_DESCRIPTION_FILE): $(KBD_32_PKG_DESCRIPTION_FILE_IN)
+	@cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_certificate) : $(pkg_archive) ;
+$(pkg_signature)   : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(KBD_32_PKG_DESCRIPTION_FILE) $(KBD_32_PKG_INSTALL_SCRIPT)
+	@cp $(KBD_32_PKG_DESCRIPTION_FILE) $(KBD_32_PKG)/.DESCRIPTION
+	@cp $(KBD_32_PKG_INSTALL_SCRIPT) $(KBD_32_PKG)/.INSTALL
+	@$(BUILD_PKG_REQUIRES) $(KBD_32_PKG)/.REQUIRES
+	@echo "pkgname=$(KBD_32_PKG_NAME)"                            >  $(KBD_32_PKG)/.PKGINFO ; \
+	 echo "pkgver=$(KBD_32_PKG_VERSION)"                          >> $(KBD_32_PKG)/.PKGINFO ; \
+	 echo "arch=$(KBD_32_PKG_ARCH)"                               >> $(KBD_32_PKG)/.PKGINFO ; \
+	 echo "distroname=$(KBD_32_PKG_DISTRO_NAME)"                  >> $(KBD_32_PKG)/.PKGINFO ; \
+	 echo "distrover=$(KBD_32_PKG_DISTRO_VERSION)"                >> $(KBD_32_PKG)/.PKGINFO ; \
+	 echo "group=$(KBD_32_PKG_GROUP)"                             >> $(KBD_32_PKG)/.PKGINFO ; \
+	 echo "short_description=\"$(KBD_32_PKG_SHORT_DESCRIPTION)\"" >> $(KBD_32_PKG)/.PKGINFO ; \
+	 echo "url=$(KBD_32_PKG_URL)"                                 >> $(KBD_32_PKG)/.PKGINFO ; \
+	 echo "license=$(KBD_32_PKG_LICENSE)"                         >> $(KBD_32_PKG)/.PKGINFO
+	@$(PSEUDO) sh -c "cd $(KBD_32_PKG) && \
+	                  chown -R root:root . && \
+	                  $(MAKE_PACKAGE) -J --linkadd=yes $(GNUPG_OPTIONS) -m -d .. ."
Index: 2.4.0-x86_32/PATCHES
===================================================================
--- 2.4.0-x86_32/PATCHES	(nonexistent)
+++ 2.4.0-x86_32/PATCHES	(revision 5)
@@ -0,0 +1,2 @@
+
+../../../sources/packages/a/kbd/patches/kbd-2.4.0.patch -p0
Index: 2.4.0-x86_32/kbd-x32-pkg-description.in
===================================================================
--- 2.4.0-x86_32/kbd-x32-pkg-description.in	(nonexistent)
+++ 2.4.0-x86_32/kbd-x32-pkg-description.in	(revision 5)
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+       |-----handy-ruler------------------------------------------------------|
+kbd-x32: kbd-x32 @VERSION@ (Libkeymap)
+kbd-x32:
+kbd-x32: Libkeymap is a library for manipulating kernel keymaps. This library
+kbd-x32: was created from the loadkeys/dumpkeys utilities.
+kbd-x32:
+kbd-x32:
+kbd-x32:
+kbd-x32:
+kbd-x32:
+kbd-x32:
+kbd-x32:
Index: 2.4.0-x86_32/kbd-x32-pkg-install.sh
===================================================================
--- 2.4.0-x86_32/kbd-x32-pkg-install.sh	(nonexistent)
+++ 2.4.0-x86_32/kbd-x32-pkg-install.sh	(revision 5)
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+pre_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+post_install() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+pre_update() {
+  /bin/true
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_update() {
+  post_install
+}
+
+# arg 1:  the old package version
+pre_remove() {
+  /bin/true
+}
+
+# arg 1:  the old package version
+post_remove() {
+  /bin/true
+}
+
+
+operation=$1
+shift
+
+$operation $*

Property changes on: 2.4.0-x86_32/kbd-x32-pkg-install.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: 2.4.0-x86_32
===================================================================
--- 2.4.0-x86_32	(nonexistent)
+++ 2.4.0-x86_32	(revision 5)

Property changes on: 2.4.0-x86_32
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,73 ##
+
+# install dir
+dist
+
+# Target build dirs
+.a1x-newlib
+.a2x-newlib
+.at91sam7s-newlib
+
+.build-machine
+
+.a1x-glibc
+.a2x-glibc
+.h3-glibc
+.h5-glibc
+.i586-glibc
+.i686-glibc
+.imx6-glibc
+.jz47xx-glibc
+.makefile
+.am335x-glibc
+.omap543x-glibc
+.p5600-glibc
+.power8-glibc
+.power8le-glibc
+.power9-glibc
+.power9le-glibc
+.m1000-glibc
+.riscv64-glibc
+.rk328x-glibc
+.rk33xx-glibc
+.rk339x-glibc
+.s8xx-glibc
+.s9xx-glibc
+.x86_64-glibc
+
+# Hidden files (each file)
+.makefile
+.dist
+.rootfs
+
+# src & hw requires
+.src_requires
+.src_requires_depend
+.requires
+.requires_depend
+
+# Tarballs
+*.gz
+*.bz2
+*.lz
+*.xz
+*.tgz
+*.txz
+
+# Signatures
+*.asc
+*.sig
+*.sign
+*.sha1sum
+
+# Patches
+*.patch
+
+# Descriptions
+*.dsc
+*.txt
+
+# Default linux config files
+*.defconfig
+
+# backup copies
+*~
Index: .
===================================================================
--- .	(nonexistent)
+++ .	(revision 5)

Property changes on: .
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,73 ##
+
+# install dir
+dist
+
+# Target build dirs
+.a1x-newlib
+.a2x-newlib
+.at91sam7s-newlib
+
+.build-machine
+
+.a1x-glibc
+.a2x-glibc
+.h3-glibc
+.h5-glibc
+.i586-glibc
+.i686-glibc
+.imx6-glibc
+.jz47xx-glibc
+.makefile
+.am335x-glibc
+.omap543x-glibc
+.p5600-glibc
+.power8-glibc
+.power8le-glibc
+.power9-glibc
+.power9le-glibc
+.m1000-glibc
+.riscv64-glibc
+.rk328x-glibc
+.rk33xx-glibc
+.rk339x-glibc
+.s8xx-glibc
+.s9xx-glibc
+.x86_64-glibc
+
+# Hidden files (each file)
+.makefile
+.dist
+.rootfs
+
+# src & hw requires
+.src_requires
+.src_requires_depend
+.requires
+.requires_depend
+
+# Tarballs
+*.gz
+*.bz2
+*.lz
+*.xz
+*.tgz
+*.txz
+
+# Signatures
+*.asc
+*.sig
+*.sign
+*.sha1sum
+
+# Patches
+*.patch
+
+# Descriptions
+*.dsc
+*.txt
+
+# Default linux config files
+*.defconfig
+
+# backup copies
+*~