From fe6927d79e02d01cce20ecf56c8721fcadc2d278 Mon Sep 17 00:00:00 2001 From: marha Date: Sun, 31 Jan 2010 14:39:32 +0000 Subject: svn merge ^/branches/released --- xorg-server/xkbdata.src/keymap/Makefile.in | 5 +- xorg-server/xkbdata.src/keymap/README | 2 + .../xkbdata.src/keymap/digital_vndr/Makefile.in | 5 +- xorg-server/xkbdata.src/keymap/keymap.dir | 316 ++++++++++----------- .../xkbdata.src/keymap/sgi_vndr/Makefile.in | 5 +- .../xkbdata.src/keymap/sun_vndr/Makefile.in | 5 +- xorg-server/xkbdata.src/keymap/xfree86 | 94 +++--- 7 files changed, 219 insertions(+), 213 deletions(-) (limited to 'xorg-server/xkbdata.src/keymap') diff --git a/xorg-server/xkbdata.src/keymap/Makefile.in b/xorg-server/xkbdata.src/keymap/Makefile.in index 36378f620..5093c0cf0 100644 --- a/xorg-server/xkbdata.src/keymap/Makefile.in +++ b/xorg-server/xkbdata.src/keymap/Makefile.in @@ -124,6 +124,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ POFILES = @POFILES@ @@ -204,9 +205,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu keymap/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign keymap/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu keymap/Makefile + $(AUTOMAKE) --foreign keymap/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/xorg-server/xkbdata.src/keymap/README b/xorg-server/xkbdata.src/keymap/README index bec7ed4ba..318089e09 100644 --- a/xorg-server/xkbdata.src/keymap/README +++ b/xorg-server/xkbdata.src/keymap/README @@ -2,3 +2,5 @@ The keymap component provides a way how to set up one pre-defined keyboard mapping from a given set. It has been obsoleted by 'rules' component which is simplier and more flexible. The directory is preserved for compatibility reasons. Avoid using it if it is possible. + +The keymap files are in .xkm format and useful when using xkbcomp. diff --git a/xorg-server/xkbdata.src/keymap/digital_vndr/Makefile.in b/xorg-server/xkbdata.src/keymap/digital_vndr/Makefile.in index 808af57f2..8d14c147c 100644 --- a/xorg-server/xkbdata.src/keymap/digital_vndr/Makefile.in +++ b/xorg-server/xkbdata.src/keymap/digital_vndr/Makefile.in @@ -106,6 +106,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ POFILES = @POFILES@ @@ -179,9 +180,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu keymap/digital_vndr/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign keymap/digital_vndr/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu keymap/digital_vndr/Makefile + $(AUTOMAKE) --foreign keymap/digital_vndr/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/xorg-server/xkbdata.src/keymap/keymap.dir b/xorg-server/xkbdata.src/keymap/keymap.dir index 6dbb8f1b7..7b8f07a92 100644 --- a/xorg-server/xkbdata.src/keymap/keymap.dir +++ b/xorg-server/xkbdata.src/keymap/keymap.dir @@ -1,11 +1,135 @@ -d------ -------- macintosh(macintosh) -------- -------- macintosh(macintosh_old) --------- -------- sun_vndr/de(type4_de) --------- -------- sun_vndr/de(type4_de_nodeadkeys) --------- -------- sun_vndr/de(type4_de_openlook) --d------ -------- sun_vndr/de(type5_de) --------- -------- sun_vndr/de(type5_de_nodeadkeys) --------- -------- sun_vndr/de(type5_de_openlook) +-d------ -------- xfree98(jp) +-d------ -------- sgi_vndr/fr(indy) +-------- -------- sgi_vndr/fr(indy_nodeadkeys) +-------- -------- sgi_vndr/fr(indigo) +-------- -------- sgi_vndr/fr(indigo_nodeadkeys) +-d------ -------- sgi_vndr/dvorak(indy) +-------- -------- sgi_vndr/dvorak(indigo) +-d------ -------- sgi_vndr/ch(de_indy) +-------- -------- sgi_vndr/ch(de_indy_nodeadkeys) +-------- -------- sgi_vndr/ch(de_indigo) +-------- -------- sgi_vndr/ch(de_indigo_nodeadkeys) +-------- -------- sgi_vndr/ch(fr_indy) +-------- -------- sgi_vndr/ch(fr_indy_nodeadkeys) +-------- -------- sgi_vndr/ch(fr_indigo) +-------- -------- sgi_vndr/ch(fr_indigo_nodeadkeys) +-d------ -------- sgi_vndr/pl(indy) +-------- -------- sgi_vndr/pl(indy_nodeadkeys) +-------- -------- sgi_vndr/pl(indigo) +-------- -------- sgi_vndr/pl(indigo_nodeadkeys) +-d------ -------- sgi_vndr/th(indy) +-------- -------- sgi_vndr/th(indigo) +-d------ -------- sgi_vndr/no(indy) +-------- -------- sgi_vndr/no(indy_nodeadkeys) +-------- -------- sgi_vndr/no(indigo) +-------- -------- sgi_vndr/no(indigo_nodeadkeys) +-d------ -------- sgi_vndr/es(indy) +-------- -------- sgi_vndr/es(indy_nodeadkeys) +-------- -------- sgi_vndr/es(indigo) +-------- -------- sgi_vndr/es(indigo_nodeadkeys) +-d------ -------- sgi_vndr/cz(indy) +-------- -------- sgi_vndr/cz(indigo) +-------- -------- sgi_vndr/cz(indy_qwerty) +-------- -------- sgi_vndr/cz(indigo_qwerty) +-d------ -------- sgi_vndr/hu(indy) +-------- -------- sgi_vndr/hu(indy_toggle) +-------- -------- sgi_vndr/hu(indy_shift_toggle) +-------- -------- sgi_vndr/hu(indy_ctrl_shift_toggle) +-------- -------- sgi_vndr/hu(indy_ctrl_alt_toggle) +-------- -------- sgi_vndr/hu(indy_caps_toggle) +-------- -------- sgi_vndr/hu(indigo) +-------- -------- sgi_vndr/hu(indigo_toggle) +-------- -------- sgi_vndr/hu(indigo_shift_toggle) +-------- -------- sgi_vndr/hu(indigo_ctrl_shift_toggle) +-------- -------- sgi_vndr/hu(indigo_ctrl_alt_toggle) +-------- -------- sgi_vndr/hu(indigo_caps_toggle) +-d------ -------- sgi_vndr/en_US(indy) +-------- -------- sgi_vndr/en_US(indy_nodeadkeys) +-------- -------- sgi_vndr/en_US(indy101) +-------- -------- sgi_vndr/en_US(indy101_nodeadkeys) +-------- -------- sgi_vndr/en_US(indy104) +-------- -------- sgi_vndr/en_US(indy104_nodeadkeys) +-------- -------- sgi_vndr/en_US(indigo) +-------- -------- sgi_vndr/en_US(indigo_nodeadkeys) +-d------ -------- sgi_vndr/jp(indy) +-d------ -------- sgi_vndr/gb(indy) +-------- -------- sgi_vndr/gb(indy_nodeadkeys) +-------- -------- sgi_vndr/gb(indigo) +-------- -------- sgi_vndr/gb(indigo_nodeadkeys) +-d------ -------- sgi_vndr/se(indy) +-------- -------- sgi_vndr/se(indy_nodeadkeys) +-------- -------- sgi_vndr/se(indigo) +-------- -------- sgi_vndr/se(indigo_nodeadkeys) +-d------ -------- sgi_vndr/dk(indy) +-------- -------- sgi_vndr/dk(indy_nodeadkeys) +-------- -------- sgi_vndr/dk(indigo) +-------- -------- sgi_vndr/dk(indigo_nodeadkeys) +-d------ -------- sgi_vndr/sk(indy) +-------- -------- sgi_vndr/sk(indigo) +-------- -------- sgi_vndr/sk(indy_qwerty) +-------- -------- sgi_vndr/sk(indigo_qwerty) +-d------ -------- sgi_vndr/pt(indy) +-------- -------- sgi_vndr/pt(indy_nodeadkeys) +-------- -------- sgi_vndr/pt(indigo) +-------- -------- sgi_vndr/pt(indigo_nodeadkeys) +-d------ -------- sgi_vndr/us(indy) +-------- -------- sgi_vndr/us(indy101_euro) +-------- -------- sgi_vndr/us(indy_compose) +-------- -------- sgi_vndr/us(indigo) +-------- -------- sgi_vndr/us(indigo_compose) +-------- -------- sgi_vndr/us(indigo101_compose) +-d------ -------- sgi_vndr/ca(indy) +-------- -------- sgi_vndr/ca(indy_nodeadkeys) +-------- -------- sgi_vndr/ca(indigo) +-------- -------- sgi_vndr/ca(indigo_nodeadkeys) +-d------ -------- sgi_vndr/de(indy) +-------- -------- sgi_vndr/de(indy_nodeadkeys) +-------- -------- sgi_vndr/de(indigo) +-------- -------- sgi_vndr/de(indigo_nodeadkeys) +-d------ -------- sgi_vndr/it(indy) +-------- -------- sgi_vndr/it(indy_nodeadkeys) +-------- -------- sgi_vndr/it(indigo) +-------- -------- sgi_vndr/it(indigo_nodeadkeys) +-d------ -------- sgi_vndr/bg(indy) +-------- -------- sgi_vndr/bg(indigo) +-d------ -------- sgi_vndr/be(indy) +-------- -------- sgi_vndr/be(indy_nodeadkeys) +-------- -------- sgi_vndr/be(indigo) +-------- -------- sgi_vndr/be(indigo_nodeadkeys) +-d------ -------- sgi_vndr/ru(indy) +-------- -------- sgi_vndr/ru(indy_toggle) +-------- -------- sgi_vndr/ru(indy_shift_toggle) +-------- -------- sgi_vndr/ru(indy_ctrl_shift_toggle) +-------- -------- sgi_vndr/ru(indy_ctrl_alt_toggle) +-------- -------- sgi_vndr/ru(indy_caps_toggle) +-------- -------- sgi_vndr/ru(indigo) +-------- -------- sgi_vndr/ru(indigo_toggle) +-------- -------- sgi_vndr/ru(indigo_shift_toggle) +-------- -------- sgi_vndr/ru(indigo_ctrl_shift_toggle) +-------- -------- sgi_vndr/ru(indigo_ctrl_alt_toggle) +-------- -------- sgi_vndr/ru(indigo_caps_toggle) +-d------ -------- sgi_vndr/fi(indy) +-------- -------- sgi_vndr/fi(indy_nodeadkeys) +-------- -------- sgi_vndr/fi(indigo) +-------- -------- sgi_vndr/fi(indigo_nodeadkeys) +-------- -------- sun_vndr/fr(type4_fr) +-------- -------- sun_vndr/fr(type4_fr_openlook) +-d------ -------- sun_vndr/fr(type5_fr) +-------- -------- sun_vndr/fr(type5_fr_openlook) +-------- -------- sun_vndr/pl(type4_pl) +-------- -------- sun_vndr/pl(type4_pl_openlook) +-d------ -------- sun_vndr/pl(type5_pl) +-------- -------- sun_vndr/pl(type5_pl_openlook) +-------- -------- sun_vndr/no(type4_no) +-------- -------- sun_vndr/no(type4_no_openlook) +-d------ -------- sun_vndr/no(type5_no) +-------- -------- sun_vndr/no(type5_no_openlook) +-------- -------- sun_vndr/es(type4_es) +-------- -------- sun_vndr/es(type4_es_openlook) +-d------ -------- sun_vndr/es(type5_es) +-------- -------- sun_vndr/es(type5_es_openlook) -------- -------- sun_vndr/all(Belgian6) -------- -------- sun_vndr/all(Belgian6_usb) -------- -------- sun_vndr/all(Canada4) @@ -140,22 +264,6 @@ -------- -------- sun_vndr/uk(type4_uk_openlook) -d------ -------- sun_vndr/uk(type5_uk) -------- -------- sun_vndr/uk(type5_uk_openlook) --------- -------- sun_vndr/fi(type4_fi) --------- -------- sun_vndr/fi(type4_fi_openlook) --d------ -------- sun_vndr/fi(type5_fi) --------- -------- sun_vndr/fi(type5_fi_openlook) --------- -------- sun_vndr/no(type4_no) --------- -------- sun_vndr/no(type4_no_openlook) --d------ -------- sun_vndr/no(type5_no) --------- -------- sun_vndr/no(type5_no_openlook) --------- -------- sun_vndr/pl(type4_pl) --------- -------- sun_vndr/pl(type4_pl_openlook) --d------ -------- sun_vndr/pl(type5_pl) --------- -------- sun_vndr/pl(type5_pl_openlook) --------- -------- sun_vndr/fr(type4_fr) --------- -------- sun_vndr/fr(type4_fr_openlook) --d------ -------- sun_vndr/fr(type5_fr) --------- -------- sun_vndr/fr(type5_fr_openlook) -d------ -------- sun_vndr/se(type5c_se_fixdollar) -------- -------- sun_vndr/se(type5c_se) -------- -------- sun_vndr/se(type5_se) @@ -168,147 +276,21 @@ -------- -------- sun_vndr/us(type5_us_openlook) -------- -------- sun_vndr/us(type5_unix) -------- -------- sun_vndr/us(type5_unix_openlook) --------- -------- sun_vndr/es(type4_es) --------- -------- sun_vndr/es(type4_es_openlook) --d------ -------- sun_vndr/es(type5_es) --------- -------- sun_vndr/es(type5_es_openlook) +-------- -------- sun_vndr/de(type4_de) +-------- -------- sun_vndr/de(type4_de_nodeadkeys) +-------- -------- sun_vndr/de(type4_de_openlook) +-d------ -------- sun_vndr/de(type5_de) +-------- -------- sun_vndr/de(type5_de_nodeadkeys) +-------- -------- sun_vndr/de(type5_de_openlook) -------- -------- sun_vndr/ru(type4_ru) -------- -------- sun_vndr/ru(type4_ru_openlook) -d------ -------- sun_vndr/ru(type5_ru) -------- -------- sun_vndr/ru(type5_ru_openlook) +-------- -------- sun_vndr/fi(type4_fi) +-------- -------- sun_vndr/fi(type4_fi_openlook) +-d------ -------- sun_vndr/fi(type5_fi) +-------- -------- sun_vndr/fi(type5_fi_openlook) -------- -------- sony(news5000-nwp5461) --d------ -------- xfree98(jp) --d------ -------- amiga(usa1) --------- -------- amiga(de) --d------ -------- sgi_vndr/de(indy) --------- -------- sgi_vndr/de(indy_nodeadkeys) --------- -------- sgi_vndr/de(indigo) --------- -------- sgi_vndr/de(indigo_nodeadkeys) --d------ -------- sgi_vndr/fi(indy) --------- -------- sgi_vndr/fi(indy_nodeadkeys) --------- -------- sgi_vndr/fi(indigo) --------- -------- sgi_vndr/fi(indigo_nodeadkeys) --d------ -------- sgi_vndr/be(indy) --------- -------- sgi_vndr/be(indy_nodeadkeys) --------- -------- sgi_vndr/be(indigo) --------- -------- sgi_vndr/be(indigo_nodeadkeys) --d------ -------- sgi_vndr/dk(indy) --------- -------- sgi_vndr/dk(indy_nodeadkeys) --------- -------- sgi_vndr/dk(indigo) --------- -------- sgi_vndr/dk(indigo_nodeadkeys) --d------ -------- sgi_vndr/hu(indy) --------- -------- sgi_vndr/hu(indy_toggle) --------- -------- sgi_vndr/hu(indy_shift_toggle) --------- -------- sgi_vndr/hu(indy_ctrl_shift_toggle) --------- -------- sgi_vndr/hu(indy_ctrl_alt_toggle) --------- -------- sgi_vndr/hu(indy_caps_toggle) --------- -------- sgi_vndr/hu(indigo) --------- -------- sgi_vndr/hu(indigo_toggle) --------- -------- sgi_vndr/hu(indigo_shift_toggle) --------- -------- sgi_vndr/hu(indigo_ctrl_shift_toggle) --------- -------- sgi_vndr/hu(indigo_ctrl_alt_toggle) --------- -------- sgi_vndr/hu(indigo_caps_toggle) --d------ -------- sgi_vndr/cz(indy) --------- -------- sgi_vndr/cz(indigo) --------- -------- sgi_vndr/cz(indy_qwerty) --------- -------- sgi_vndr/cz(indigo_qwerty) --d------ -------- sgi_vndr/bg(indy) --------- -------- sgi_vndr/bg(indigo) --d------ -------- sgi_vndr/sk(indy) --------- -------- sgi_vndr/sk(indigo) --------- -------- sgi_vndr/sk(indy_qwerty) --------- -------- sgi_vndr/sk(indigo_qwerty) --d------ -------- sgi_vndr/en_US(indy) --------- -------- sgi_vndr/en_US(indy_nodeadkeys) --------- -------- sgi_vndr/en_US(indy101) --------- -------- sgi_vndr/en_US(indy101_nodeadkeys) --------- -------- sgi_vndr/en_US(indy104) --------- -------- sgi_vndr/en_US(indy104_nodeadkeys) --------- -------- sgi_vndr/en_US(indigo) --------- -------- sgi_vndr/en_US(indigo_nodeadkeys) --d------ -------- sgi_vndr/jp(indy) --d------ -------- sgi_vndr/no(indy) --------- -------- sgi_vndr/no(indy_nodeadkeys) --------- -------- sgi_vndr/no(indigo) --------- -------- sgi_vndr/no(indigo_nodeadkeys) --d------ -------- sgi_vndr/pl(indy) --------- -------- sgi_vndr/pl(indy_nodeadkeys) --------- -------- sgi_vndr/pl(indigo) --------- -------- sgi_vndr/pl(indigo_nodeadkeys) --d------ -------- sgi_vndr/gb(indy) --------- -------- sgi_vndr/gb(indy_nodeadkeys) --------- -------- sgi_vndr/gb(indigo) --------- -------- sgi_vndr/gb(indigo_nodeadkeys) --d------ -------- sgi_vndr/ch(de_indy) --------- -------- sgi_vndr/ch(de_indy_nodeadkeys) --------- -------- sgi_vndr/ch(de_indigo) --------- -------- sgi_vndr/ch(de_indigo_nodeadkeys) --------- -------- sgi_vndr/ch(fr_indy) --------- -------- sgi_vndr/ch(fr_indy_nodeadkeys) --------- -------- sgi_vndr/ch(fr_indigo) --------- -------- sgi_vndr/ch(fr_indigo_nodeadkeys) --d------ -------- sgi_vndr/pt(indy) --------- -------- sgi_vndr/pt(indy_nodeadkeys) --------- -------- sgi_vndr/pt(indigo) --------- -------- sgi_vndr/pt(indigo_nodeadkeys) --d------ -------- sgi_vndr/ca(indy) --------- -------- sgi_vndr/ca(indy_nodeadkeys) --------- -------- sgi_vndr/ca(indigo) --------- -------- sgi_vndr/ca(indigo_nodeadkeys) --d------ -------- sgi_vndr/fr(indy) --------- -------- sgi_vndr/fr(indy_nodeadkeys) --------- -------- sgi_vndr/fr(indigo) --------- -------- sgi_vndr/fr(indigo_nodeadkeys) --d------ -------- sgi_vndr/se(indy) --------- -------- sgi_vndr/se(indy_nodeadkeys) --------- -------- sgi_vndr/se(indigo) --------- -------- sgi_vndr/se(indigo_nodeadkeys) --d------ -------- sgi_vndr/us(indy) --------- -------- sgi_vndr/us(indy101_euro) --------- -------- sgi_vndr/us(indy_compose) --------- -------- sgi_vndr/us(indigo) --------- -------- sgi_vndr/us(indigo_compose) --------- -------- sgi_vndr/us(indigo101_compose) --d------ -------- sgi_vndr/dvorak(indy) --------- -------- sgi_vndr/dvorak(indigo) --d------ -------- sgi_vndr/es(indy) --------- -------- sgi_vndr/es(indy_nodeadkeys) --------- -------- sgi_vndr/es(indigo) --------- -------- sgi_vndr/es(indigo_nodeadkeys) --d------ -------- sgi_vndr/it(indy) --------- -------- sgi_vndr/it(indy_nodeadkeys) --------- -------- sgi_vndr/it(indigo) --------- -------- sgi_vndr/it(indigo_nodeadkeys) --d------ -------- sgi_vndr/th(indy) --------- -------- sgi_vndr/th(indigo) --d------ -------- sgi_vndr/ru(indy) --------- -------- sgi_vndr/ru(indy_toggle) --------- -------- sgi_vndr/ru(indy_shift_toggle) --------- -------- sgi_vndr/ru(indy_ctrl_shift_toggle) --------- -------- sgi_vndr/ru(indy_ctrl_alt_toggle) --------- -------- sgi_vndr/ru(indy_caps_toggle) --------- -------- sgi_vndr/ru(indigo) --------- -------- sgi_vndr/ru(indigo_toggle) --------- -------- sgi_vndr/ru(indigo_shift_toggle) --------- -------- sgi_vndr/ru(indigo_ctrl_shift_toggle) --------- -------- sgi_vndr/ru(indigo_ctrl_alt_toggle) --------- -------- sgi_vndr/ru(indigo_caps_toggle) --------- -------- digital_vndr/us(lk201) --------- -------- digital_vndr/us(lk401) --------- -------- digital_vndr/us(lk411) --------- -------- digital_vndr/us(lk421) --------- -------- digital_vndr/us(lk441) --------- -------- digital_vndr/us(lk443) --------- -------- digital_vndr/us(lk44x) --------- -------- digital_vndr/us(lk450) --------- -------- digital_vndr/us(pcxalaa) --------- -------- digital_vndr/us(pcxalfa) --------- -------- digital_vndr/us(pcxalga) --------- -------- digital_vndr/us(pcxalka) --------- -------- digital_vndr/us(pcxal) --------- -------- digital_vndr/us(mnk) --d------ -------- ataritt(us) --------- -------- ataritt(de) -d------ -------- xfree86(us) -------- -------- xfree86(ar) -------- -------- xfree86(be) @@ -360,3 +342,21 @@ -------- -------- xfree86(fr_CH) -------- -------- xfree86(mt_us) -------- -------- xfree86(sk_qwerty) +-d------ -------- ataritt(us) +-------- -------- ataritt(de) +-------- -------- digital_vndr/us(lk201) +-------- -------- digital_vndr/us(lk401) +-------- -------- digital_vndr/us(lk411) +-------- -------- digital_vndr/us(lk421) +-------- -------- digital_vndr/us(lk441) +-------- -------- digital_vndr/us(lk443) +-------- -------- digital_vndr/us(lk44x) +-------- -------- digital_vndr/us(lk450) +-------- -------- digital_vndr/us(pcxalaa) +-------- -------- digital_vndr/us(pcxalfa) +-------- -------- digital_vndr/us(pcxalga) +-------- -------- digital_vndr/us(pcxalka) +-------- -------- digital_vndr/us(pcxal) +-------- -------- digital_vndr/us(mnk) +-d------ -------- amiga(usa1) +-------- -------- amiga(de) diff --git a/xorg-server/xkbdata.src/keymap/sgi_vndr/Makefile.in b/xorg-server/xkbdata.src/keymap/sgi_vndr/Makefile.in index 9afff68fc..cf57eff11 100644 --- a/xorg-server/xkbdata.src/keymap/sgi_vndr/Makefile.in +++ b/xorg-server/xkbdata.src/keymap/sgi_vndr/Makefile.in @@ -106,6 +106,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ POFILES = @POFILES@ @@ -187,9 +188,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu keymap/sgi_vndr/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign keymap/sgi_vndr/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu keymap/sgi_vndr/Makefile + $(AUTOMAKE) --foreign keymap/sgi_vndr/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/xorg-server/xkbdata.src/keymap/sun_vndr/Makefile.in b/xorg-server/xkbdata.src/keymap/sun_vndr/Makefile.in index e728e0869..5700331a2 100644 --- a/xorg-server/xkbdata.src/keymap/sun_vndr/Makefile.in +++ b/xorg-server/xkbdata.src/keymap/sun_vndr/Makefile.in @@ -106,6 +106,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ POFILES = @POFILES@ @@ -182,9 +183,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu keymap/sun_vndr/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign keymap/sun_vndr/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu keymap/sun_vndr/Makefile + $(AUTOMAKE) --foreign keymap/sun_vndr/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/xorg-server/xkbdata.src/keymap/xfree86 b/xorg-server/xkbdata.src/keymap/xfree86 index e4255a633..8686f78d8 100644 --- a/xorg-server/xkbdata.src/keymap/xfree86 +++ b/xorg-server/xkbdata.src/keymap/xfree86 @@ -5,7 +5,7 @@ default xkb_keymap "us" { xkb_keycodes { include "xfree86" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "us(pc105)" }; + xkb_symbols { include "pc(pc105)" }; xkb_geometry { include "pc" }; }; @@ -14,21 +14,21 @@ xkb_keymap "ar" { xkb_keycodes { include "xfree86" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "en_US(pc105)+ar" }; + xkb_symbols { include "pc(pc105)+ara" }; xkb_geometry { include "pc(pc102)" }; }; xkb_keymap "be" { xkb_keycodes { include "xfree86" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "en_US(pc105)+be" }; + xkb_symbols { include "pc(pc105)+be" }; xkb_geometry { include "pc(pc102)" }; }; xkb_keymap "bg" { xkb_keycodes { include "xfree86" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "en_US(pc105)+bg" }; + xkb_symbols { include "pc(pc105)+bg" }; xkb_geometry { include "pc(pc102)" }; }; // us_intl and br by Ricardo Y. Igarashi (iga@that.com.br) @@ -36,7 +36,7 @@ xkb_keymap "br" { xkb_keycodes { include "xfree86" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "us(pc101)+br" }; + xkb_symbols { include "pc(pc105)+br" }; xkb_geometry { include "pc(abnt2)" }; }; // cz and sk keymaps by Kamil Toman (ktoman@email.cz) @@ -46,98 +46,98 @@ xkb_keymap "cz" { xkb_keycodes { include "xfree86" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "en_US(pc105)+cz" }; + xkb_symbols { include "pc(pc105)+cz" }; xkb_geometry { include "pc" }; }; xkb_keymap "de" { xkb_keycodes { include "xfree86" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "en_US(pc105)+de" }; + xkb_symbols { include "pc(pc105)+de" }; xkb_geometry { include "pc(pc102)" }; }; xkb_keymap "ch_de" { xkb_keycodes { include "xfree86" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "en_US(pc105)+ch(de)" }; + xkb_symbols { include "pc(pc105)+ch(de)" }; xkb_geometry { include "pc(pc102)" }; }; xkb_keymap "ch_fr" { xkb_keycodes { include "xfree86" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "en_US(pc105)+ch(fr)" }; + xkb_symbols { include "pc(pc105)+ch(fr)" }; xkb_geometry { include "pc(pc102)" }; }; xkb_keymap "dk" { xkb_keycodes { include "xfree86" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "en_US(pc105)+dk" }; + xkb_symbols { include "pc(pc105)+dk" }; xkb_geometry { include "pc(pc102)" }; }; xkb_keymap "dvorak" { xkb_keycodes { include "xfree86" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "en_US(pc105)+dvorak" }; + xkb_symbols { include "pc(pc105)+us(dvorak)"}; xkb_geometry { include "pc(pc102)" }; }; xkb_keymap "en_US" { xkb_keycodes { include "xfree86" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "en_US(pc105)" }; + xkb_symbols { include "pc(pc105)" }; xkb_geometry { include "pc" }; }; xkb_keymap "es" { xkb_keycodes { include "xfree86" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "en_US(pc105)+es" }; + xkb_symbols { include "pc(pc105)+es" }; xkb_geometry { include "pc(pc102)" }; }; xkb_keymap "fr" { xkb_keycodes { include "xfree86" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "en_US(pc105)+fr" }; + xkb_symbols { include "pc(pc105)+fr" }; xkb_geometry { include "pc(pc102)" }; }; xkb_keymap "fr-latin9" { xkb_keycodes { include "xfree86" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "en_US(pc105)+fr-latin9" }; + xkb_symbols { include "pc(pc105)+fr-latin9" }; xkb_geometry { include "pc" }; }; xkb_keymap "fr_CA" { xkb_keycodes { include "xfree86" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "en_US(pc105)+ca" }; + xkb_symbols { include "pc(pc105)+ca" }; xkb_geometry { include "pc(pc102)" }; }; xkb_keymap "gb" { xkb_keycodes { include "xfree86" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "en_US(pc105)+gb" }; + xkb_symbols { include "pc(pc105)+gb" }; xkb_geometry { include "pc(pc102)" }; }; xkb_keymap "hr" { xkb_keycodes { include "xfree86" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "en_US(pc105)+hr" }; + xkb_symbols { include "pc(pc105)+hr" }; xkb_geometry { include "pc(pc102)" }; }; xkb_keymap "it" { xkb_keycodes { include "xfree86" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "en_US(pc105)+it" }; + xkb_symbols { include "pc(pc105)+it" }; xkb_geometry { include "pc(pc102)" }; }; xkb_keymap "jp106" { @@ -151,56 +151,56 @@ xkb_keymap "lt" { xkb_keycodes { include "xfree86" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "en_US(pc105)+lt" }; + xkb_symbols { include "pc(pc105)+lt" }; xkb_geometry { include "pc(pc102)" }; }; xkb_keymap "lt_std" { xkb_keycodes { include "xfree86" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "en_US(pc105)+lt_std" }; + xkb_symbols { include "pc(pc105)+lt(std)" }; xkb_geometry { include "pc(pc102)" }; }; xkb_keymap "lv" { xkb_keycodes { include "xfree86" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "en_US(pc105)+lv" }; + xkb_symbols { include "pc(pc105)+lv" }; xkb_geometry { include "pc(pc102)" }; }; xkb_keymap "mk" { xkb_keycodes { include "xfree86" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "en_US(pc105)+mk" }; + xkb_symbols { include "pc(pc105)+mk" }; xkb_geometry { include "pc(pc102)" }; }; xkb_keymap "mt" { xkb_keycodes { include "xfree86" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "en_US(pc105)+mt" }; + xkb_symbols { include "pc(pc105)+mt" }; xkb_geometry { include "pc(pc102)" }; }; xkb_keymap "no" { xkb_keycodes { include "xfree86" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "en_US(pc105)+no" }; + xkb_symbols { include "pc(pc105)+no" }; xkb_geometry { include "pc(pc102)" }; }; xkb_keymap "pl" { xkb_keycodes { include "xfree86" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "en_US(pc105)+pl" }; + xkb_symbols { include "pc(pc105)+pl" }; xkb_geometry { include "pc(pc102)" }; }; xkb_keymap "pt" { xkb_keycodes { include "xfree86" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "en_US(pc105)+pt" }; + xkb_symbols { include "pc(pc105)+pt" }; xkb_geometry { include "pc(pc102)" }; }; // ro: additions by Cristian Gafton, @@ -208,49 +208,49 @@ xkb_keymap "ro" { xkb_keycodes { include "xfree86" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "en_US(pc101)+ro(pc101)" }; + xkb_symbols { include "pc(pc105)+ro(pc101)" }; xkb_geometry { include "pc(pc101)" }; }; xkb_keymap "ro_microsoft" { xkb_keycodes { include "xfree86" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "en_US(pc105)+ro(pc105)" }; + xkb_symbols { include "pc(pc105)+ro(pc105)" }; xkb_geometry { include "pc(pc105)" }; }; xkb_keymap "ru" { xkb_keycodes { include "xfree86" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "en_US(pc105)+ru" }; + xkb_symbols { include "pc(pc105)+ru" }; xkb_geometry { include "pc(pc102)" }; }; xkb_keymap "se_FI" { xkb_keycodes { include "xfree86" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "en_US(pc105)+fi" }; + xkb_symbols { include "pc(pc105)+fi" }; xkb_geometry { include "pc(pc102)" }; }; xkb_keymap "se_SE" { xkb_keycodes { include "xfree86" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "en_US(pc105)+se" }; + xkb_symbols { include "pc(pc105)+se" }; xkb_geometry { include "pc(pc102)" }; }; xkb_keymap "sl" { xkb_keycodes { include "xfree86" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "en_US(pc105)+si" }; + xkb_symbols { include "pc(pc105)+si" }; xkb_geometry { include "pc(pc102)" }; }; xkb_keymap "sl_SI" { xkb_keycodes { include "xfree86" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "en_US(pc105)+si" }; + xkb_symbols { include "pc(pc105)+si" }; xkb_geometry { include "pc(pc102)" }; }; // cz and sk keymaps by Kamil Toman (ktoman@email.cz) @@ -260,7 +260,7 @@ xkb_keymap "sk" { xkb_keycodes { include "xfree86" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "en_US(pc105)+sk" }; + xkb_symbols { include "pc(pc105)+sk" }; xkb_geometry { include "pc" }; }; // Additions by Emil Soleyman-Zomalan, @@ -268,42 +268,42 @@ xkb_keymap "syr" { xkb_keycodes { include "xfree86" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "en_US(pc105)+syr" }; + xkb_symbols { include "pc(pc105)+syr" }; xkb_geometry { include "pc(pc102)" }; }; xkb_keymap "th" { xkb_keycodes { include "xfree86" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "en_US(pc105)+th" }; + xkb_symbols { include "pc(pc105)+th" }; xkb_geometry { include "pc(pc102)" }; }; xkb_keymap "th_tis" { xkb_keycodes { include "xfree86" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "en_US(pc105)+th_tis" }; + xkb_symbols { include "pc(pc105)+th(tis)" }; xkb_geometry { include "pc(pc102)" }; }; xkb_keymap "th_pat" { xkb_keycodes { include "xfree86" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "en_US(pc105)+th_pat" }; + xkb_symbols { include "pc(pc105)+th(pat)" }; xkb_geometry { include "pc(pc102)" }; }; xkb_keymap "tr" { xkb_keycodes { include "xfree86" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "en_US(pc105)+tr" }; + xkb_symbols { include "pc(pc105)+tr" }; xkb_geometry { include "pc(pc102)" }; }; xkb_keymap "uk" { xkb_keycodes { include "xfree86" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "en_US(pc105)+uk)" }; + xkb_symbols { include "pc(pc105)+uk)" }; xkb_geometry { include "pc(pc102)" }; }; xkb_keymap "us_flexpro" { @@ -335,7 +335,7 @@ xkb_keymap "uz" { xkb_keycodes { include "xfree86" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "en_US(pc105)+uz" }; + xkb_symbols { include "pc(pc105)+uz" }; xkb_geometry { include "pc(pc102)" }; }; @@ -344,34 +344,34 @@ xkb_keymap "cz_qwerty" { xkb_keycodes { include "xfree86" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "en_US(pc105)+cz(qwerty)" }; + xkb_symbols { include "pc(pc105)+cz(qwerty)" }; xkb_geometry { include "pc" }; }; xkb_keymap "de_CH" { xkb_keycodes { include "xfree86" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "en_US(pc105)+ch(de)" }; + xkb_symbols { include "pc(pc105)+ch(de)" }; xkb_geometry { include "pc(pc102)" }; }; xkb_keymap "fr_CH" { xkb_keycodes { include "xfree86" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "en_US(pc105)+ch(fr)" }; + xkb_symbols { include "pc(pc105)+ch(fr)" }; xkb_geometry { include "pc(pc102)" }; }; xkb_keymap "mt_us" { xkb_keycodes { include "xfree86" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "en_US(pc105)+mt(us)" }; + xkb_symbols { include "pc(pc105)+mt(us)" }; xkb_geometry { include "pc(pc102)" }; }; xkb_keymap "sk_qwerty" { xkb_keycodes { include "xfree86" }; xkb_types { include "default" }; xkb_compatibility { include "default" }; - xkb_symbols { include "en_US(pc105)+sk(qwerty)" }; + xkb_symbols { include "pc(pc105)+sk(qwerty)" }; xkb_geometry { include "pc" }; }; -- cgit v1.2.3