Update to xkeyboard-config 2.16.

ok matthieu@

3 files changed, 14 insertions, 6 deletions

diff --git a/data/xkeyboard-config/geometry/Makefile b/data/xkeyboard-config/geometry/Makefile
index b999f493e..f92c9a3eb 100644
--- a/data/xkeyboard-config/geometry/Makefile
+++ b/data/xkeyboard-config/geometry/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.4 2012/10/06 15:41:12 shadchin Exp $
+#	$OpenBSD: Makefile,v 1.5 2015/11/14 15:30:01 shadchin Exp $
 
 SUBDIR=		digital_vndr sgi_vndr
 
@@ -6,7 +6,7 @@ XKB_SUBDIR=	geometry
 
 DATA=	amiga ataritt chicony dell everex fujitsu hhk hp keytronic kinesis \
 	macintosh microsoft nec nokia northgate pc sanwa sony thinkpad sun \
-	typematrix winbook README
+	teck typematrix winbook README
 
 .include <bsd.xorg.mk>
 .include <bsd.subdir.mk>
diff --git a/data/xkeyboard-config/man/xkeyboard-config.7 b/data/xkeyboard-config/man/xkeyboard-config.7
index f16e6f61c..b2e7c577a 100644
--- a/data/xkeyboard-config/man/xkeyboard-config.7
+++ b/data/xkeyboard-config/man/xkeyboard-config.7
@@ -1,5 +1,5 @@
 .\" WARNING: this man page is autogenerated. Do not edit or you will lose all your changes.
-.TH XKEYBOARD-CONFIG 7 "xkeyboard-config 2.14" "X Version 11"
+.TH XKEYBOARD-CONFIG 7 "xkeyboard-config 2.16" "X Version 11"
 .SH NAME
 xkeyboard-config \- XKB data description files
 .SH DESCRIPTION
@@ -198,6 +198,8 @@ unitekkb1925	Unitek KB-1925
 compalfl90	FL90
 creativedw7000	Creative Desktop Wireless 7000
 htcdream	Htc Dream phone
+teck227	Truly Ergonomic Computer Keyboard Model 227 (Wide Alt keys)
+teck229	Truly Ergonomic Computer Keyboard Model 229 (Standard sized Alt keys, additional Super and Menu key)
 
 .TE
 .SH LAYOUTS
@@ -219,7 +221,7 @@ us(dvorak-alt-intl)	English (Dvorak alternative international no dead keys)
 us(dvorak-l)	English (left handed Dvorak)
 us(dvorak-r)	English (right handed Dvorak)
 us(dvorak-classic)	English (classic Dvorak)
-us(dvp)	English (programmer Dvorak)
+us(dvp)	English (Programmer Dvorak)
 us(rus)	Russian (US, phonetic)
 us(mac)	English (Macintosh)
 us(altgr-intl)	English (international AltGr dead keys)
@@ -305,6 +307,7 @@ in(mal)	Malayalam
 in(mal_lalitha)	Malayalam (Lalitha)
 in(mal_enhanced)	Malayalam (enhanced Inscript, with rupee sign)
 in(ori)	Oriya
+in(olck)	Ol Chiki
 in(tam_unicode)	Tamil (Unicode)
 in(tam_keyboard_with_numerals)	Tamil (keyboard with numerals)
 in(tam_TAB)	Tamil (TAB typewriter)
@@ -395,6 +398,7 @@ cz(qwerty)	Czech (qwerty)
 cz(qwerty_bksl)	Czech (qwerty, extended Backslash)
 cz(ucw)	Czech (UCW layout, accented letters only)
 cz(dvorak-ucw)	Czech (US Dvorak with CZ UCW support)
+cz(rus)	Russian (Czech, phonetic)
 
 _
 dk	Danish
@@ -445,6 +449,7 @@ fi(nodeadkeys)	Finnish (classic, eliminate dead keys)
 fi(winkeys)	Finnish (Winkeys)
 fi(smi)	Northern Saami (Finland)
 fi(mac)	Finnish (Macintosh)
+fi(das)	Finnish (DAS)
 
 _
 fr	French
@@ -587,6 +592,7 @@ latam	Spanish (Latin American)
 latam(nodeadkeys)	Spanish (Latin American, eliminate dead keys)
 latam(deadtilde)	Spanish (Latin American, include dead tilde)
 latam(sundeadkeys)	Spanish (Latin American, Sun dead keys)
+latam(dvorak)	Spanish (Latin American, Dvorak)
 
 _
 lt	Lithuanian
@@ -765,6 +771,7 @@ _
 lk	Sinhala (phonetic)
 lk(tam_unicode)	Tamil (Sri Lanka, Unicode)
 lk(tam_TAB)	Tamil (Sri Lanka, TAB Typewriter)
+lk(us)	Sinhala (US keyboard with Sinhala letters)
 
 _
 th	Thai
@@ -1114,6 +1121,7 @@ altwin:meta_win	Meta is mapped to Win keys
 altwin:left_meta_win	Meta is mapped to Left Win
 altwin:hyper_win	Hyper is mapped to Win keys
 altwin:alt_super_win	Alt is mapped to Right Win, Super to Menu
+altwin:swap_lalt_lwin	Left Alt is swapped with Left Win
 altwin:swap_alt_win	Alt is swapped with Win
 
 .TE
diff --git a/data/xkeyboard-config/pc/Makefile b/data/xkeyboard-config/pc/Makefile
index cc1cdb0e8..85d8d5d1b 100644
--- a/data/xkeyboard-config/pc/Makefile
+++ b/data/xkeyboard-config/pc/Makefile
@@ -1,7 +1,7 @@
-#	$OpenBSD: Makefile,v 1.5 2015/03/30 17:11:29 shadchin Exp $
+#	$OpenBSD: Makefile,v 1.6 2015/11/14 15:30:01 shadchin Exp $
 
 XKC_TOP =		../../..
-PACKAGE_VERSION =	2.14
+PACKAGE_VERSION =	2.16
 PKGCONFIG =		xkeyboard-config.pc
 EXTRA_PKGCONFIG_SUBST =	-e 's,@VERSION@,${PACKAGE_VERSION},g' \
 			-e 's,@xkb_base@,${XKB_BASE},g'