Attachment 17954 Details for Bug 16872 – First version of parts patch

[patch] First version of parts patch

xkb_ro2.patch (text/plain), 7.91 KB, created by Igor Stirbu on 2008-07-29 01:25:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Igor Stirbu

Created: 2008-07-29 01:25:33 UTC

Size: 7.91 KB

patch

obsolete

>diff -urN xkeyboard-config-1.3.orig/rules/compat/base.l2_s.part xkeyboard-config-1.3/rules/compat/base.l2_s.part
>--- xkeyboard-config-1.3.orig/rules/compat/base.l2_s.part	2008-05-10 02:17:53.000000000 +0300
>+++ xkeyboard-config-1.3/rules/compat/base.l2_s.part	2008-07-29 09:54:32.000000000 +0300
>@@ -52,9 +52,10 @@
>   ogham(is434laptop)	=	+ie(ogam_is434):2
>   ori(basic)	=	+in(ori):2
>   ro(de)	=	+ro(winkeys):2
>-  ro(us)	=	+ro(std_comma):2
>-  ro(std)	=	+ro(std_cedilla):2
>-  ro(academic)	=	+ro(std_comma):2
>+  ro(us)	=	+ro(std):2
>+  ro(academic)	=	+ro(std):2
>+  ro(std_comma)	=	+ro(std):2
>+  ro(comma)	=	+ro(basic):2
>   ru(os)	=	+ru(os_legacy):2
>   sapmi(basic)	=	+no(smi):2
>   sapmi(nodeadkeys)	=	+no(smi_nodeadkeys):2
>diff -urN xkeyboard-config-1.3.orig/rules/compat/base.l2v2_s.part xkeyboard-config-1.3/rules/compat/base.l2v2_s.part
>--- xkeyboard-config-1.3.orig/rules/compat/base.l2v2_s.part	2008-05-10 02:17:53.000000000 +0300
>+++ xkeyboard-config-1.3/rules/compat/base.l2v2_s.part	2008-07-29 09:56:25.000000000 +0300
>@@ -25,9 +25,10 @@
>   ogham		is434laptop	=	+ie(ogam_is434):2
>   ori		basic	=	+in(ori):2
>   ro		de	=	+ro(winkeys):2
>-  ro		us	=	+ro(std_comma):2
>-  ro		std	=	+ro(std_cedilla):2
>-  ro		academic	=	+ro(std_comma):2
>+  ro		us	=	+ro(std):2
>+  ro		academic	=	+ro(std):2
>+  ro		std_comma	=	+ro(std):2
>+  ro		comma	=	+ro(basic):2
>   ru		os	=	+ru(os_legacy):2
>   sapmi		basic	=	+no(smi):2
>   sapmi		nodeadkeys	=	+no(smi_nodeadkeys):2
>diff -urN xkeyboard-config-1.3.orig/rules/compat/base.l3_s.part xkeyboard-config-1.3/rules/compat/base.l3_s.part
>--- xkeyboard-config-1.3.orig/rules/compat/base.l3_s.part	2008-05-10 02:17:53.000000000 +0300
>+++ xkeyboard-config-1.3/rules/compat/base.l3_s.part	2008-07-29 09:56:57.000000000 +0300
>@@ -52,9 +52,10 @@
>   ogham(is434laptop)	=	+ie(ogam_is434):3
>   ori(basic)	=	+in(ori):3
>   ro(de)	=	+ro(winkeys):3
>-  ro(us)	=	+ro(std_comma):3
>-  ro(std)	=	+ro(std_cedilla):3
>-  ro(academic)	=	+ro(std_comma):3
>+  ro(us)	=	+ro(std):3
>+  ro(academic)	=	+ro(std):3
>+  ro(std_comma)	=	+ro(std):3
>+  ro(comma)	=	+ro(basic):3
>   ru(os)	=	+ru(os_legacy):3
>   sapmi(basic)	=	+no(smi):3
>   sapmi(nodeadkeys)	=	+no(smi_nodeadkeys):3
>diff -urN xkeyboard-config-1.3.orig/rules/compat/base.l3v3_s.part xkeyboard-config-1.3/rules/compat/base.l3v3_s.part
>--- xkeyboard-config-1.3.orig/rules/compat/base.l3v3_s.part	2008-05-10 02:17:53.000000000 +0300
>+++ xkeyboard-config-1.3/rules/compat/base.l3v3_s.part	2008-07-29 09:58:02.000000000 +0300
>@@ -25,9 +25,10 @@
>   ogham		is434laptop	=	+ie(ogam_is434):3
>   ori		basic	=	+in(ori):3
>   ro		de	=	+ro(winkeys):3
>-  ro		us	=	+ro(std_comma):3
>-  ro		std	=	+ro(std_cedilla):3
>-  ro		academic	=	+ro(std_comma):3
>+  ro		us	=	+ro(std):3
>+  ro		academic	=	+ro(std):3
>+  ro		std_comma	=	+ro(std):3
>+  ro		comma	=	+ro(basic):3
>   ru		os	=	+ru(os_legacy):3
>   sapmi		basic	=	+no(smi):3
>   sapmi		nodeadkeys	=	+no(smi_nodeadkeys):3
>diff -urN xkeyboard-config-1.3.orig/rules/compat/base.l4_s.part xkeyboard-config-1.3/rules/compat/base.l4_s.part
>--- xkeyboard-config-1.3.orig/rules/compat/base.l4_s.part	2008-05-10 02:17:53.000000000 +0300
>+++ xkeyboard-config-1.3/rules/compat/base.l4_s.part	2008-07-29 09:58:32.000000000 +0300
>@@ -52,9 +52,10 @@
>   ogham(is434laptop)	=	+ie(ogam_is434):4
>   ori(basic)	=	+in(ori):4
>   ro(de)	=	+ro(winkeys):4
>-  ro(us)	=	+ro(std_comma):4
>-  ro(std)	=	+ro(std_cedilla):4
>-  ro(academic)	=	+ro(std_comma):4
>+  ro(us)	=	+ro(std):4
>+  ro(academic)	=	+ro(std):4
>+  ro(std_comma)	=	+ro(std):4
>+  ro(comma)	=	+ro(basic):4
>   ru(os)	=	+ru(os_legacy):4
>   sapmi(basic)	=	+no(smi):4
>   sapmi(nodeadkeys)	=	+no(smi_nodeadkeys):4
>diff -urN xkeyboard-config-1.3.orig/rules/compat/base.l4v4_s.part xkeyboard-config-1.3/rules/compat/base.l4v4_s.part
>--- xkeyboard-config-1.3.orig/rules/compat/base.l4v4_s.part	2008-05-10 02:17:53.000000000 +0300
>+++ xkeyboard-config-1.3/rules/compat/base.l4v4_s.part	2008-07-29 09:59:19.000000000 +0300
>@@ -25,9 +25,10 @@
>   ogham		is434laptop	=	+ie(ogam_is434):4
>   ori		basic	=	+in(ori):4
>   ro		de	=	+ro(winkeys):4
>-  ro		us	=	+ro(std_comma):4
>-  ro		std	=	+ro(std_cedilla):4
>-  ro		academic	=	+ro(std_comma):4
>+  ro		us	=	+ro(std):4
>+  ro		academic	=	+ro(std):4
>+  ro		std_comma	=	+ro(std):4
>+  ro		comma	=	+ro(basic):4
>   ru		os	=	+ru(os_legacy):4
>   sapmi		basic	=	+no(smi):4
>   sapmi		nodeadkeys	=	+no(smi_nodeadkeys):4
>diff -urN xkeyboard-config-1.3.orig/rules/compat/base.ml1_s.part xkeyboard-config-1.3/rules/compat/base.ml1_s.part
>--- xkeyboard-config-1.3.orig/rules/compat/base.ml1_s.part	2008-05-10 02:17:53.000000000 +0300
>+++ xkeyboard-config-1.3/rules/compat/base.ml1_s.part	2008-07-29 10:00:31.000000000 +0300
>@@ -52,9 +52,10 @@
>   *		ogham(is434laptop)			=	pc+ie(ogam_is434)
>   *		ori(basic)			=	pc+in(ori)
>   *		ro(de)			=	pc+ro(winkeys)
>-  *		ro(us)			=	pc+ro(std_comma)
>-  *		ro(std)			=	pc+ro(std_cedilla)
>-  *		ro(academic)			=	pc+ro(std_comma)
>+  *		ro(us)			=	pc+ro(std)
>+  *		ro(academic)			=	pc+ro(std)
>+  *		ro(std_comma)			=	pc+ro(std)
>+  *		ro(comma)			=	pc+ro(basic)
>   *		ru(os)			=	pc+ru(os_legacy)
>   *		sapmi(basic)			=	pc+no(smi)
>   *		sapmi(nodeadkeys)			=	pc+no(smi_nodeadkeys)
>diff -urN xkeyboard-config-1.3.orig/rules/compat/base.ml1v1_s.part xkeyboard-config-1.3/rules/compat/base.ml1v1_s.part
>--- xkeyboard-config-1.3.orig/rules/compat/base.ml1v1_s.part	2008-05-10 02:17:53.000000000 +0300
>+++ xkeyboard-config-1.3/rules/compat/base.ml1v1_s.part	2008-07-29 10:02:05.000000000 +0300
>@@ -25,9 +25,10 @@
>   *		ogham		is434laptop		=	pc+ie(ogam_is434)
>   *		ori		basic		=	pc+in(ori)
>   *		ro		de		=	pc+ro(winkeys)
>-  *		ro		us		=	pc+ro(std_comma)
>-  *		ro		std		=	pc+ro(std_cedilla)
>-  *		ro		academic		=	pc+ro(std_comma)
>+  *		ro		us		=	pc+ro(std)
>+  *		ro		academic		=	pc+ro(std)
>+  *		ro		std_comma	=	pc+ro(std)
>+  *		ro		comma		=	pc+ro(basic)
>   *		ru		os		=	pc+ru(os_legacy)
>   *		sapmi		basic		=	pc+no(smi)
>   *		sapmi		nodeadkeys		=	pc+no(smi_nodeadkeys)
>diff -urN xkeyboard-config-1.3.orig/rules/compat/base.ml_s.part xkeyboard-config-1.3/rules/compat/base.ml_s.part
>--- xkeyboard-config-1.3.orig/rules/compat/base.ml_s.part	2008-05-10 02:17:53.000000000 +0300
>+++ xkeyboard-config-1.3/rules/compat/base.ml_s.part	2008-07-29 10:03:01.000000000 +0300
>@@ -52,9 +52,10 @@
>   *		ogham(is434laptop)			=	pc+ie(ogam_is434)
>   *		ori(basic)			=	pc+in(ori)
>   *		ro(de)			=	pc+ro(winkeys)
>-  *		ro(us)			=	pc+ro(std_comma)
>-  *		ro(std)			=	pc+ro(std_cedilla)
>-  *		ro(academic)			=	pc+ro(std_comma)
>+  *		ro(us)			=	pc+ro(std)
>+  *		ro(academic)			=	pc+ro(std)
>+  *		ro(std_comma)			=	pc+ro(std)
>+  *		ro(comma)			=	pc+ro(basic)
>   *		ru(os)			=	pc+ru(os_legacy)
>   *		sapmi(basic)			=	pc+no(smi)
>   *		sapmi(nodeadkeys)			=	pc+no(smi_nodeadkeys)
>diff -urN xkeyboard-config-1.3.orig/rules/compat/base.mlv_s.part xkeyboard-config-1.3/rules/compat/base.mlv_s.part
>--- xkeyboard-config-1.3.orig/rules/compat/base.mlv_s.part	2008-05-10 02:17:53.000000000 +0300
>+++ xkeyboard-config-1.3/rules/compat/base.mlv_s.part	2008-07-29 10:03:59.000000000 +0300
>@@ -25,9 +25,10 @@
>   *		ogham		is434laptop		=	pc+ie(ogam_is434)
>   *		ori		basic		=	pc+in(ori)
>   *		ro		de		=	pc+ro(winkeys)
>-  *		ro		us		=	pc+ro(std_comma)
>-  *		ro		std		=	pc+ro(std_cedilla)
>-  *		ro		academic		=	pc+ro(std_comma)
>+  *		ro		us		=	pc+ro(std)
>+  *		ro		academic		=	pc+ro(std)
>+  *		ro		std_comma	=	pc+ro(std)
>+  *		ro		comma		=	pc+ro(basic)
>   *		ru		os		=	pc+ru(os_legacy)
>   *		sapmi		basic		=	pc+no(smi)
>   *		sapmi		nodeadkeys		=	pc+no(smi_nodeadkeys)
>diff -urN xkeyboard-config-1.3.orig/rules/compat/variantRename.lst xkeyboard-config-1.3/rules/compat/variantRename.lst
>--- xkeyboard-config-1.3.orig/rules/compat/variantRename.lst	2008-05-10 02:17:49.000000000 +0300
>+++ xkeyboard-config-1.3/rules/compat/variantRename.lst	2008-07-29 10:05:11.000000000 +0300
>@@ -25,9 +25,10 @@
> ogham	is434laptop	ie	ogam_is434
> ori	basic		in	ori
> ro	de		ro	winkeys
>-ro	us		ro	std_comma
>-ro	std		ro	std_cedilla
>-ro	academic	ro	std_comma
>+ro	us		ro	std
>+ro	academic	ro	std
>+ro	std_comma	ro	std
>+ro	comma		ro	basic	
> ru	os		ru	os_legacy
> sapmi	basic		no	smi
> sapmi	nodeadkeys	no	smi_nodeadkeys

Actions: View | Splinter Review

Attachments on bug 16872: 17926 | 17928 | 17954

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.