From f3d88db0960f1c23e55f2529764b096ac92d78d9 Mon Sep 17 00:00:00 2001 From: marha Date: Sun, 20 Sep 2009 15:09:14 +0000 Subject: Switched to xkeyboard-config-1.6.99 --- xorg-server/xkbdata.src/rules/Makefile.am | 165 +++++---- xorg-server/xkbdata.src/rules/Makefile.in | 207 +++++++----- xorg-server/xkbdata.src/rules/base.extras.xml.in | 69 ++++ xorg-server/xkbdata.src/rules/base.lists.part | 5 +- xorg-server/xkbdata.src/rules/base.m_g.part | 1 + xorg-server/xkbdata.src/rules/base.m_k.part | 1 + xorg-server/xkbdata.src/rules/base.ml1_s.part | 4 +- xorg-server/xkbdata.src/rules/base.ml_s.part | 3 + xorg-server/xkbdata.src/rules/base.o_s.part | 4 + xorg-server/xkbdata.src/rules/base.xml.in | 110 +++++- xorg-server/xkbdata.src/rules/bin/Makefile.am | 10 + xorg-server/xkbdata.src/rules/bin/Makefile.in | 326 ++++++++++++++++++ xorg-server/xkbdata.src/rules/bin/ln_s.sh | 20 ++ xorg-server/xkbdata.src/rules/bin/lnv_s.sh | 12 + xorg-server/xkbdata.src/rules/bin/ml1_s.sh | 18 + xorg-server/xkbdata.src/rules/bin/ml1v1_s.sh | 10 + xorg-server/xkbdata.src/rules/bin/ml1v_s.sh | 10 + xorg-server/xkbdata.src/rules/bin/ml_s.sh | 14 + xorg-server/xkbdata.src/rules/bin/mlv_s.sh | 10 + xorg-server/xkbdata.src/rules/compat/Makefile.am | 55 ++- xorg-server/xkbdata.src/rules/compat/Makefile.in | 54 ++- .../xkbdata.src/rules/compat/layoutRename.lst | 27 -- .../xkbdata.src/rules/compat/layoutsMapping.lst | 27 ++ xorg-server/xkbdata.src/rules/compat/ln_s.sh | 20 -- xorg-server/xkbdata.src/rules/compat/lnv_s.sh | 12 - xorg-server/xkbdata.src/rules/compat/ml1_s.sh | 18 - xorg-server/xkbdata.src/rules/compat/ml1v1_s.sh | 10 - xorg-server/xkbdata.src/rules/compat/ml1v_s.sh | 10 - xorg-server/xkbdata.src/rules/compat/ml_s.sh | 14 - xorg-server/xkbdata.src/rules/compat/mlv_s.sh | 10 - .../xkbdata.src/rules/compat/variantRename.lst | 49 --- .../xkbdata.src/rules/compat/variantsMapping.lst | 50 +++ xorg-server/xkbdata.src/rules/evdev.extras.xml.in | 69 ++++ xorg-server/xkbdata.src/rules/evdev.xml.in | 110 +++++- xorg-server/xkbdata.src/rules/extras/Makefile.am | 52 +++ xorg-server/xkbdata.src/rules/extras/Makefile.in | 367 +++++++++++++++++++++ .../xkbdata.src/rules/extras/layoutsMapping.lst | 1 + .../xkbdata.src/rules/extras/variantsMapping.lst | 4 + 38 files changed, 1537 insertions(+), 421 deletions(-) create mode 100644 xorg-server/xkbdata.src/rules/base.extras.xml.in create mode 100644 xorg-server/xkbdata.src/rules/bin/Makefile.am create mode 100644 xorg-server/xkbdata.src/rules/bin/Makefile.in create mode 100644 xorg-server/xkbdata.src/rules/bin/ln_s.sh create mode 100644 xorg-server/xkbdata.src/rules/bin/lnv_s.sh create mode 100644 xorg-server/xkbdata.src/rules/bin/ml1_s.sh create mode 100644 xorg-server/xkbdata.src/rules/bin/ml1v1_s.sh create mode 100644 xorg-server/xkbdata.src/rules/bin/ml1v_s.sh create mode 100644 xorg-server/xkbdata.src/rules/bin/ml_s.sh create mode 100644 xorg-server/xkbdata.src/rules/bin/mlv_s.sh delete mode 100644 xorg-server/xkbdata.src/rules/compat/layoutRename.lst create mode 100644 xorg-server/xkbdata.src/rules/compat/layoutsMapping.lst delete mode 100644 xorg-server/xkbdata.src/rules/compat/ln_s.sh delete mode 100644 xorg-server/xkbdata.src/rules/compat/lnv_s.sh delete mode 100644 xorg-server/xkbdata.src/rules/compat/ml1_s.sh delete mode 100644 xorg-server/xkbdata.src/rules/compat/ml1v1_s.sh delete mode 100644 xorg-server/xkbdata.src/rules/compat/ml1v_s.sh delete mode 100644 xorg-server/xkbdata.src/rules/compat/ml_s.sh delete mode 100644 xorg-server/xkbdata.src/rules/compat/mlv_s.sh delete mode 100644 xorg-server/xkbdata.src/rules/compat/variantRename.lst create mode 100644 xorg-server/xkbdata.src/rules/compat/variantsMapping.lst create mode 100644 xorg-server/xkbdata.src/rules/evdev.extras.xml.in create mode 100644 xorg-server/xkbdata.src/rules/extras/Makefile.am create mode 100644 xorg-server/xkbdata.src/rules/extras/Makefile.in create mode 100644 xorg-server/xkbdata.src/rules/extras/layoutsMapping.lst create mode 100644 xorg-server/xkbdata.src/rules/extras/variantsMapping.lst (limited to 'xorg-server/xkbdata.src/rules') diff --git a/xorg-server/xkbdata.src/rules/Makefile.am b/xorg-server/xkbdata.src/rules/Makefile.am index 5d6e8b4bf..18b8b1a0e 100644 --- a/xorg-server/xkbdata.src/rules/Makefile.am +++ b/xorg-server/xkbdata.src/rules/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = compat +SUBDIRS = bin compat extras if CREATE_RULES_SYMLINK # extra_rules_file = $(xkb_rules_symlink) @@ -20,126 +20,162 @@ install-data-hook: endif -base_parts_no_compat = base.hdr.part base.lists.part \ +if USE_COMPAT_RULES + +base_parts = base.hdr.part base.lists.part \ +compat/base.lists.part \ HDR base.m_k.part \ HDR base.l1_k.part \ HDR base.l_k.part \ +HDR base.o_k.part \ HDR base.ml_g.part \ HDR base.m_g.part \ -HDR base.mlv_s.part \ -HDR base.ml_s.part \ -HDR base.ml1_s.part \ -HDR \ -HDR base.l2_s.part \ -HDR base.l3_s.part \ -HDR base.l4_s.part \ -HDR HDR HDR \ +HDR compat/base.mlv_s.part extras/base.mlv_s.part base.mlv_s.part \ +HDR compat/base.ml_s.part extras/base.ml_s.part base.ml_s.part \ +HDR compat/base.ml1_s.part extras/base.ml1_s.part base.ml1_s.part \ +HDR compat/base.ml1v1_s.part extras/base.ml1v1_s.part \ +HDR compat/base.l2_s.part extras/base.l2_s.part base.l2_s.part \ +HDR compat/base.l3_s.part extras/base.l3_s.part base.l3_s.part \ +HDR compat/base.l4_s.part extras/base.l4_s.part base.l4_s.part \ +HDR compat/base.l2v2_s.part extras/base.l2v2_s.part \ +HDR compat/base.l3v3_s.part extras/base.l3v3_s.part \ +HDR compat/base.l4v4_s.part extras/base.l4v4_s.part \ HDR base.m_s.part \ HDR base.ml_c.part \ HDR base.ml1_c.part \ HDR base.m_t.part \ +HDR base.lo_s.part \ HDR base.l1o_s.part \ HDR base.l2o_s.part \ HDR base.l3o_s.part \ HDR base.l4o_s.part \ -HDR base.o_s.part \ +HDR compat/base.o_s.part base.o_s.part \ HDR base.o_c.part \ HDR base.o_t.part -evdev_parts_no_compat = base.hdr.part base.lists.part \ +evdev_parts = base.hdr.part base.lists.part \ +compat/base.lists.part \ HDR evdev.m_k.part \ HDR base.l1_k.part \ -HDR base.l_k.part \ +HDR base.l_k.part \ +HDR base.o_k.part \ HDR base.ml_g.part \ HDR base.m_g.part \ -HDR base.mlv_s.part \ -HDR base.ml_s.part \ -HDR base.ml1_s.part \ -HDR \ -HDR base.l2_s.part \ -HDR base.l3_s.part \ -HDR base.l4_s.part \ -HDR HDR HDR \ +HDR compat/base.mlv_s.part extras/base.mlv_s.part base.mlv_s.part \ +HDR compat/base.ml_s.part extras/base.ml_s.part base.ml_s.part \ +HDR compat/base.ml1_s.part extras/base.ml1_s.part base.ml1_s.part \ +HDR compat/base.ml1v1_s.part extras/base.ml1v1_s.part \ +HDR compat/base.l2_s.part extras/base.l2_s.part base.l2_s.part \ +HDR compat/base.l3_s.part extras/base.l3_s.part base.l3_s.part \ +HDR compat/base.l4_s.part extras/base.l4_s.part base.l4_s.part \ +HDR compat/base.l2v2_s.part extras/base.l2v2_s.part \ +HDR compat/base.l3v3_s.part extras/base.l3v3_s.part \ +HDR compat/base.l4v4_s.part extras/base.l4v4_s.part \ HDR evdev.m_s.part \ HDR base.ml_c.part \ HDR base.ml1_c.part \ HDR base.m_t.part \ +HDR base.lo_s.part \ HDR base.l1o_s.part \ HDR base.l2o_s.part \ HDR base.l3o_s.part \ HDR base.l4o_s.part \ -HDR base.o_s.part \ +HDR compat/base.o_s.part base.o_s.part \ HDR base.o_c.part \ HDR base.o_t.part -if USE_COMPAT_RULES +else + base_parts = base.hdr.part base.lists.part \ -compat/base.lists.part \ HDR base.m_k.part \ HDR base.l1_k.part \ HDR base.l_k.part \ -HDR base.o_k.part \ +HDR \ HDR base.ml_g.part \ HDR base.m_g.part \ -HDR compat/base.mlv_s.part base.mlv_s.part \ -HDR compat/base.ml_s.part base.ml_s.part \ -HDR compat/base.ml1_s.part base.ml1_s.part \ -HDR compat/base.ml1v1_s.part \ -HDR compat/base.l2_s.part base.l2_s.part \ -HDR compat/base.l3_s.part base.l3_s.part \ -HDR compat/base.l4_s.part base.l4_s.part \ -HDR compat/base.l2v2_s.part \ -HDR compat/base.l3v3_s.part \ -HDR compat/base.l4v4_s.part \ +HDR extras/base.mlv_s.part base.mlv_s.part \ +HDR extras/base.ml_s.part base.ml_s.part \ +HDR extras/base.ml1_s.part base.ml1_s.part \ +HDR extras/base.ml1v1_s.part \ +HDR extras/base.l2_s.part base.l2_s.part \ +HDR extras/base.l3_s.part base.l3_s.part \ +HDR extras/base.l4_s.part base.l4_s.part \ +HDR extras/base.l2v2_s.part \ +HDR extras/base.l3v3_s.part \ +HDR extras/base.l4v4_s.part \ HDR base.m_s.part \ HDR base.ml_c.part \ HDR base.ml1_c.part \ HDR base.m_t.part \ -HDR base.lo_s.part \ +HDR \ HDR base.l1o_s.part \ HDR base.l2o_s.part \ HDR base.l3o_s.part \ HDR base.l4o_s.part \ -HDR compat/base.o_s.part base.o_s.part \ +HDR base.o_s.part \ HDR base.o_c.part \ HDR base.o_t.part evdev_parts = base.hdr.part base.lists.part \ -compat/base.lists.part \ HDR evdev.m_k.part \ HDR base.l1_k.part \ -HDR base.l_k.part \ -HDR base.o_k.part \ +HDR base.l_k.part \ +HDR \ HDR base.ml_g.part \ HDR base.m_g.part \ -HDR compat/base.mlv_s.part base.mlv_s.part \ -HDR compat/base.ml_s.part base.ml_s.part \ -HDR compat/base.ml1_s.part base.ml1_s.part \ -HDR compat/base.ml1v1_s.part \ -HDR compat/base.l2_s.part base.l2_s.part \ -HDR compat/base.l3_s.part base.l3_s.part \ -HDR compat/base.l4_s.part base.l4_s.part \ -HDR compat/base.l2v2_s.part \ -HDR compat/base.l3v3_s.part \ -HDR compat/base.l4v4_s.part \ +HDR extras/base.mlv_s.part base.mlv_s.part \ +HDR extras/base.ml_s.part base.ml_s.part \ +HDR extras/base.ml1_s.part base.ml1_s.part \ +HDR extras/base.ml1v1_s.part \ +HDR extras/base.l2_s.part base.l2_s.part \ +HDR extras/base.l3_s.part base.l3_s.part \ +HDR extras/base.l4_s.part base.l4_s.part \ +HDR extras/base.l2v2_s.part \ +HDR extras/base.l3v3_s.part \ +HDR extras/base.l4v4_s.part \ HDR evdev.m_s.part \ HDR base.ml_c.part \ HDR base.ml1_c.part \ HDR base.m_t.part \ -HDR base.lo_s.part \ +HDR \ HDR base.l1o_s.part \ HDR base.l2o_s.part \ HDR base.l3o_s.part \ HDR base.l4o_s.part \ -HDR compat/base.o_s.part base.o_s.part \ +HDR base.o_s.part \ HDR base.o_c.part \ HDR base.o_t.part -else -base_parts = $(base_parts_no_compat) -evdev_parts = $(base_parts_no_compat) + endif -base_parts_compat_dist = base.o_k.part base.lo_s.part +all_parts_dist = HDR base.hdr.part \ +base.lists.part \ +base.m_k.part \ +base.l1_k.part \ +base.l_k.part \ +base.o_k.part \ +base.ml_g.part \ +base.m_g.part \ +base.mlv_s.part \ +base.ml_s.part \ +base.ml1_s.part \ +base.l2_s.part \ +base.l3_s.part \ +base.l4_s.part \ +base.m_s.part \ +base.ml_c.part \ +base.ml1_c.part \ +base.m_t.part \ +base.lo_s.part \ +base.l1o_s.part \ +base.l2o_s.part \ +base.l3o_s.part \ +base.l4o_s.part \ +base.o_s.part \ +base.o_c.part \ +base.o_t.part \ +evdev.m_k.part \ +evdev.m_s.part rules_files = base evdev xfree98 @@ -148,30 +184,31 @@ lst_files = base.lst evdev.lst %.lst: %.xml perl $(srcdir)/xml2lst.pl < $< > $@ -base: $(base_parts_no_compat) +base: $(base_parts) HDR="$(srcdir)/HDR" $(srcdir)/merge.sh $@ $(base_parts) -evdev: $(evdev_parts_no_compat) +evdev: $(evdev_parts) HDR="$(srcdir)/HDR" $(srcdir)/merge.sh $@ $(evdev_parts) dist_files = xkb.dtd README rules_DATA = $(rules_files) $(lst_files) $(dist_files) -xml_in_files = base.xml.in evdev.xml.in +xml_in_files = base.xml.in evdev.xml.in base.extras.xml.in evdev.extras.xml.in xml_DATA = $(xml_in_files:.xml.in=.xml) $(srcdir)/evdev.xml.in: base.xml.in cp $< $@ +$(srcdir)/evdev.extras.xml.in: base.extras.xml.in + cp $< $@ + EXTRA_DIST= $(xml_in_files) xfree98 \ - $(base_parts_no_compat) \ - $(evdev_parts_no_compat) \ - $(base_parts_compat_dist) \ + $(all_parts_dist) \ xml2lst.pl merge.sh $(dist_files) -CLEANFILES = base base.xml base.lst evdev evdev.xml evdev.lst -MAINTAINERCLEANFILES = $(srcdir)/evdev.xml.in +CLEANFILES = base base.xml base.lst evdev evdev.xml evdev.lst base.extras.xml evdev.extras.xml +MAINTAINERCLEANFILES = $(srcdir)/evdev.xml.in $(srcdir)/evdev.extras.xml.in rulesdir = $(xkb_base)/rules xmldir = $(rulesdir) diff --git a/xorg-server/xkbdata.src/rules/Makefile.in b/xorg-server/xkbdata.src/rules/Makefile.in index bc498f1d1..583a1ce8f 100644 --- a/xorg-server/xkbdata.src/rules/Makefile.in +++ b/xorg-server/xkbdata.src/rules/Makefile.in @@ -175,60 +175,37 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ xkb_base = @xkb_base@ xkb_rules_symlink = @xkb_rules_symlink@ -SUBDIRS = compat -base_parts_no_compat = base.hdr.part base.lists.part \ -HDR base.m_k.part \ -HDR base.l1_k.part \ -HDR base.l_k.part \ -HDR base.ml_g.part \ -HDR base.m_g.part \ -HDR base.mlv_s.part \ -HDR base.ml_s.part \ -HDR base.ml1_s.part \ -HDR \ -HDR base.l2_s.part \ -HDR base.l3_s.part \ -HDR base.l4_s.part \ -HDR HDR HDR \ -HDR base.m_s.part \ -HDR base.ml_c.part \ -HDR base.ml1_c.part \ -HDR base.m_t.part \ -HDR base.l1o_s.part \ -HDR base.l2o_s.part \ -HDR base.l3o_s.part \ -HDR base.l4o_s.part \ -HDR base.o_s.part \ -HDR base.o_c.part \ -HDR base.o_t.part - -evdev_parts_no_compat = base.hdr.part base.lists.part \ -HDR evdev.m_k.part \ -HDR base.l1_k.part \ -HDR base.l_k.part \ -HDR base.ml_g.part \ -HDR base.m_g.part \ -HDR base.mlv_s.part \ -HDR base.ml_s.part \ -HDR base.ml1_s.part \ -HDR \ -HDR base.l2_s.part \ -HDR base.l3_s.part \ -HDR base.l4_s.part \ -HDR HDR HDR \ -HDR evdev.m_s.part \ -HDR base.ml_c.part \ -HDR base.ml1_c.part \ -HDR base.m_t.part \ -HDR base.l1o_s.part \ -HDR base.l2o_s.part \ -HDR base.l3o_s.part \ -HDR base.l4o_s.part \ -HDR base.o_s.part \ -HDR base.o_c.part \ -HDR base.o_t.part - -@USE_COMPAT_RULES_FALSE@base_parts = $(base_parts_no_compat) +SUBDIRS = bin compat extras +@USE_COMPAT_RULES_FALSE@base_parts = base.hdr.part base.lists.part \ +@USE_COMPAT_RULES_FALSE@HDR base.m_k.part \ +@USE_COMPAT_RULES_FALSE@HDR base.l1_k.part \ +@USE_COMPAT_RULES_FALSE@HDR base.l_k.part \ +@USE_COMPAT_RULES_FALSE@HDR \ +@USE_COMPAT_RULES_FALSE@HDR base.ml_g.part \ +@USE_COMPAT_RULES_FALSE@HDR base.m_g.part \ +@USE_COMPAT_RULES_FALSE@HDR extras/base.mlv_s.part base.mlv_s.part \ +@USE_COMPAT_RULES_FALSE@HDR extras/base.ml_s.part base.ml_s.part \ +@USE_COMPAT_RULES_FALSE@HDR extras/base.ml1_s.part base.ml1_s.part \ +@USE_COMPAT_RULES_FALSE@HDR extras/base.ml1v1_s.part \ +@USE_COMPAT_RULES_FALSE@HDR extras/base.l2_s.part base.l2_s.part \ +@USE_COMPAT_RULES_FALSE@HDR extras/base.l3_s.part base.l3_s.part \ +@USE_COMPAT_RULES_FALSE@HDR extras/base.l4_s.part base.l4_s.part \ +@USE_COMPAT_RULES_FALSE@HDR extras/base.l2v2_s.part \ +@USE_COMPAT_RULES_FALSE@HDR extras/base.l3v3_s.part \ +@USE_COMPAT_RULES_FALSE@HDR extras/base.l4v4_s.part \ +@USE_COMPAT_RULES_FALSE@HDR base.m_s.part \ +@USE_COMPAT_RULES_FALSE@HDR base.ml_c.part \ +@USE_COMPAT_RULES_FALSE@HDR base.ml1_c.part \ +@USE_COMPAT_RULES_FALSE@HDR base.m_t.part \ +@USE_COMPAT_RULES_FALSE@HDR \ +@USE_COMPAT_RULES_FALSE@HDR base.l1o_s.part \ +@USE_COMPAT_RULES_FALSE@HDR base.l2o_s.part \ +@USE_COMPAT_RULES_FALSE@HDR base.l3o_s.part \ +@USE_COMPAT_RULES_FALSE@HDR base.l4o_s.part \ +@USE_COMPAT_RULES_FALSE@HDR base.o_s.part \ +@USE_COMPAT_RULES_FALSE@HDR base.o_c.part \ +@USE_COMPAT_RULES_FALSE@HDR base.o_t.part + @USE_COMPAT_RULES_TRUE@base_parts = base.hdr.part base.lists.part \ @USE_COMPAT_RULES_TRUE@compat/base.lists.part \ @USE_COMPAT_RULES_TRUE@HDR base.m_k.part \ @@ -237,16 +214,16 @@ HDR base.o_t.part @USE_COMPAT_RULES_TRUE@HDR base.o_k.part \ @USE_COMPAT_RULES_TRUE@HDR base.ml_g.part \ @USE_COMPAT_RULES_TRUE@HDR base.m_g.part \ -@USE_COMPAT_RULES_TRUE@HDR compat/base.mlv_s.part base.mlv_s.part \ -@USE_COMPAT_RULES_TRUE@HDR compat/base.ml_s.part base.ml_s.part \ -@USE_COMPAT_RULES_TRUE@HDR compat/base.ml1_s.part base.ml1_s.part \ -@USE_COMPAT_RULES_TRUE@HDR compat/base.ml1v1_s.part \ -@USE_COMPAT_RULES_TRUE@HDR compat/base.l2_s.part base.l2_s.part \ -@USE_COMPAT_RULES_TRUE@HDR compat/base.l3_s.part base.l3_s.part \ -@USE_COMPAT_RULES_TRUE@HDR compat/base.l4_s.part base.l4_s.part \ -@USE_COMPAT_RULES_TRUE@HDR compat/base.l2v2_s.part \ -@USE_COMPAT_RULES_TRUE@HDR compat/base.l3v3_s.part \ -@USE_COMPAT_RULES_TRUE@HDR compat/base.l4v4_s.part \ +@USE_COMPAT_RULES_TRUE@HDR compat/base.mlv_s.part extras/base.mlv_s.part base.mlv_s.part \ +@USE_COMPAT_RULES_TRUE@HDR compat/base.ml_s.part extras/base.ml_s.part base.ml_s.part \ +@USE_COMPAT_RULES_TRUE@HDR compat/base.ml1_s.part extras/base.ml1_s.part base.ml1_s.part \ +@USE_COMPAT_RULES_TRUE@HDR compat/base.ml1v1_s.part extras/base.ml1v1_s.part \ +@USE_COMPAT_RULES_TRUE@HDR compat/base.l2_s.part extras/base.l2_s.part base.l2_s.part \ +@USE_COMPAT_RULES_TRUE@HDR compat/base.l3_s.part extras/base.l3_s.part base.l3_s.part \ +@USE_COMPAT_RULES_TRUE@HDR compat/base.l4_s.part extras/base.l4_s.part base.l4_s.part \ +@USE_COMPAT_RULES_TRUE@HDR compat/base.l2v2_s.part extras/base.l2v2_s.part \ +@USE_COMPAT_RULES_TRUE@HDR compat/base.l3v3_s.part extras/base.l3v3_s.part \ +@USE_COMPAT_RULES_TRUE@HDR compat/base.l4v4_s.part extras/base.l4v4_s.part \ @USE_COMPAT_RULES_TRUE@HDR base.m_s.part \ @USE_COMPAT_RULES_TRUE@HDR base.ml_c.part \ @USE_COMPAT_RULES_TRUE@HDR base.ml1_c.part \ @@ -256,11 +233,40 @@ HDR base.o_t.part @USE_COMPAT_RULES_TRUE@HDR base.l2o_s.part \ @USE_COMPAT_RULES_TRUE@HDR base.l3o_s.part \ @USE_COMPAT_RULES_TRUE@HDR base.l4o_s.part \ -@USE_COMPAT_RULES_TRUE@HDR compat/base.o_s.part base.o_s.part \ +@USE_COMPAT_RULES_TRUE@HDR compat/base.o_s.part base.o_s.part \ @USE_COMPAT_RULES_TRUE@HDR base.o_c.part \ @USE_COMPAT_RULES_TRUE@HDR base.o_t.part -@USE_COMPAT_RULES_FALSE@evdev_parts = $(base_parts_no_compat) +@USE_COMPAT_RULES_FALSE@evdev_parts = base.hdr.part base.lists.part \ +@USE_COMPAT_RULES_FALSE@HDR evdev.m_k.part \ +@USE_COMPAT_RULES_FALSE@HDR base.l1_k.part \ +@USE_COMPAT_RULES_FALSE@HDR base.l_k.part \ +@USE_COMPAT_RULES_FALSE@HDR \ +@USE_COMPAT_RULES_FALSE@HDR base.ml_g.part \ +@USE_COMPAT_RULES_FALSE@HDR base.m_g.part \ +@USE_COMPAT_RULES_FALSE@HDR extras/base.mlv_s.part base.mlv_s.part \ +@USE_COMPAT_RULES_FALSE@HDR extras/base.ml_s.part base.ml_s.part \ +@USE_COMPAT_RULES_FALSE@HDR extras/base.ml1_s.part base.ml1_s.part \ +@USE_COMPAT_RULES_FALSE@HDR extras/base.ml1v1_s.part \ +@USE_COMPAT_RULES_FALSE@HDR extras/base.l2_s.part base.l2_s.part \ +@USE_COMPAT_RULES_FALSE@HDR extras/base.l3_s.part base.l3_s.part \ +@USE_COMPAT_RULES_FALSE@HDR extras/base.l4_s.part base.l4_s.part \ +@USE_COMPAT_RULES_FALSE@HDR extras/base.l2v2_s.part \ +@USE_COMPAT_RULES_FALSE@HDR extras/base.l3v3_s.part \ +@USE_COMPAT_RULES_FALSE@HDR extras/base.l4v4_s.part \ +@USE_COMPAT_RULES_FALSE@HDR evdev.m_s.part \ +@USE_COMPAT_RULES_FALSE@HDR base.ml_c.part \ +@USE_COMPAT_RULES_FALSE@HDR base.ml1_c.part \ +@USE_COMPAT_RULES_FALSE@HDR base.m_t.part \ +@USE_COMPAT_RULES_FALSE@HDR \ +@USE_COMPAT_RULES_FALSE@HDR base.l1o_s.part \ +@USE_COMPAT_RULES_FALSE@HDR base.l2o_s.part \ +@USE_COMPAT_RULES_FALSE@HDR base.l3o_s.part \ +@USE_COMPAT_RULES_FALSE@HDR base.l4o_s.part \ +@USE_COMPAT_RULES_FALSE@HDR base.o_s.part \ +@USE_COMPAT_RULES_FALSE@HDR base.o_c.part \ +@USE_COMPAT_RULES_FALSE@HDR base.o_t.part + @USE_COMPAT_RULES_TRUE@evdev_parts = base.hdr.part base.lists.part \ @USE_COMPAT_RULES_TRUE@compat/base.lists.part \ @USE_COMPAT_RULES_TRUE@HDR evdev.m_k.part \ @@ -269,16 +275,16 @@ HDR base.o_t.part @USE_COMPAT_RULES_TRUE@HDR base.o_k.part \ @USE_COMPAT_RULES_TRUE@HDR base.ml_g.part \ @USE_COMPAT_RULES_TRUE@HDR base.m_g.part \ -@USE_COMPAT_RULES_TRUE@HDR compat/base.mlv_s.part base.mlv_s.part \ -@USE_COMPAT_RULES_TRUE@HDR compat/base.ml_s.part base.ml_s.part \ -@USE_COMPAT_RULES_TRUE@HDR compat/base.ml1_s.part base.ml1_s.part \ -@USE_COMPAT_RULES_TRUE@HDR compat/base.ml1v1_s.part \ -@USE_COMPAT_RULES_TRUE@HDR compat/base.l2_s.part base.l2_s.part \ -@USE_COMPAT_RULES_TRUE@HDR compat/base.l3_s.part base.l3_s.part \ -@USE_COMPAT_RULES_TRUE@HDR compat/base.l4_s.part base.l4_s.part \ -@USE_COMPAT_RULES_TRUE@HDR compat/base.l2v2_s.part \ -@USE_COMPAT_RULES_TRUE@HDR compat/base.l3v3_s.part \ -@USE_COMPAT_RULES_TRUE@HDR compat/base.l4v4_s.part \ +@USE_COMPAT_RULES_TRUE@HDR compat/base.mlv_s.part extras/base.mlv_s.part base.mlv_s.part \ +@USE_COMPAT_RULES_TRUE@HDR compat/base.ml_s.part extras/base.ml_s.part base.ml_s.part \ +@USE_COMPAT_RULES_TRUE@HDR compat/base.ml1_s.part extras/base.ml1_s.part base.ml1_s.part \ +@USE_COMPAT_RULES_TRUE@HDR compat/base.ml1v1_s.part extras/base.ml1v1_s.part \ +@USE_COMPAT_RULES_TRUE@HDR compat/base.l2_s.part extras/base.l2_s.part base.l2_s.part \ +@USE_COMPAT_RULES_TRUE@HDR compat/base.l3_s.part extras/base.l3_s.part base.l3_s.part \ +@USE_COMPAT_RULES_TRUE@HDR compat/base.l4_s.part extras/base.l4_s.part base.l4_s.part \ +@USE_COMPAT_RULES_TRUE@HDR compat/base.l2v2_s.part extras/base.l2v2_s.part \ +@USE_COMPAT_RULES_TRUE@HDR compat/base.l3v3_s.part extras/base.l3v3_s.part \ +@USE_COMPAT_RULES_TRUE@HDR compat/base.l4v4_s.part extras/base.l4v4_s.part \ @USE_COMPAT_RULES_TRUE@HDR evdev.m_s.part \ @USE_COMPAT_RULES_TRUE@HDR base.ml_c.part \ @USE_COMPAT_RULES_TRUE@HDR base.ml1_c.part \ @@ -288,25 +294,51 @@ HDR base.o_t.part @USE_COMPAT_RULES_TRUE@HDR base.l2o_s.part \ @USE_COMPAT_RULES_TRUE@HDR base.l3o_s.part \ @USE_COMPAT_RULES_TRUE@HDR base.l4o_s.part \ -@USE_COMPAT_RULES_TRUE@HDR compat/base.o_s.part base.o_s.part \ +@USE_COMPAT_RULES_TRUE@HDR compat/base.o_s.part base.o_s.part \ @USE_COMPAT_RULES_TRUE@HDR base.o_c.part \ @USE_COMPAT_RULES_TRUE@HDR base.o_t.part -base_parts_compat_dist = base.o_k.part base.lo_s.part +all_parts_dist = HDR base.hdr.part \ +base.lists.part \ +base.m_k.part \ +base.l1_k.part \ +base.l_k.part \ +base.o_k.part \ +base.ml_g.part \ +base.m_g.part \ +base.mlv_s.part \ +base.ml_s.part \ +base.ml1_s.part \ +base.l2_s.part \ +base.l3_s.part \ +base.l4_s.part \ +base.m_s.part \ +base.ml_c.part \ +base.ml1_c.part \ +base.m_t.part \ +base.lo_s.part \ +base.l1o_s.part \ +base.l2o_s.part \ +base.l3o_s.part \ +base.l4o_s.part \ +base.o_s.part \ +base.o_c.part \ +base.o_t.part \ +evdev.m_k.part \ +evdev.m_s.part + rules_files = base evdev xfree98 lst_files = base.lst evdev.lst dist_files = xkb.dtd README rules_DATA = $(rules_files) $(lst_files) $(dist_files) -xml_in_files = base.xml.in evdev.xml.in +xml_in_files = base.xml.in evdev.xml.in base.extras.xml.in evdev.extras.xml.in xml_DATA = $(xml_in_files:.xml.in=.xml) EXTRA_DIST = $(xml_in_files) xfree98 \ - $(base_parts_no_compat) \ - $(evdev_parts_no_compat) \ - $(base_parts_compat_dist) \ + $(all_parts_dist) \ xml2lst.pl merge.sh $(dist_files) -CLEANFILES = base base.xml base.lst evdev evdev.xml evdev.lst -MAINTAINERCLEANFILES = $(srcdir)/evdev.xml.in +CLEANFILES = base base.xml base.lst evdev evdev.xml evdev.lst base.extras.xml evdev.extras.xml +MAINTAINERCLEANFILES = $(srcdir)/evdev.xml.in $(srcdir)/evdev.extras.xml.in rulesdir = $(xkb_base)/rules xmldir = $(rulesdir) all: all-recursive @@ -676,15 +708,18 @@ uninstall-am: uninstall-rulesDATA uninstall-xmlDATA %.lst: %.xml perl $(srcdir)/xml2lst.pl < $< > $@ -base: $(base_parts_no_compat) +base: $(base_parts) HDR="$(srcdir)/HDR" $(srcdir)/merge.sh $@ $(base_parts) -evdev: $(evdev_parts_no_compat) +evdev: $(evdev_parts) HDR="$(srcdir)/HDR" $(srcdir)/merge.sh $@ $(evdev_parts) $(srcdir)/evdev.xml.in: base.xml.in cp $< $@ +$(srcdir)/evdev.extras.xml.in: base.extras.xml.in + cp $< $@ + @INTLTOOL_XML_NOMERGE_RULE@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/xorg-server/xkbdata.src/rules/base.extras.xml.in b/xorg-server/xkbdata.src/rules/base.extras.xml.in new file mode 100644 index 000000000..7e32c3140 --- /dev/null +++ b/xorg-server/xkbdata.src/rules/base.extras.xml.in @@ -0,0 +1,69 @@ + + + + + + + + apl + <_shortDescription>APL + <_description>APL + eng + + + + + + us + <_shortDescription>USA + <_description>USA + eng + + + + + intl-unicode + <_description>International (AltGr Unicode combining) + + + + + alt-intl-unicode + <_description>International (AltGr Unicode combining, alternative) + + + + + ats + <_description>Atsina + + + + + + crd + <_description>Couer D'alene Salish + crd + + + + + + + rs + <_shortDescription>SRB + <_description>Serbia + srp + + + + + combiningkeys + <_description>Combining accents instead of dead keys + + + + + + + diff --git a/xorg-server/xkbdata.src/rules/base.lists.part b/xorg-server/xkbdata.src/rules/base.lists.part index d2e8383df..d1927c537 100644 --- a/xorg-server/xkbdata.src/rules/base.lists.part +++ b/xorg-server/xkbdata.src/rules/base.lists.part @@ -14,6 +14,9 @@ // PC geometries - they have special geometry but symbols are mostly pc105 ! $pcgeometries = latitude +// TypeMatrix geometries +! $tmgeometries = tm2020 tm2030PS2 tm2030USB tm2030USB-102 tm2030USB-106 + // Layouts that provide further specializations for the OLPC ! $olpclayouts = af am ara br ca es et it kh kz in mn np ru th tr us @@ -36,6 +39,7 @@ chicony chicony0108 chicony0420 chicony9885 \ compalfl90 \ compaqeak8 compaqik7 compaqik13 compaqik18 \ + creativedw7000 \ cymotionlinux \ dell dellm65 inspiron dellusbmm \ emachines ennyah_dkb1008 evdev \ @@ -90,4 +94,3 @@ ! $evdevkbds = ibm_spacesaver ! $thinkpads = thinkpad thinkpad60 thinkpadz60 - diff --git a/xorg-server/xkbdata.src/rules/base.m_g.part b/xorg-server/xkbdata.src/rules/base.m_g.part index 36525754c..a925bfa8d 100644 --- a/xorg-server/xkbdata.src/rules/base.m_g.part +++ b/xorg-server/xkbdata.src/rules/base.m_g.part @@ -12,6 +12,7 @@ thinkpad = thinkpad(intl) thinkpad60 = thinkpad(60) thinkpadz60 = thinkpad(60) + $tmgeometries = typematrix(%m) winbook = winbook(XP5) pc98 = nec(pc98) $macbooks = macintosh(%m) diff --git a/xorg-server/xkbdata.src/rules/base.m_k.part b/xorg-server/xkbdata.src/rules/base.m_k.part index b6433b2c8..30534f715 100644 --- a/xorg-server/xkbdata.src/rules/base.m_k.part +++ b/xorg-server/xkbdata.src/rules/base.m_k.part @@ -3,6 +3,7 @@ sun4 = sun(type4_euro) sun5 = sun(type5_euro) sun6 = sun(type6_usb) + sun6euro = sun(type6tuv_usb) pc98 = xfree98(pc98) evdev = evdev olpc = evdev diff --git a/xorg-server/xkbdata.src/rules/base.ml1_s.part b/xorg-server/xkbdata.src/rules/base.ml1_s.part index c45b9805e..6a0787d21 100644 --- a/xorg-server/xkbdata.src/rules/base.ml1_s.part +++ b/xorg-server/xkbdata.src/rules/base.ml1_s.part @@ -1,7 +1,7 @@ ataritt * = xfree68_vndr/ataritt(us)+%l[1]%(v[1]) amiga * = xfree68_vndr/amiga(usa1)+%l[1]%(v[1]) - sun4 * = latin+sun_vndr/us(sun4)+%l[1]%(v[1]) - sun5 * = latin+sun_vndr/us(sun5)+%l[1]%(v[1]) + sun4 * = latin+sun_vndr/us(type4)+%l[1]%(v[1]) + sun5 * = latin+sun_vndr/us(type5)+%l[1]%(v[1]) macintosh_old us = macintosh_vndr/us(oldmac) macintosh_old $macvendorlayouts = macintosh_vndr/us(oldmac)+macintosh_vndr/%l[1]%(v[1]) macintosh_old * = macintosh_vndr/us(oldmac)+%l[1]%(v[1]) diff --git a/xorg-server/xkbdata.src/rules/base.ml_s.part b/xorg-server/xkbdata.src/rules/base.ml_s.part index 7e9b2d63e..c5fed0bed 100644 --- a/xorg-server/xkbdata.src/rules/base.ml_s.part +++ b/xorg-server/xkbdata.src/rules/base.ml_s.part @@ -10,6 +10,9 @@ sun6 us = sun_vndr/us(type6) sun6 en_US = sun_vndr/us(type6)+iso9995-3(basic) sun6 * = sun_vndr/us(type6)+%l%(v) + sun6euro us = sun_vndr/us(type6) + sun6euro en_US = sun_vndr/us(type6)+iso9995-3(basic) + sun6euro * = sun_vndr/us(type6)+%l%(v) pc98 nec_vndr/jp = nec_vndr/jp(pc98) macintosh_old us = macintosh_vndr/us(oldmac) macintosh_old en_US = macintosh_vndr/us(oldmac) diff --git a/xorg-server/xkbdata.src/rules/base.o_s.part b/xorg-server/xkbdata.src/rules/base.o_s.part index d3078bfc5..f9290dae7 100644 --- a/xorg-server/xkbdata.src/rules/base.o_s.part +++ b/xorg-server/xkbdata.src/rules/base.o_s.part @@ -49,10 +49,14 @@ lv3:rwin_switch = +level3(rwin_switch) lv3:enter_switch = +level3(enter_switch) caps:capslock = +capslock(capslock) + caps:numlock = +capslock(numlock) caps:shiftlock = +capslock(shiftlock) caps:swapescape = +capslock(swapescape) caps:escape = +capslock(escape) caps:backspace = +capslock(backspace) + caps:super = +capslock(super) + caps:hyper = +capslock(hyper) + caps:none = +capslock(none) ctrl:nocaps = +ctrl(nocaps) ctrl:swapcaps = +ctrl(swapcaps) ctrl:ctrl_ac = +ctrl(ctrl_ac) diff --git a/xorg-server/xkbdata.src/rules/base.xml.in b/xorg-server/xkbdata.src/rules/base.xml.in index 996cde84f..f43e651bb 100644 --- a/xorg-server/xkbdata.src/rules/base.xml.in +++ b/xorg-server/xkbdata.src/rules/base.xml.in @@ -979,6 +979,41 @@ Trust + + + tm2020 + TypeMatrix EZ-Reach 2020 + TypeMatrix + + + + + tm2030PS2 + TypeMatrix EZ-Reach 2030 PS2 + TypeMatrix + + + + + tm2030USB + TypeMatrix EZ-Reach 2030 USB + TypeMatrix + + + + + tm2030USB-102 + TypeMatrix EZ-Reach 2030 USB (102/105:EU mode) + TypeMatrix + + + + + tm2030USB-106 + TypeMatrix EZ-Reach 2030 USB (106:JP mode) + TypeMatrix + + yahoo @@ -1154,6 +1189,13 @@ Compal Electronics Inc. + + + creativedw7000 + <_description>Creative Desktop Wireless 7000 + Creative + + @@ -1455,8 +1497,8 @@ - winkeys - <_description>Winkeys + legacy + <_description>Legacy @@ -1613,6 +1655,13 @@ tam + + + tam_keyboard_with_numerals + Tamil Keyboard with Numerals + tam + + tam_TAB @@ -1764,7 +1813,7 @@ phonetic - <_description>Traditional Phonetic + <_description>Traditional phonetic @@ -1772,7 +1821,7 @@ bas_phonetic - <_description>Standard Phonetic + <_description>New phonetic @@ -2119,20 +2168,8 @@ - pro - <_description>Pro - - - - - keypad - <_description>Keypad - - - - - pro_keypad - <_description>Pro Keypad + pes_keypad + <_description>Persian, with Persian Keypad @@ -2795,6 +2832,12 @@ <_description>Macintosh + + + us + <_description>US keyboard with Italian letters + + geo @@ -3431,6 +3474,13 @@ <_description>DOS + + + bak + <_description>Bashkirian + bak + + @@ -4748,6 +4798,12 @@ <_description>CapsLock toggles normal capitalization of alphabetic characters + + + + diff --git a/xorg-server/xkbdata.src/rules/bin/Makefile.am b/xorg-server/xkbdata.src/rules/bin/Makefile.am new file mode 100644 index 000000000..b9785b107 --- /dev/null +++ b/xorg-server/xkbdata.src/rules/bin/Makefile.am @@ -0,0 +1,10 @@ +transform_scripts= \ +ln_s.sh \ +lnv_s.sh \ +ml_s.sh \ +mlv_s.sh \ +ml1_s.sh \ +ml1v_s.sh \ +ml1v1_s.sh + +EXTRA_DIST=$(transform_scripts) diff --git a/xorg-server/xkbdata.src/rules/bin/Makefile.in b/xorg-server/xkbdata.src/rules/bin/Makefile.in new file mode 100644 index 000000000..097cf8013 --- /dev/null +++ b/xorg-server/xkbdata.src/rules/bin/Makefile.in @@ -0,0 +1,326 @@ +# Makefile.in generated by automake 1.10.2 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +subdir = rules/bin +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALL_LINGUAS = @ALL_LINGUAS@ +AMTAR = @AMTAR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CATALOGS = @CATALOGS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GMOFILES = @GMOFILES@ +GMSGFMT = @GMSGFMT@ +GREP = @GREP@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTOBJEXT = @INSTOBJEXT@ +INTLLIBS = @INTLLIBS@ +INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +INTLTOOL_MERGE = @INTLTOOL_MERGE@ +INTLTOOL_PERL = @INTLTOOL_PERL@ +INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ +MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGMERGE = @MSGMERGE@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +POFILES = @POFILES@ +POSUB = @POSUB@ +PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ +XGETTEXT = @XGETTEXT@ +XKBCOMP = @XKBCOMP@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build_alias = @build_alias@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host_alias = @host_alias@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +xkb_base = @xkb_base@ +xkb_rules_symlink = @xkb_rules_symlink@ +transform_scripts = \ +ln_s.sh \ +lnv_s.sh \ +ml_s.sh \ +mlv_s.sh \ +ml1_s.sh \ +ml1v_s.sh \ +ml1v1_s.sh + +EXTRA_DIST = $(transform_scripts) +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu rules/bin/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu rules/bin/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-exec-am: + +install-html: install-html-am + +install-info: install-info-am + +install-man: + +install-pdf: install-pdf-am + +install-ps: install-ps-am + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: + +.MAKE: install-am install-strip + +.PHONY: all all-am check check-am clean clean-generic distclean \ + distclean-generic distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/xorg-server/xkbdata.src/rules/bin/ln_s.sh b/xorg-server/xkbdata.src/rules/bin/ln_s.sh new file mode 100644 index 000000000..07ac2f087 --- /dev/null +++ b/xorg-server/xkbdata.src/rules/bin/ln_s.sh @@ -0,0 +1,20 @@ +#!/bin/sh + +variant=$1 + +INDIR=$2 +OUTFILE=base.l${variant}_s.part + +> $OUTFILE + +awk '{ + if (index($2, "(") == 0) { + printf " %s = +%s%%(v['${variant}']):'${variant}'\n", $1, $2; + } else { + printf " %s = +%s:'${variant}'\n", $1, $2; + } +}' < $INDIR/layoutsMapping.lst >> $OUTFILE + +awk '{ + printf " %s(%s) = +%s(%s):'${variant}'\n", $1, $2, $3, $4; +}' < $INDIR/variantsMapping.lst >> $OUTFILE diff --git a/xorg-server/xkbdata.src/rules/bin/lnv_s.sh b/xorg-server/xkbdata.src/rules/bin/lnv_s.sh new file mode 100644 index 000000000..fc0d42020 --- /dev/null +++ b/xorg-server/xkbdata.src/rules/bin/lnv_s.sh @@ -0,0 +1,12 @@ +#!/bin/sh + +variant=$1 + +INDIR=$2 +OUTFILE=base.l${variant}v${variant}_s.part + +> $OUTFILE + +awk '{ + printf " %s %s = +%s(%s):'${variant}'\n", $1, $2, $3, $4; +}' < $INDIR/variantsMapping.lst >> $OUTFILE diff --git a/xorg-server/xkbdata.src/rules/bin/ml1_s.sh b/xorg-server/xkbdata.src/rules/bin/ml1_s.sh new file mode 100644 index 000000000..b2d222432 --- /dev/null +++ b/xorg-server/xkbdata.src/rules/bin/ml1_s.sh @@ -0,0 +1,18 @@ +#!/bin/sh + +INDIR=$1 +OUTFILE=base.ml1_s.part + +> $OUTFILE + +awk '{ + if (index($2, "(") == 0) { + printf " * %s = pc+%s%%(v[1])\n", $1, $2; + } else { + printf " * %s = pc+%s\n", $1, $2; + } +}' < $INDIR/layoutsMapping.lst >> $OUTFILE + +awk '{ + printf " * %s(%s) = pc+%s(%s)\n", $1, $2, $3, $4; +}' < $INDIR/variantsMapping.lst >> $OUTFILE diff --git a/xorg-server/xkbdata.src/rules/bin/ml1v1_s.sh b/xorg-server/xkbdata.src/rules/bin/ml1v1_s.sh new file mode 100644 index 000000000..7c2b1a84c --- /dev/null +++ b/xorg-server/xkbdata.src/rules/bin/ml1v1_s.sh @@ -0,0 +1,10 @@ +#!/bin/sh + +INDIR=$1 +OUTFILE=base.ml1v1_s.part + +> $OUTFILE + +awk '{ + printf " * %s %s = pc+%s(%s)\n", $1, $2, $3, $4; +}' < $INDIR/variantsMapping.lst >> $OUTFILE diff --git a/xorg-server/xkbdata.src/rules/bin/ml1v_s.sh b/xorg-server/xkbdata.src/rules/bin/ml1v_s.sh new file mode 100644 index 000000000..084d4c0be --- /dev/null +++ b/xorg-server/xkbdata.src/rules/bin/ml1v_s.sh @@ -0,0 +1,10 @@ +#!/bin/sh + +INDIR=$1 +OUTFILE=base.ml1v_s.part + +> $OUTFILE + +awk '{ + printf " * %s %s = pc+%s(%s)\n", $1, $2, $3, $4; +}' < $INDIR/variantsMapping.lst >> $OUTFILE diff --git a/xorg-server/xkbdata.src/rules/bin/ml_s.sh b/xorg-server/xkbdata.src/rules/bin/ml_s.sh new file mode 100644 index 000000000..666ba870f --- /dev/null +++ b/xorg-server/xkbdata.src/rules/bin/ml_s.sh @@ -0,0 +1,14 @@ +#!/bin/sh + +INDIR=$1 +OUTFILE=base.ml_s.part + +> $OUTFILE + +awk '{ + printf " * %s = pc+%s\n", $1, $2; +}' < $INDIR/layoutsMapping.lst >> $OUTFILE + +awk '{ + printf " * %s(%s) = pc+%s(%s)\n", $1, $2, $3, $4; +}' < $INDIR/variantsMapping.lst >> $OUTFILE diff --git a/xorg-server/xkbdata.src/rules/bin/mlv_s.sh b/xorg-server/xkbdata.src/rules/bin/mlv_s.sh new file mode 100644 index 000000000..5b466d59c --- /dev/null +++ b/xorg-server/xkbdata.src/rules/bin/mlv_s.sh @@ -0,0 +1,10 @@ +#!/bin/sh + +INDIR=$1 +OUTFILE=base.mlv_s.part + +> $OUTFILE + +awk '{ + printf " * %s %s = pc+%s(%s)\n", $1, $2, $3, $4; +}' < $INDIR/variantsMapping.lst >> $OUTFILE diff --git a/xorg-server/xkbdata.src/rules/compat/Makefile.am b/xorg-server/xkbdata.src/rules/compat/Makefile.am index 20bf3d9a1..755be6d07 100644 --- a/xorg-server/xkbdata.src/rules/compat/Makefile.am +++ b/xorg-server/xkbdata.src/rules/compat/Makefile.am @@ -1,17 +1,10 @@ -transform_files=layoutRename.lst variantRename.lst - -transform_scripts= \ -ln_s.sh \ -lnv_s.sh \ -ml_s.sh \ -mlv_s.sh \ -ml1_s.sh \ -ml1v_s.sh \ -ml1v1_s.sh +transform_files=layoutsMapping.lst variantsMapping.lst dist_parts=base.o_s.part +scripts_dir=$(srcdir)/../bin + scripts= \ base.l2_s.part \ base.l3_s.part \ @@ -35,36 +28,36 @@ noinst_SCRIPTS= endif -base.l2_s.part: ln_s.sh $(transform_files) - sh $< 2 +base.l2_s.part: $(scripts_dir)/ln_s.sh $(transform_files) + sh $< 2 $(srcdir) -base.l3_s.part: ln_s.sh $(transform_files) - sh $< 3 +base.l3_s.part: $(scripts_dir)/ln_s.sh $(transform_files) + sh $< 3 $(srcdir) -base.l4_s.part: ln_s.sh $(transform_files) - sh $< 4 +base.l4_s.part: $(scripts_dir)/ln_s.sh $(transform_files) + sh $< 4 $(srcdir) -base.l2v2_s.part: lnv_s.sh $(transform_files) - sh $< 2 +base.l2v2_s.part: $(scripts_dir)/lnv_s.sh $(transform_files) + sh $< 2 $(srcdir) -base.l3v3_s.part: lnv_s.sh $(transform_files) - sh $< 3 +base.l3v3_s.part: $(scripts_dir)/lnv_s.sh $(transform_files) + sh $< 3 $(srcdir) -base.l4v4_s.part: lnv_s.sh $(transform_files) - sh $< 4 +base.l4v4_s.part: $(scripts_dir)/lnv_s.sh $(transform_files) + sh $< 4 $(srcdir) -base.ml_s.part: ml_s.sh $(transform_files) - sh $< +base.ml_s.part: $(scripts_dir)/ml_s.sh $(transform_files) + sh $< $(srcdir) -base.ml1_s.part: ml1_s.sh $(transform_files) - sh $< +base.ml1_s.part: $(scripts_dir)/ml1_s.sh $(transform_files) + sh $< $(srcdir) -base.mlv_s.part: mlv_s.sh $(transform_files) - sh $< +base.mlv_s.part: $(scripts_dir)/mlv_s.sh $(transform_files) + sh $< $(srcdir) -base.ml1v1_s.part: ml1v1_s.sh $(transform_files) - sh $< +base.ml1v1_s.part: $(scripts_dir)/ml1v1_s.sh $(transform_files) + sh $< $(srcdir) -EXTRA_DIST=base.lists.part $(transform_files) $(transform_scripts) $(dist_parts) +EXTRA_DIST=base.lists.part $(transform_files) $(dist_parts) CLEANFILES=$(scripts) diff --git a/xorg-server/xkbdata.src/rules/compat/Makefile.in b/xorg-server/xkbdata.src/rules/compat/Makefile.in index 1488a728d..f78214247 100644 --- a/xorg-server/xkbdata.src/rules/compat/Makefile.in +++ b/xorg-server/xkbdata.src/rules/compat/Makefile.in @@ -154,17 +154,9 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ xkb_base = @xkb_base@ xkb_rules_symlink = @xkb_rules_symlink@ -transform_files = layoutRename.lst variantRename.lst -transform_scripts = \ -ln_s.sh \ -lnv_s.sh \ -ml_s.sh \ -mlv_s.sh \ -ml1_s.sh \ -ml1v_s.sh \ -ml1v1_s.sh - +transform_files = layoutsMapping.lst variantsMapping.lst dist_parts = base.o_s.part +scripts_dir = $(srcdir)/../bin scripts = \ base.l2_s.part \ base.l3_s.part \ @@ -180,7 +172,7 @@ base.ml_s.part @USE_COMPAT_RULES_FALSE@noinst_SCRIPTS = @USE_COMPAT_RULES_TRUE@noinst_SCRIPTS = $(scripts) $(dist_parts) -EXTRA_DIST = base.lists.part $(transform_files) $(transform_scripts) $(dist_parts) +EXTRA_DIST = base.lists.part $(transform_files) $(dist_parts) CLEANFILES = $(scripts) all: all-am @@ -343,35 +335,35 @@ uninstall-am: mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am -base.l2_s.part: ln_s.sh $(transform_files) - sh $< 2 +base.l2_s.part: $(scripts_dir)/ln_s.sh $(transform_files) + sh $< 2 $(srcdir) -base.l3_s.part: ln_s.sh $(transform_files) - sh $< 3 +base.l3_s.part: $(scripts_dir)/ln_s.sh $(transform_files) + sh $< 3 $(srcdir) -base.l4_s.part: ln_s.sh $(transform_files) - sh $< 4 +base.l4_s.part: $(scripts_dir)/ln_s.sh $(transform_files) + sh $< 4 $(srcdir) -base.l2v2_s.part: lnv_s.sh $(transform_files) - sh $< 2 +base.l2v2_s.part: $(scripts_dir)/lnv_s.sh $(transform_files) + sh $< 2 $(srcdir) -base.l3v3_s.part: lnv_s.sh $(transform_files) - sh $< 3 +base.l3v3_s.part: $(scripts_dir)/lnv_s.sh $(transform_files) + sh $< 3 $(srcdir) -base.l4v4_s.part: lnv_s.sh $(transform_files) - sh $< 4 +base.l4v4_s.part: $(scripts_dir)/lnv_s.sh $(transform_files) + sh $< 4 $(srcdir) -base.ml_s.part: ml_s.sh $(transform_files) - sh $< +base.ml_s.part: $(scripts_dir)/ml_s.sh $(transform_files) + sh $< $(srcdir) -base.ml1_s.part: ml1_s.sh $(transform_files) - sh $< +base.ml1_s.part: $(scripts_dir)/ml1_s.sh $(transform_files) + sh $< $(srcdir) -base.mlv_s.part: mlv_s.sh $(transform_files) - sh $< +base.mlv_s.part: $(scripts_dir)/mlv_s.sh $(transform_files) + sh $< $(srcdir) -base.ml1v1_s.part: ml1v1_s.sh $(transform_files) - sh $< +base.ml1v1_s.part: $(scripts_dir)/ml1v1_s.sh $(transform_files) + sh $< $(srcdir) # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/xorg-server/xkbdata.src/rules/compat/layoutRename.lst b/xorg-server/xkbdata.src/rules/compat/layoutRename.lst deleted file mode 100644 index cecda6d8a..000000000 --- a/xorg-server/xkbdata.src/rules/compat/layoutRename.lst +++ /dev/null @@ -1,27 +0,0 @@ -ar ara -ben in(ben) -bs ba -cs rs -cz_qwerty cz(qwerty) -dev in(deva) -dvorak us(dvorak) -dzdwi bt -el gr -en_US latin -guj in(guj) -gur in(guru) -iu ca(ike) -lo la -kan in(kan) -mi mao -ml in(mal) -ogham ie(ogam) -ori ie(ori) -sapmi no(smi) -sr srp -syr sy(syc) -tel in(tel) -tml in(tam) -yu srp -fr-latin9 fr(latin9) -us_intl us(alt-intl) diff --git a/xorg-server/xkbdata.src/rules/compat/layoutsMapping.lst b/xorg-server/xkbdata.src/rules/compat/layoutsMapping.lst new file mode 100644 index 000000000..cecda6d8a --- /dev/null +++ b/xorg-server/xkbdata.src/rules/compat/layoutsMapping.lst @@ -0,0 +1,27 @@ +ar ara +ben in(ben) +bs ba +cs rs +cz_qwerty cz(qwerty) +dev in(deva) +dvorak us(dvorak) +dzdwi bt +el gr +en_US latin +guj in(guj) +gur in(guru) +iu ca(ike) +lo la +kan in(kan) +mi mao +ml in(mal) +ogham ie(ogam) +ori ie(ori) +sapmi no(smi) +sr srp +syr sy(syc) +tel in(tel) +tml in(tam) +yu srp +fr-latin9 fr(latin9) +us_intl us(alt-intl) diff --git a/xorg-server/xkbdata.src/rules/compat/ln_s.sh b/xorg-server/xkbdata.src/rules/compat/ln_s.sh deleted file mode 100644 index 7e17d8851..000000000 --- a/xorg-server/xkbdata.src/rules/compat/ln_s.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -variant=$1 - -INDIR=`dirname $0` -OUTFILE=base.l${variant}_s.part - -> $OUTFILE - -awk '{ - if (index($2, "(") == 0) { - printf " %s = +%s%%(v['${variant}']):'${variant}'\n", $1, $2; - } else { - printf " %s = +%s:'${variant}'\n", $1, $2; - } -}' < $INDIR/layoutRename.lst >> $OUTFILE - -awk '{ - printf " %s(%s) = +%s(%s):'${variant}'\n", $1, $2, $3, $4; -}' < $INDIR/variantRename.lst >> $OUTFILE diff --git a/xorg-server/xkbdata.src/rules/compat/lnv_s.sh b/xorg-server/xkbdata.src/rules/compat/lnv_s.sh deleted file mode 100644 index ae699f95b..000000000 --- a/xorg-server/xkbdata.src/rules/compat/lnv_s.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -variant=$1 - -INDIR=`dirname $0` -OUTFILE=base.l${variant}v${variant}_s.part - -> $OUTFILE - -awk '{ - printf " %s %s = +%s(%s):'${variant}'\n", $1, $2, $3, $4; -}' < $INDIR/variantRename.lst >> $OUTFILE diff --git a/xorg-server/xkbdata.src/rules/compat/ml1_s.sh b/xorg-server/xkbdata.src/rules/compat/ml1_s.sh deleted file mode 100644 index 327de2d9c..000000000 --- a/xorg-server/xkbdata.src/rules/compat/ml1_s.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh - -INDIR=`dirname $0` -OUTFILE=base.ml1_s.part - -> $OUTFILE - -awk '{ - if (index($2, "(") == 0) { - printf " * %s = pc+%s%%(v[1])\n", $1, $2; - } else { - printf " * %s = pc+%s\n", $1, $2; - } -}' < $INDIR/layoutRename.lst >> $OUTFILE - -awk '{ - printf " * %s(%s) = pc+%s(%s)\n", $1, $2, $3, $4; -}' < $INDIR/variantRename.lst >> $OUTFILE diff --git a/xorg-server/xkbdata.src/rules/compat/ml1v1_s.sh b/xorg-server/xkbdata.src/rules/compat/ml1v1_s.sh deleted file mode 100644 index 9edcb8e8c..000000000 --- a/xorg-server/xkbdata.src/rules/compat/ml1v1_s.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -INDIR=`dirname $0` -OUTFILE=base.ml1v1_s.part - -> $OUTFILE - -awk '{ - printf " * %s %s = pc+%s(%s)\n", $1, $2, $3, $4; -}' < $INDIR/variantRename.lst >> $OUTFILE diff --git a/xorg-server/xkbdata.src/rules/compat/ml1v_s.sh b/xorg-server/xkbdata.src/rules/compat/ml1v_s.sh deleted file mode 100644 index 02ae5726d..000000000 --- a/xorg-server/xkbdata.src/rules/compat/ml1v_s.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -INDIR=`dirname $0` -OUTFILE=base.ml1v_s.part - -> $OUTFILE - -awk '{ - printf " * %s %s = pc+%s(%s)\n", $1, $2, $3, $4; -}' < $INDIR/variantRename.lst >> $OUTFILE diff --git a/xorg-server/xkbdata.src/rules/compat/ml_s.sh b/xorg-server/xkbdata.src/rules/compat/ml_s.sh deleted file mode 100644 index f35087380..000000000 --- a/xorg-server/xkbdata.src/rules/compat/ml_s.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -INDIR=`dirname $0` -OUTFILE=base.ml_s.part - -> $OUTFILE - -awk '{ - printf " * %s = pc+%s\n", $1, $2; -}' < $INDIR/layoutRename.lst >> $OUTFILE - -awk '{ - printf " * %s(%s) = pc+%s(%s)\n", $1, $2, $3, $4; -}' < $INDIR/variantRename.lst >> $OUTFILE diff --git a/xorg-server/xkbdata.src/rules/compat/mlv_s.sh b/xorg-server/xkbdata.src/rules/compat/mlv_s.sh deleted file mode 100644 index ea644dcab..000000000 --- a/xorg-server/xkbdata.src/rules/compat/mlv_s.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -INDIR=`dirname $0` -OUTFILE=base.mlv_s.part - -> $OUTFILE - -awk '{ - printf " * %s %s = pc+%s(%s)\n", $1, $2, $3, $4; -}' < $INDIR/variantRename.lst >> $OUTFILE diff --git a/xorg-server/xkbdata.src/rules/compat/variantRename.lst b/xorg-server/xkbdata.src/rules/compat/variantRename.lst deleted file mode 100644 index f85a2d0a8..000000000 --- a/xorg-server/xkbdata.src/rules/compat/variantRename.lst +++ /dev/null @@ -1,49 +0,0 @@ -ben basic in ben -ben probhat in ben_probhat -dev basic in deva -dvorak $dvoraklayouts %v dvorak -dvorak basic us dvorak -dvorak pl_basic pl dvorak -dvorak pl pl dvorak_quotes -dvorak pl_altquotes pl dvorak_altquotes -dzdwi basic bt basic -fi basic fi classic -ge azerty_tskapo fr geo -guj basic in guj -gur basic in guru -ie laptop ie basic -ie CloGaelachLaptop ie CloGaelach -il si1452 ie basic -in urd in urd-phonetic -iu basic ca ike -lo basic la basic -kan basic in kan -mal basic in mal -mal mlplusnum in mal -ogham basic ie ogam -ogham laptop ie ogam -ogham is434 ie ogam_is434 -ogham is434laptop ie ogam_is434 -ori basic in ori -ro de ro winkeys -ro us ro std -ro academic ro std -ro std_comma ro std -ro comma ro basic -ru os ru os_legacy -pk urd pk urd-phonetic -sapmi basic no smi -sapmi nodeadkeys no smi_nodeadkeys -sapmi sefi fi smi -sin phonetic-static in sin_phonetic -syr basic sy syc -syr phonetic sy syc_phonetic -tam INSCRIPT in tam -tam UNI in tam_unicode -tam TAB in tam_TAB -tam TSCII in tam_TSCII -tel basic in tel -yu basic srp latin -yu unicode srp latinunicode -yu yz srp latinyz -yu unicodeyz srp latinunicodeyz diff --git a/xorg-server/xkbdata.src/rules/compat/variantsMapping.lst b/xorg-server/xkbdata.src/rules/compat/variantsMapping.lst new file mode 100644 index 000000000..be2a2bc40 --- /dev/null +++ b/xorg-server/xkbdata.src/rules/compat/variantsMapping.lst @@ -0,0 +1,50 @@ +ben basic in ben +ben probhat in ben_probhat +dev basic in deva +dvorak $dvoraklayouts %v dvorak +dvorak basic us dvorak +dvorak pl_basic pl dvorak +dvorak pl pl dvorak_quotes +dvorak pl_altquotes pl dvorak_altquotes +dzdwi basic bt basic +fi basic fi classic +ge azerty_tskapo fr geo +guj basic in guj +gur basic in guru +ie laptop ie basic +ie CloGaelachLaptop ie CloGaelach +il si1452 ie basic +in urd in urd-phonetic +iu basic ca ike +lo basic la basic +kan basic in kan +mal basic in mal +mal mlplusnum in mal +ogham basic ie ogam +ogham laptop ie ogam +ogham is434 ie ogam_is434 +ogham is434laptop ie ogam_is434 +ori basic in ori +ro de ro winkeys +ro us ro std +ro academic ro std +ro std_comma ro std +ro comma ro basic +ru os ru os_legacy +pk urd pk urd-phonetic +sapmi basic no smi +sapmi nodeadkeys no smi_nodeadkeys +sapmi sefi fi smi +sin phonetic-static in sin_phonetic +syr basic sy syc +syr phonetic sy syc_phonetic +tam INSCRIPT in tam +tam UNI in tam_unicode +tam NUMERAL-KEYBOARD in tam_keyboard_with_numerals +tam TAB in tam_TAB +tam TSCII in tam_TSCII +tel basic in tel +yu basic srp latin +yu unicode srp latinunicode +yu yz srp latinyz +yu unicodeyz srp latinunicodeyz diff --git a/xorg-server/xkbdata.src/rules/evdev.extras.xml.in b/xorg-server/xkbdata.src/rules/evdev.extras.xml.in new file mode 100644 index 000000000..7e32c3140 --- /dev/null +++ b/xorg-server/xkbdata.src/rules/evdev.extras.xml.in @@ -0,0 +1,69 @@ + + + + + + + + apl + <_shortDescription>APL + <_description>APL + eng + + + + + + us + <_shortDescription>USA + <_description>USA + eng + + + + + intl-unicode + <_description>International (AltGr Unicode combining) + + + + + alt-intl-unicode + <_description>International (AltGr Unicode combining, alternative) + + + + + ats + <_description>Atsina + + + + + + crd + <_description>Couer D'alene Salish + crd + + + + + + + rs + <_shortDescription>SRB + <_description>Serbia + srp + + + + + combiningkeys + <_description>Combining accents instead of dead keys + + + + + + + diff --git a/xorg-server/xkbdata.src/rules/evdev.xml.in b/xorg-server/xkbdata.src/rules/evdev.xml.in index 996cde84f..f43e651bb 100644 --- a/xorg-server/xkbdata.src/rules/evdev.xml.in +++ b/xorg-server/xkbdata.src/rules/evdev.xml.in @@ -979,6 +979,41 @@ Trust + + + tm2020 + TypeMatrix EZ-Reach 2020 + TypeMatrix + + + + + tm2030PS2 + TypeMatrix EZ-Reach 2030 PS2 + TypeMatrix + + + + + tm2030USB + TypeMatrix EZ-Reach 2030 USB + TypeMatrix + + + + + tm2030USB-102 + TypeMatrix EZ-Reach 2030 USB (102/105:EU mode) + TypeMatrix + + + + + tm2030USB-106 + TypeMatrix EZ-Reach 2030 USB (106:JP mode) + TypeMatrix + + yahoo @@ -1154,6 +1189,13 @@ Compal Electronics Inc. + + + creativedw7000 + <_description>Creative Desktop Wireless 7000 + Creative + + @@ -1455,8 +1497,8 @@ - winkeys - <_description>Winkeys + legacy + <_description>Legacy @@ -1613,6 +1655,13 @@ tam + + + tam_keyboard_with_numerals + Tamil Keyboard with Numerals + tam + + tam_TAB @@ -1764,7 +1813,7 @@ phonetic - <_description>Traditional Phonetic + <_description>Traditional phonetic @@ -1772,7 +1821,7 @@ bas_phonetic - <_description>Standard Phonetic + <_description>New phonetic @@ -2119,20 +2168,8 @@ - pro - <_description>Pro - - - - - keypad - <_description>Keypad - - - - - pro_keypad - <_description>Pro Keypad + pes_keypad + <_description>Persian, with Persian Keypad @@ -2795,6 +2832,12 @@ <_description>Macintosh + + + us + <_description>US keyboard with Italian letters + + geo @@ -3431,6 +3474,13 @@ <_description>DOS + + + bak + <_description>Bashkirian + bak + + @@ -4748,6 +4798,12 @@ <_description>CapsLock toggles normal capitalization of alphabetic characters + + + + diff --git a/xorg-server/xkbdata.src/rules/extras/Makefile.am b/xorg-server/xkbdata.src/rules/extras/Makefile.am new file mode 100644 index 000000000..ad71f2e76 --- /dev/null +++ b/xorg-server/xkbdata.src/rules/extras/Makefile.am @@ -0,0 +1,52 @@ +transform_files=layoutsMapping.lst variantsMapping.lst + +scripts_dir=$(srcdir)/../bin + +scripts= \ +base.l2_s.part \ +base.l3_s.part \ +base.l4_s.part \ +base.l2v2_s.part \ +base.l3v3_s.part \ +base.l4v4_s.part \ +base.ml_s.part \ +base.ml1_s.part \ +base.mlv_s.part \ +base.ml1v1_s.part \ +base.ml_s.part + +noinst_SCRIPTS=$(scripts) + +base.l2_s.part: $(scripts_dir)/ln_s.sh $(transform_files) + sh $< 2 $(srcdir) + +base.l3_s.part: $(scripts_dir)/ln_s.sh $(transform_files) + sh $< 3 $(srcdir) + +base.l4_s.part: $(scripts_dir)/ln_s.sh $(transform_files) + sh $< 4 $(srcdir) + +base.l2v2_s.part: $(scripts_dir)/lnv_s.sh $(transform_files) + sh $< 2 $(srcdir) + +base.l3v3_s.part: $(scripts_dir)/lnv_s.sh $(transform_files) + sh $< 3 $(srcdir) + +base.l4v4_s.part: $(scripts_dir)/lnv_s.sh $(transform_files) + sh $< 4 $(srcdir) + +base.ml_s.part: $(scripts_dir)/ml_s.sh $(transform_files) + sh $< $(srcdir) + +base.ml1_s.part: $(scripts_dir)/ml1_s.sh $(transform_files) + sh $< $(srcdir) + +base.mlv_s.part: $(scripts_dir)/mlv_s.sh $(transform_files) + sh $< $(srcdir) + +base.ml1v1_s.part: $(scripts_dir)/ml1v1_s.sh $(transform_files) + sh $< $(srcdir) + +EXTRA_DIST=$(transform_files) + +CLEANFILES=$(scripts) diff --git a/xorg-server/xkbdata.src/rules/extras/Makefile.in b/xorg-server/xkbdata.src/rules/extras/Makefile.in new file mode 100644 index 000000000..3d3b1e53a --- /dev/null +++ b/xorg-server/xkbdata.src/rules/extras/Makefile.in @@ -0,0 +1,367 @@ +# Makefile.in generated by automake 1.10.2 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +subdir = rules/extras +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_CLEAN_FILES = +SCRIPTS = $(noinst_SCRIPTS) +SOURCES = +DIST_SOURCES = +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALL_LINGUAS = @ALL_LINGUAS@ +AMTAR = @AMTAR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CATALOGS = @CATALOGS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GMOFILES = @GMOFILES@ +GMSGFMT = @GMSGFMT@ +GREP = @GREP@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTOBJEXT = @INSTOBJEXT@ +INTLLIBS = @INTLLIBS@ +INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +INTLTOOL_MERGE = @INTLTOOL_MERGE@ +INTLTOOL_PERL = @INTLTOOL_PERL@ +INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ +MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGMERGE = @MSGMERGE@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +POFILES = @POFILES@ +POSUB = @POSUB@ +PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ +XGETTEXT = @XGETTEXT@ +XKBCOMP = @XKBCOMP@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build_alias = @build_alias@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host_alias = @host_alias@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +xkb_base = @xkb_base@ +xkb_rules_symlink = @xkb_rules_symlink@ +transform_files = layoutsMapping.lst variantsMapping.lst +scripts_dir = $(srcdir)/../bin +scripts = \ +base.l2_s.part \ +base.l3_s.part \ +base.l4_s.part \ +base.l2v2_s.part \ +base.l3v3_s.part \ +base.l4v4_s.part \ +base.ml_s.part \ +base.ml1_s.part \ +base.mlv_s.part \ +base.ml1v1_s.part \ +base.ml_s.part + +noinst_SCRIPTS = $(scripts) +EXTRA_DIST = $(transform_files) +CLEANFILES = $(scripts) +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu rules/extras/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu rules/extras/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(SCRIPTS) +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-exec-am: + +install-html: install-html-am + +install-info: install-info-am + +install-man: + +install-pdf: install-pdf-am + +install-ps: install-ps-am + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: + +.MAKE: install-am install-strip + +.PHONY: all all-am check check-am clean clean-generic distclean \ + distclean-generic distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am + + +base.l2_s.part: $(scripts_dir)/ln_s.sh $(transform_files) + sh $< 2 $(srcdir) + +base.l3_s.part: $(scripts_dir)/ln_s.sh $(transform_files) + sh $< 3 $(srcdir) + +base.l4_s.part: $(scripts_dir)/ln_s.sh $(transform_files) + sh $< 4 $(srcdir) + +base.l2v2_s.part: $(scripts_dir)/lnv_s.sh $(transform_files) + sh $< 2 $(srcdir) + +base.l3v3_s.part: $(scripts_dir)/lnv_s.sh $(transform_files) + sh $< 3 $(srcdir) + +base.l4v4_s.part: $(scripts_dir)/lnv_s.sh $(transform_files) + sh $< 4 $(srcdir) + +base.ml_s.part: $(scripts_dir)/ml_s.sh $(transform_files) + sh $< $(srcdir) + +base.ml1_s.part: $(scripts_dir)/ml1_s.sh $(transform_files) + sh $< $(srcdir) + +base.mlv_s.part: $(scripts_dir)/mlv_s.sh $(transform_files) + sh $< $(srcdir) + +base.ml1v1_s.part: $(scripts_dir)/ml1v1_s.sh $(transform_files) + sh $< $(srcdir) +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/xorg-server/xkbdata.src/rules/extras/layoutsMapping.lst b/xorg-server/xkbdata.src/rules/extras/layoutsMapping.lst new file mode 100644 index 000000000..d75b4f44d --- /dev/null +++ b/xorg-server/xkbdata.src/rules/extras/layoutsMapping.lst @@ -0,0 +1 @@ +apl extras/apl diff --git a/xorg-server/xkbdata.src/rules/extras/variantsMapping.lst b/xorg-server/xkbdata.src/rules/extras/variantsMapping.lst new file mode 100644 index 000000000..c49f70e0c --- /dev/null +++ b/xorg-server/xkbdata.src/rules/extras/variantsMapping.lst @@ -0,0 +1,4 @@ +rs combiningkeys extras/rs combiningkeys +us alt-intl-unicode extras/us alt-intl-unicode +us crd extras/us crd +us intl-unicode extras/us intl-unicode -- cgit v1.2.3