Module Name:    xsrc
Committed By:   mrg
Date:           Sun Dec 30 09:17:53 UTC 2018

Modified Files:
        xsrc/external/mit/xkeyboard-config/dist: config.guess config.sub
            configure
        xsrc/external/mit/xkeyboard-config/dist/symbols: Makefile.am
            Makefile.in in ir lk

Log Message:
merge xkeyboard-config 2.25.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xkeyboard-config/dist/config.guess \
    xsrc/external/mit/xkeyboard-config/dist/config.sub
cvs rdiff -u -r1.15 -r1.16 xsrc/external/mit/xkeyboard-config/dist/configure
cvs rdiff -u -r1.12 -r1.13 \
    xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am \
    xsrc/external/mit/xkeyboard-config/dist/symbols/in
cvs rdiff -u -r1.15 -r1.16 \
    xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.in
cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/xkeyboard-config/dist/symbols/ir
cvs rdiff -u -r1.10 -r1.11 xsrc/external/mit/xkeyboard-config/dist/symbols/lk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xkeyboard-config/dist/config.guess
diff -u xsrc/external/mit/xkeyboard-config/dist/config.guess:1.7 xsrc/external/mit/xkeyboard-config/dist/config.guess:1.8
--- xsrc/external/mit/xkeyboard-config/dist/config.guess:1.7	Sun Mar 11 20:16:25 2018
+++ xsrc/external/mit/xkeyboard-config/dist/config.guess	Sun Dec 30 09:17:52 2018
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright 1992-2017 Free Software Foundation, Inc.
 
Index: xsrc/external/mit/xkeyboard-config/dist/config.sub
diff -u xsrc/external/mit/xkeyboard-config/dist/config.sub:1.7 xsrc/external/mit/xkeyboard-config/dist/config.sub:1.8
--- xsrc/external/mit/xkeyboard-config/dist/config.sub:1.7	Sun Mar 11 20:16:25 2018
+++ xsrc/external/mit/xkeyboard-config/dist/config.sub	Sun Dec 30 09:17:52 2018
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
 # Configuration validation subroutine script.
 #   Copyright 1992-2017 Free Software Foundation, Inc.
 

Index: xsrc/external/mit/xkeyboard-config/dist/configure
diff -u xsrc/external/mit/xkeyboard-config/dist/configure:1.15 xsrc/external/mit/xkeyboard-config/dist/configure:1.16
--- xsrc/external/mit/xkeyboard-config/dist/configure:1.15	Sun Mar 11 20:16:25 2018
+++ xsrc/external/mit/xkeyboard-config/dist/configure	Sun Dec 30 09:17:52 2018
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for xkeyboard-config 2.23.1.
+# Generated by GNU Autoconf 2.69 for xkeyboard-config 2.25.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -577,8 +577,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='xkeyboard-config'
 PACKAGE_TARNAME='xkeyboard-config'
-PACKAGE_VERSION='2.23.1'
-PACKAGE_STRING='xkeyboard-config 2.23.1'
+PACKAGE_VERSION='2.25'
+PACKAGE_STRING='xkeyboard-config 2.25'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1325,7 +1325,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures xkeyboard-config 2.23.1 to adapt to many kinds of systems.
+\`configure' configures xkeyboard-config 2.25 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1396,7 +1396,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of xkeyboard-config 2.23.1:";;
+     short | recursive ) echo "Configuration of xkeyboard-config 2.25:";;
    esac
   cat <<\_ACEOF
 
@@ -1511,7 +1511,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-xkeyboard-config configure 2.23.1
+xkeyboard-config configure 2.25
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1654,7 +1654,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by xkeyboard-config $as_me 2.23.1, which was
+It was created by xkeyboard-config $as_me 2.25, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2519,7 +2519,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='xkeyboard-config'
- VERSION='2.23.1'
+ VERSION='2.25'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -7406,7 +7406,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by xkeyboard-config $as_me 2.23.1, which was
+This file was extended by xkeyboard-config $as_me 2.25, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -7463,7 +7463,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-xkeyboard-config config.status 2.23.1
+xkeyboard-config config.status 2.25
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

Index: xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am
diff -u xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am:1.12 xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am:1.13
--- xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am:1.12	Tue Aug 29 07:46:43 2017
+++ xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am	Sun Dec 30 09:17:53 2018
@@ -31,7 +31,7 @@ ro rs ru \
 se si sk sn \
 sy th \
 terminate tg \
-tj tm tr tw tz \
+tj tm tr trans tw tz \
 ua us uz vn \
 za \
 altwin capslock compose ctrl empty eurosign rupeesign group inet \
Index: xsrc/external/mit/xkeyboard-config/dist/symbols/in
diff -u xsrc/external/mit/xkeyboard-config/dist/symbols/in:1.12 xsrc/external/mit/xkeyboard-config/dist/symbols/in:1.13
--- xsrc/external/mit/xkeyboard-config/dist/symbols/in:1.12	Sun Mar 11 20:16:25 2018
+++ xsrc/external/mit/xkeyboard-config/dist/symbols/in	Sun Dec 30 09:17:53 2018
@@ -1053,7 +1053,7 @@ xkb_symbols "ori" {
 // INSCRIPT
 partial alphanumeric_keys
 xkb_symbols "tam" {
-      name[Group1]= "Tamil";
+      name[Group1]= "Tamil (Inscript)";
 
       key <TLDE> { [      U0BCA, U0B92	]	};
 
@@ -1118,7 +1118,7 @@ xkb_symbols "tam" {
 };
 
 partial alphanumeric_keys
-xkb_symbols "tam_unicode" {
+xkb_symbols "tam_tamilnet" {
 
 // Description: A keymap based on the TamilNet'99 typewriter keyboard 
 // Encoding: Unicode (http://www.unicode.org)
@@ -1128,7 +1128,7 @@ xkb_symbols "tam_unicode" {
 // Date  : Fri Sep 4 11:32:00 CST 2009
 // Mapping:
 
-    name[Group1]= "Tamil (Unicode)";
+    name[Group1]= "Tamil (TamilNet '99)";
 
     // granthas
     key <TLDE> {  [ apostrophe, asciitilde ] };
@@ -1184,7 +1184,7 @@ xkb_symbols "tam_unicode" {
 };
 
 partial alphanumeric_keys
-xkb_symbols "tam_keyboard_with_numerals" {
+xkb_symbols "tam_tamilnet_with_tam_nums" {
 
 // Description: A keymap based on the TamilNet'99 typewriter keyboard 
 // Encoding: Unicode (http://www.unicode.org)
@@ -1193,7 +1193,7 @@ xkb_symbols "tam_keyboard_with_numerals"
 // Date  : Fri Sep 4 11:33:00 CST 2009
 // Mapping:
 
-      name[Group1]= "Tamil (keyboard with numerals)";
+      name[Group1]= "Tamil (TamilNet '99 with Tamil numerals)";
 
       // Mainly numbers.
       key <TLDE> { [ apostrophe, asciitilde ] };
@@ -1249,7 +1249,7 @@ xkb_symbols "tam_keyboard_with_numerals"
 };
 
 partial alphanumeric_keys
-xkb_symbols "tam_TSCII" {
+xkb_symbols "tam_tamilnet_TSCII" {
 
 // Description	: A Tamil typewrite-style keymap 
 //		  loosely based on TamilNet'99 reommendations 
@@ -1257,7 +1257,7 @@ xkb_symbols "tam_TSCII" {
 // Author	: Thuraiappah Vaseeharan <va...@ieee.org>
 // Last Modified: Sat Jan  5 17:11:26 CST 2002
 
-    name[Group1]= "Tamil (TSCII typewriter)";
+    name[Group1]= "Tamil (TamilNet '99, TSCII encoding)";
 
     key <AE01> {  [ 0x10000b7, 0x10000a4 ] }; // aytham
     key <AE02> {  [ 0x1000082, 0x10000a5 ] }; // shri
@@ -1305,14 +1305,14 @@ xkb_symbols "tam_TSCII" {
 };
 
 partial alphanumeric_keys
-xkb_symbols "tam_TAB" {
+xkb_symbols "tam_tamilnet_TAB" {
 
 // Description: A keymap based on the TamilNet'99 typewriter keyboard 
 // Encoding: TAB (http://www.tamilnet99.org)
 // Author: Thuraiappah Vaseeharan <t_va...@yahoo.com>
 // Date  : Sun Aug 12 02:23:00 CDT 2001
 
-    name[Group1]= "Tamil (TAB typewriter)";
+    name[Group1]= "Tamil (TamilNet '99, TAB encoding)";
 
     // numeral row
     key <AE01> {  [ 0x10000e7, 0x10000a7 ] } ;

Index: xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.in
diff -u xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.in:1.15 xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.in:1.16
--- xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.in:1.15	Sun Mar 11 20:16:25 2018
+++ xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.in	Sun Dec 30 09:17:53 2018
@@ -389,7 +389,7 @@ ro rs ru \
 se si sk sn \
 sy th \
 terminate tg \
-tj tm tr tw tz \
+tj tm tr trans tw tz \
 ua us uz vn \
 za \
 altwin capslock compose ctrl empty eurosign rupeesign group inet \

Index: xsrc/external/mit/xkeyboard-config/dist/symbols/ir
diff -u xsrc/external/mit/xkeyboard-config/dist/symbols/ir:1.9 xsrc/external/mit/xkeyboard-config/dist/symbols/ir:1.10
--- xsrc/external/mit/xkeyboard-config/dist/symbols/ir:1.9	Mon Jul 20 05:28:25 2015
+++ xsrc/external/mit/xkeyboard-config/dist/symbols/ir	Sun Dec 30 09:17:53 2018
@@ -185,16 +185,16 @@ xkb_symbols "ku_ara" {
     key <BKSL> { [ backslash,		bar,			ccedilla, Ccedilla	] };
 
     // Digits
-    key <AE01> { [ 1,	exclam,		Farsi_1,	grave		] };
-    key <AE02> { [ 2,	at, 		Farsi_2,	at		] };
-    key <AE03> { [ 3,	numbersign,	Farsi_3,	0x100066b	] };
-    key <AE04> { [ 4,	dollar,		Farsi_4, 	0x100fdfc	] };
-    key <AE05> { [ 5,	percent,	Farsi_5,	0x100066a	] };
-    key <AE06> { [ 6,	asciicircum,	Farsi_6,	multiply	] };
-    key <AE07> { [ 7,	ampersand,	Farsi_7, 	Arabic_comma	] };
-    key <AE08> { [ 8,	asterisk,	Farsi_8,	enfilledcircbullet	] };
-    key <AE09> { [ 9,	parenright,	Farsi_9,	0x100200e	] };
-    key <AE10> { [ 0,	parenleft,	Farsi_0,	0x100200f	] };
+    key <AE01> { [ 0x1000661,	exclam,		1,	grave		] };
+    key <AE02> { [ 0x1000662,	at, 		2,	at		] };
+    key <AE03> { [ 0x1000663,	numbersign,	3,	0x100066b	] };
+    key <AE04> { [ 0x1000664,	dollar,		4, 	0x100fdfc	] };
+    key <AE05> { [ 0x1000665,	percent,	5,	0x100066a	] };
+    key <AE06> { [ 0x1000666,	asciicircum,	6,	multiply	] };
+    key <AE07> { [ 0x1000667,	ampersand,	7, 	Arabic_comma	] };
+    key <AE08> { [ 0x1000668,	asterisk,	8,	enfilledcircbullet	] };
+    key <AE09> { [ 0x1000669,	parenright,	9,	0x100200e	] };
+    key <AE10> { [ 0x1000660,	parenleft,	0,	0x100200f	] };
     key <AE11> { [ minus,		Arabic_tatweel,		underscore	] };
     key <AE12> { [ equal,		plus,			0x1002212	] };
 

Index: xsrc/external/mit/xkeyboard-config/dist/symbols/lk
diff -u xsrc/external/mit/xkeyboard-config/dist/symbols/lk:1.10 xsrc/external/mit/xkeyboard-config/dist/symbols/lk:1.11
--- xsrc/external/mit/xkeyboard-config/dist/symbols/lk:1.10	Tue Aug 29 07:46:43 2017
+++ xsrc/external/mit/xkeyboard-config/dist/symbols/lk	Sun Dec 30 09:17:53 2018
@@ -78,14 +78,14 @@ xkb_symbols "sin_phonetic" {
 
 partial alphanumeric_keys
 xkb_symbols "tam_unicode" {
-    include "in(tam_unicode)"
-    name[Group1]= "Tamil (Sri Lanka, Unicode)";
+    include "in(tam_tamilnet)"
+    name[Group1]= "Tamil (Sri Lanka, TamilNet '99)";
 };
 
 partial alphanumeric_keys
 xkb_symbols "tam_TAB" {
-    include "in(tam_TAB)"
-    name[Group1]= "Tamil (Sri Lanka, TAB Typewriter)";
+    include "in(tam_tamilnet_TAB)"
+    name[Group1]= "Tamil (Sri Lanka, TamilNet '99, TAB encoding)";
 };
 
 // SINHALA - US, SUBSTITUTES SOME AND ADDS SOME

Reply via email to