From 0874ae23a16946781dd517cfdb011c691ad0b581 Mon Sep 17 00:00:00 2001 From: marha Date: Wed, 5 May 2010 09:43:03 +0000 Subject: svn merge -r571:HEAD "^/branches/released" . --- xorg-server/xkbdata.src/rules/compat/Makefile.am | 131 +++++++++++---------- .../xkbdata.src/rules/compat/base.l1v1_c.part | 1 + .../xkbdata.src/rules/compat/base.l2v2_c.part | 1 + .../xkbdata.src/rules/compat/base.l3v3_c.part | 1 + .../xkbdata.src/rules/compat/base.l4v4_c.part | 1 + .../xkbdata.src/rules/compat/base.lv_c.part | 1 + 6 files changed, 73 insertions(+), 63 deletions(-) create mode 100644 xorg-server/xkbdata.src/rules/compat/base.l1v1_c.part create mode 100644 xorg-server/xkbdata.src/rules/compat/base.l2v2_c.part create mode 100644 xorg-server/xkbdata.src/rules/compat/base.l3v3_c.part create mode 100644 xorg-server/xkbdata.src/rules/compat/base.l4v4_c.part create mode 100644 xorg-server/xkbdata.src/rules/compat/base.lv_c.part (limited to 'xorg-server/xkbdata.src/rules/compat') diff --git a/xorg-server/xkbdata.src/rules/compat/Makefile.am b/xorg-server/xkbdata.src/rules/compat/Makefile.am index 7c84f4996..087263427 100644 --- a/xorg-server/xkbdata.src/rules/compat/Makefile.am +++ b/xorg-server/xkbdata.src/rules/compat/Makefile.am @@ -1,63 +1,68 @@ - -transform_files=layoutsMapping.lst variantsMapping.lst - -dist_parts=base.o_s.part - -scripts_dir=$(srcdir)/../bin - -scripts= \ -base.ml2_s.part \ -base.ml3_s.part \ -base.ml4_s.part \ -base.ml2v2_s.part \ -base.ml3v3_s.part \ -base.ml4v4_s.part \ -base.ml_s.part \ -base.ml1_s.part \ -base.mlv_s.part \ -base.ml1v1_s.part \ -base.ml_s.part - -if USE_COMPAT_RULES - -noinst_SCRIPTS=$(scripts) $(dist_parts) - -else - -noinst_SCRIPTS= - -endif - -base.ml2_s.part: $(scripts_dir)/mln_s.sh $(transform_files) - sh $< 2 $(srcdir) - -base.ml3_s.part: $(scripts_dir)/mln_s.sh $(transform_files) - sh $< 3 $(srcdir) - -base.ml4_s.part: $(scripts_dir)/mln_s.sh $(transform_files) - sh $< 4 $(srcdir) - -base.ml2v2_s.part: $(scripts_dir)/mlnvn_s.sh $(transform_files) - sh $< 2 $(srcdir) - -base.ml3v3_s.part: $(scripts_dir)/mlnvn_s.sh $(transform_files) - sh $< 3 $(srcdir) - -base.ml4v4_s.part: $(scripts_dir)/mlnvn_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=base.lists.part $(transform_files) $(dist_parts) - -CLEANFILES=$(scripts) + +transform_files=layoutsMapping.lst variantsMapping.lst + +dist_parts=base.o_s.part \ +base.lv_c.part \ +base.l1v1_c.part \ +base.l2v2_c.part \ +base.l3v3_c.part \ +base.l4v4_c.part + +scripts_dir=$(srcdir)/../bin + +scripts= \ +base.ml2_s.part \ +base.ml3_s.part \ +base.ml4_s.part \ +base.ml2v2_s.part \ +base.ml3v3_s.part \ +base.ml4v4_s.part \ +base.ml_s.part \ +base.ml1_s.part \ +base.mlv_s.part \ +base.ml1v1_s.part \ +base.ml_s.part + +if USE_COMPAT_RULES + +noinst_SCRIPTS=$(scripts) $(dist_parts) + +else + +noinst_SCRIPTS= + +endif + +base.ml2_s.part: $(scripts_dir)/mln_s.sh $(transform_files) + sh $< 2 $(srcdir) + +base.ml3_s.part: $(scripts_dir)/mln_s.sh $(transform_files) + sh $< 3 $(srcdir) + +base.ml4_s.part: $(scripts_dir)/mln_s.sh $(transform_files) + sh $< 4 $(srcdir) + +base.ml2v2_s.part: $(scripts_dir)/mlnvn_s.sh $(transform_files) + sh $< 2 $(srcdir) + +base.ml3v3_s.part: $(scripts_dir)/mlnvn_s.sh $(transform_files) + sh $< 3 $(srcdir) + +base.ml4v4_s.part: $(scripts_dir)/mlnvn_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=base.lists.part $(transform_files) $(dist_parts) + +CLEANFILES=$(scripts) diff --git a/xorg-server/xkbdata.src/rules/compat/base.l1v1_c.part b/xorg-server/xkbdata.src/rules/compat/base.l1v1_c.part new file mode 100644 index 000000000..64ff0f2f5 --- /dev/null +++ b/xorg-server/xkbdata.src/rules/compat/base.l1v1_c.part @@ -0,0 +1 @@ + de neo = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock) diff --git a/xorg-server/xkbdata.src/rules/compat/base.l2v2_c.part b/xorg-server/xkbdata.src/rules/compat/base.l2v2_c.part new file mode 100644 index 000000000..fea61be76 --- /dev/null +++ b/xorg-server/xkbdata.src/rules/compat/base.l2v2_c.part @@ -0,0 +1 @@ + de neo = +caps(caps_lock):2+misc(assign_shift_left_action):2+level5(level5_lock):2 diff --git a/xorg-server/xkbdata.src/rules/compat/base.l3v3_c.part b/xorg-server/xkbdata.src/rules/compat/base.l3v3_c.part new file mode 100644 index 000000000..5a1fb2f8a --- /dev/null +++ b/xorg-server/xkbdata.src/rules/compat/base.l3v3_c.part @@ -0,0 +1 @@ + de neo = +caps(caps_lock):3+misc(assign_shift_left_action):3+level5(level5_lock):3 diff --git a/xorg-server/xkbdata.src/rules/compat/base.l4v4_c.part b/xorg-server/xkbdata.src/rules/compat/base.l4v4_c.part new file mode 100644 index 000000000..ac8a91102 --- /dev/null +++ b/xorg-server/xkbdata.src/rules/compat/base.l4v4_c.part @@ -0,0 +1 @@ + de neo = +caps(caps_lock):4+misc(assign_shift_left_action):4+level5(level5_lock):4 diff --git a/xorg-server/xkbdata.src/rules/compat/base.lv_c.part b/xorg-server/xkbdata.src/rules/compat/base.lv_c.part new file mode 100644 index 000000000..64ff0f2f5 --- /dev/null +++ b/xorg-server/xkbdata.src/rules/compat/base.lv_c.part @@ -0,0 +1 @@ + de neo = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock) -- cgit v1.2.3