From f3d88db0960f1c23e55f2529764b096ac92d78d9 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Sun, 20 Sep 2009 15:09:14 +0000
Subject: Switched to xkeyboard-config-1.6.99

---
 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 ++++++++++++++++++++
 13 files changed, 124 insertions(+), 232 deletions(-)
 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

(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 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
-- 
cgit v1.2.3