[xsrc/trunk]: xsrc/external/mit/xkeyboard-config/dist merge xkeyboard-config ...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/xsrc/rev/07672605945d
branches:  trunk
changeset: 10050:07672605945d
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sun Dec 30 09:17:52 2018 +0000

description:
merge xkeyboard-config 2.25.

diffstat:

 external/mit/xkeyboard-config/dist/config.guess        |   2 +-
 external/mit/xkeyboard-config/dist/config.sub          |   2 +-
 external/mit/xkeyboard-config/dist/configure           |  20 +++++++++---------
 external/mit/xkeyboard-config/dist/symbols/Makefile.am |   2 +-
 external/mit/xkeyboard-config/dist/symbols/Makefile.in |   2 +-
 external/mit/xkeyboard-config/dist/symbols/in          |  18 ++++++++--------
 external/mit/xkeyboard-config/dist/symbols/ir          |  20 +++++++++---------
 external/mit/xkeyboard-config/dist/symbols/lk          |   8 +++---
 8 files changed, 37 insertions(+), 37 deletions(-)

diffs (262 lines):

diff -r 273f8992d0df -r 07672605945d external/mit/xkeyboard-config/dist/config.guess
--- a/external/mit/xkeyboard-config/dist/config.guess   Sun Dec 30 09:16:59 2018 +0000
+++ b/external/mit/xkeyboard-config/dist/config.guess   Sun Dec 30 09:17:52 2018 +0000
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright 1992-2017 Free Software Foundation, Inc.
 
diff -r 273f8992d0df -r 07672605945d external/mit/xkeyboard-config/dist/config.sub
--- a/external/mit/xkeyboard-config/dist/config.sub     Sun Dec 30 09:16:59 2018 +0000
+++ b/external/mit/xkeyboard-config/dist/config.sub     Sun Dec 30 09:17:52 2018 +0000
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
 # Configuration validation subroutine script.
 #   Copyright 1992-2017 Free Software Foundation, Inc.
 
diff -r 273f8992d0df -r 07672605945d external/mit/xkeyboard-config/dist/configure
--- a/external/mit/xkeyboard-config/dist/configure      Sun Dec 30 09:16:59 2018 +0000
+++ b/external/mit/xkeyboard-config/dist/configure      Sun Dec 30 09:17:52 2018 +0000
@@ -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 @@
 # 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 @@
   # 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 @@
 
 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 @@
 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 @@
 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 @@
 
 # Define the identity of the package.
  PACKAGE='xkeyboard-config'
- VERSION='2.23.1'
+ VERSION='2.25'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -7406,7 +7406,7 @@
 # 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 @@
 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\\"
 
diff -r 273f8992d0df -r 07672605945d external/mit/xkeyboard-config/dist/symbols/Makefile.am
--- a/external/mit/xkeyboard-config/dist/symbols/Makefile.am    Sun Dec 30 09:16:59 2018 +0000
+++ b/external/mit/xkeyboard-config/dist/symbols/Makefile.am    Sun Dec 30 09:17:52 2018 +0000
@@ -31,7 +31,7 @@
 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 \
diff -r 273f8992d0df -r 07672605945d external/mit/xkeyboard-config/dist/symbols/Makefile.in
--- a/external/mit/xkeyboard-config/dist/symbols/Makefile.in    Sun Dec 30 09:16:59 2018 +0000
+++ b/external/mit/xkeyboard-config/dist/symbols/Makefile.in    Sun Dec 30 09:17:52 2018 +0000
@@ -389,7 +389,7 @@
 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 \
diff -r 273f8992d0df -r 07672605945d external/mit/xkeyboard-config/dist/symbols/in
--- a/external/mit/xkeyboard-config/dist/symbols/in     Sun Dec 30 09:16:59 2018 +0000
+++ b/external/mit/xkeyboard-config/dist/symbols/in     Sun Dec 30 09:17:52 2018 +0000
@@ -1053,7 +1053,7 @@
 // INSCRIPT
 partial alphanumeric_keys
 xkb_symbols "tam" {
-      name[Group1]= "Tamil";
+      name[Group1]= "Tamil (Inscript)";
 
       key <TLDE> { [      U0BCA, U0B92 ]       };
 
@@ -1118,7 +1118,7 @@
 };
 
 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 @@
 // 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 @@
 };
 
 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 @@
 // 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 @@
 };
 
 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 @@
 // Author      : Thuraiappah Vaseeharan <vasee%ieee.org@localhost>
 // 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 @@
 };
 
 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_vasee%yahoo.com@localhost>
 // 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 ] } ;
diff -r 273f8992d0df -r 07672605945d external/mit/xkeyboard-config/dist/symbols/ir
--- a/external/mit/xkeyboard-config/dist/symbols/ir     Sun Dec 30 09:16:59 2018 +0000
+++ b/external/mit/xkeyboard-config/dist/symbols/ir     Sun Dec 30 09:17:52 2018 +0000
@@ -185,16 +185,16 @@
     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       ] };
 
diff -r 273f8992d0df -r 07672605945d external/mit/xkeyboard-config/dist/symbols/lk
--- a/external/mit/xkeyboard-config/dist/symbols/lk     Sun Dec 30 09:16:59 2018 +0000
+++ b/external/mit/xkeyboard-config/dist/symbols/lk     Sun Dec 30 09:17:52 2018 +0000
@@ -78,14 +78,14 @@
 
 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