Bug#270810: /etc/X11/xkb/rules/xfree86 does not list all old layout files

[barbier@linuxfr.org (Denis Barbier)]

tags 270810 + patch
#  271259 already has a patch, but its tag was forgotten
tags 271259 + patch
thanks

On Sun, Sep 12, 2004 at 05:41:22PM +0200, Denis Barbier wrote:
> Stefan Kluth wrote:
> > The gnome keyboard preferences panel, accessed through the keyboard
> > indicator applet, does not manage to load "us_intl" as keyboard layout.
> > Instead, a error report window pops up, but the content is not helpful.
> 
> Please discard my previous comments, I had a closer look to this issue
> and found that:
>   a. XFree86 upstream introduced a multi-layout version of us_intl
>      after 4.3.0
>   b. Some old layout keymaps are not listed in /etc/X11/xkb/rules/xfree86

Here is a patch for (b), all layouts only available under the old format
are now listed.  Since this is only a consistency checking, I would like
to merge this patch with #271259.
Can I commit it?

Denis

$Id$

This patch by Denis Barbier.

List in $oldlayouts all layouts which are currently not available
in xlibs Debian package under the new format.  Closes: #271259
It also adds the lv3:ralt_switch option which does exist in xfree86.lst
but was forgotten in this file.

diff -ruN xc-old/programs/xkbcomp/rules/xfree86 xc/programs/xkbcomp/rules/xfree86
--- xc-old/programs/xkbcomp/rules/xfree86	Thu Sep 16 17:03:12 2004
+++ xc/programs/xkbcomp/rules/xfree86	Fri Sep 17 14:26:43 2004
@@ -9,7 +9,7 @@
 //
 
 // Layouts that still need be composed by old rules
-! $oldlayouts = az bs ca ca_enhanced de_CH fr_CH hu hu_qwerty lt_std mn vn hr_US
+! $oldlayouts = az bs ca ca_enhanced de_CH fr_CH hr_US hu hu_qwerty jp lt_std mn ru_yawerty se_FI se_NO se_SE tr_f us_intl vn
 
 // If you want non-latin layouts implicitly include the en_US layout
 // uncomment lines below
@@ -157,6 +157,7 @@
   lv3:win_switch	=	+level3(win_switch)
   lv3:lwin_switch	=	+level3(lwin_switch)
   lv3:rwin_switch	=	+level3(rwin_switch)
+  lv3:ralt_switch	=	+level3(ralt_switch)
   ctrl:nocaps		=	+ctrl(nocaps)
   ctrl:swapcaps		=	+ctrl(swapcaps)
   ctrl:ctrl_ac		=	+ctrl(ctrl_ac)