Attachment 7067 Details for Bug 8321 – Unbreak compatibility

[patch] Unbreak compatibility

compatibility.diff (text/plain), 5.34 KB, created by Denis Barbier on 2006-09-18 23:53:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Denis Barbier

Created: 2006-09-18 23:53:08 UTC

Size: 5.34 KB

patch

obsolete

>Index: rules/base.ml1_s.part
>===================================================================
>RCS file: /cvs/xlibs/xkbdesc/rules/base.ml1_s.part,v
>retrieving revision 1.9
>diff -u -r1.9 base.ml1_s.part
>--- rules/base.ml1_s.part	18 Sep 2006 11:45:12 -0000	1.9
>+++ rules/base.ml1_s.part	19 Sep 2006 06:46:43 -0000
>@@ -5,5 +5,5 @@
>   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])
>- $macs		$macvendorlayouts	=	pc+macintosh_vndr/%l[1]%(v[1])
>-  *		*			=	pc+%l[1]%(v[1])
>+ $macs		$macvendorlayouts	=	pc(pc105)+macintosh_vndr/%l[1]%(v[1])
>+  *		*			=	pc(pc105)+%l[1]%(v[1])
>Index: rules/base.ml_s.part
>===================================================================
>RCS file: /cvs/xlibs/xkbdesc/rules/base.ml_s.part,v
>retrieving revision 1.12
>diff -u -r1.12 base.ml_s.part
>--- rules/base.ml_s.part	18 Sep 2006 11:45:12 -0000	1.12
>+++ rules/base.ml_s.part	19 Sep 2006 06:46:43 -0000
>@@ -7,15 +7,15 @@
>   sun5		$nonlatin		=	latin+sun_vndr/us(sun5)+%l%(v):2
>   sun5		*			=	latin+sun_vndr/us(sun5)+%l%(v)
>   pc98		nec_vndr/jp		=	nec_vndr/jp(pc98)
>-  abnt2		br			=	pc+br
>+  abnt2		br			=	pc(pc105)+br
>   macintosh_old	us			=	macintosh_vndr/us(oldmac)
>   macintosh_old	en_US			=	macintosh_vndr/us(oldmac)
>   macintosh_old	$macvendorlayouts	=	macintosh_vndr/us(oldmac)+macintosh_vndr/%l%(v)
>   macintosh_old	$nonlatin		=	macintosh_vndr/us(oldmac)+%l%(v):2
>   macintosh_old	*			=	macintosh_vndr/us(oldmac)+%l%(v)
>- $macbooks	*			=	pc+%l%(v)
>- $macs		en_US			=	pc+macintosh_vndr/us(extended)
>- $macs		$macvendorlayouts	=	pc+macintosh_vndr/%l%(v)
>-  *		jp			=	pc+jp(latin)+jp:2
>-  *	   	$nonlatin		=	pc+us+%l%(v):2
>-  *		*			=	pc+%l%(v)
>+ $macbooks	*			=	pc(pc105)+%l%(v)
>+ $macs		en_US			=	pc(pc105)+macintosh_vndr/us(extended)
>+ $macs		$macvendorlayouts	=	pc(pc105)+macintosh_vndr/%l%(v)
>+  *		jp			=	pc(pc105)+jp(latin)+jp:2
>+  *	   	$nonlatin		=	pc(pc105)+us+%l%(v):2
>+  *		*			=	pc(pc105)+%l%(v)
>Index: rules/compat/ml1_s.sh
>===================================================================
>RCS file: /cvs/xlibs/xkbdesc/rules/compat/ml1_s.sh,v
>retrieving revision 1.6
>diff -u -r1.6 ml1_s.sh
>--- rules/compat/ml1_s.sh	18 Sep 2006 11:45:12 -0000	1.6
>+++ rules/compat/ml1_s.sh	19 Sep 2006 06:46:43 -0000
>@@ -5,9 +5,9 @@
> > $OUTFILE
> 
> awk '{ 
>-  printf "  *		%s			=	pc+%s%%(v[1])\n", $1, $2; 
>+  printf "  *		%s			=	pc(pc105)+%s%%(v[1])\n", $1, $2; 
> }' < layoutRename.lst >> $OUTFILE
> 
> awk '{ 
>-  printf "  *		%s(%s)			=	pc+%s(%s)\n", $1, $2, $3, $4; 
>+  printf "  *		%s(%s)			=	pc(pc105)+%s(%s)\n", $1, $2, $3, $4; 
> }' < variantRename.lst >> $OUTFILE
>Index: rules/compat/ml1v1_s.sh
>===================================================================
>RCS file: /cvs/xlibs/xkbdesc/rules/compat/ml1v1_s.sh,v
>retrieving revision 1.2
>diff -u -r1.2 ml1v1_s.sh
>--- rules/compat/ml1v1_s.sh	18 Sep 2006 11:45:12 -0000	1.2
>+++ rules/compat/ml1v1_s.sh	19 Sep 2006 06:46:43 -0000
>@@ -5,5 +5,5 @@
> > $OUTFILE
> 
> awk '{ 
>-  printf "  *		%s		%s		=	pc+%s(%s)\n", $1, $2, $3, $4; 
>+  printf "  *		%s		%s		=	pc(pc105)+%s(%s)\n", $1, $2, $3, $4; 
> }' < variantRename.lst >> $OUTFILE
>Index: rules/compat/ml1v_s.sh
>===================================================================
>RCS file: /cvs/xlibs/xkbdesc/rules/compat/ml1v_s.sh,v
>retrieving revision 1.2
>diff -u -r1.2 ml1v_s.sh
>--- rules/compat/ml1v_s.sh	18 Sep 2006 11:45:12 -0000	1.2
>+++ rules/compat/ml1v_s.sh	19 Sep 2006 06:46:43 -0000
>@@ -5,5 +5,5 @@
> > $OUTFILE
> 
> awk '{ 
>-  printf "  *		%s		%s		=	pc+%s(%s)\n", $1, $2, $3, $4; 
>+  printf "  *		%s		%s		=	pc(pc105)+%s(%s)\n", $1, $2, $3, $4; 
> }' < variantRename.lst >> $OUTFILE
>Index: rules/compat/ml_s.sh
>===================================================================
>RCS file: /cvs/xlibs/xkbdesc/rules/compat/ml_s.sh,v
>retrieving revision 1.5
>diff -u -r1.5 ml_s.sh
>--- rules/compat/ml_s.sh	18 Sep 2006 11:45:12 -0000	1.5
>+++ rules/compat/ml_s.sh	19 Sep 2006 06:46:43 -0000
>@@ -5,9 +5,9 @@
> > $OUTFILE
> 
> awk '{ 
>-  printf "  *		%s			=	pc+%s\n", $1, $2; 
>+  printf "  *		%s			=	pc(pc105)+%s\n", $1, $2; 
> }' < layoutRename.lst >> $OUTFILE
> 
> awk '{ 
>-  printf "  *		%s(%s)			=	pc+%s(%s)\n", $1, $2, $3, $4; 
>+  printf "  *		%s(%s)			=	pc(pc105)+%s(%s)\n", $1, $2, $3, $4; 
> }' < variantRename.lst >> $OUTFILE
>Index: rules/compat/mlv_s.sh
>===================================================================
>RCS file: /cvs/xlibs/xkbdesc/rules/compat/mlv_s.sh,v
>retrieving revision 1.2
>diff -u -r1.2 mlv_s.sh
>--- rules/compat/mlv_s.sh	18 Sep 2006 11:45:12 -0000	1.2
>+++ rules/compat/mlv_s.sh	19 Sep 2006 06:46:43 -0000
>@@ -5,5 +5,5 @@
> > $OUTFILE
> 
> awk '{ 
>-  printf "  *		%s		%s		=	pc+%s(%s)\n", $1, $2, $3, $4; 
>+  printf "  *		%s		%s		=	pc(pc105)+%s(%s)\n", $1, $2, $3, $4; 
> }' < variantRename.lst >> $OUTFILE
>Index: symbols/pc
>===================================================================
>RCS file: /cvs/xlibs/xkbdesc/symbols/pc,v
>retrieving revision 1.6
>diff -u -r1.6 pc
>--- symbols/pc	18 Sep 2006 11:45:12 -0000	1.6
>+++ symbols/pc	19 Sep 2006 06:46:44 -0000
>@@ -143,3 +143,20 @@
>     key <RGHT> {	[  Right		]	};
> };
> 
>+// Compatibility with previous versions
>+partial hidden
>+xkb_symbols "basic" {
>+    include "pc"
>+};
>+partial hidden
>+xkb_symbols "pc101" {
>+    include "pc"
>+};
>+partial hidden
>+xkb_symbols "pc102" {
>+    include "pc"
>+};
>+partial hidden
>+xkb_symbols "pc104" {
>+    include "pc"
>+};

Actions: View | Splinter Review

Attachments on bug 8321: 7043 | 7067

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.