[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

xkb-data: Changes to 'debian-unstable'



 ChangeLog                                          |   30 
 Makefile.in                                        |   18 
 NEWS                                               |    1 
 aclocal.m4                                         |    3 
 compat/Makefile.in                                 |   12 
 compat/compat.dir                                  |   37 
 compat/complete                                    |    2 
 compat/default                                     |    2 
 compat/level5                                      |    2 
 config.guess                                       |  601 ++---
 config.sub                                         |  145 -
 configure                                          |  127 -
 configure.in                                       |    2 
 debian/changelog                                   |   11 
 debian/patches/add_void_definition_pl-324647.diff  |    4 
 debian/patches/clean.diff                          |   12 
 debian/patches/docs.diff                           |    6 
 debian/patches/mac_poweroff.diff                   |    6 
 debian/patches/resync_rules_base.diff              |  574 -----
 debian/patches/sclk_toggle.diff                    |   12 
 debian/patches/send-upstream/001_keypad_comma.diff |    8 
 debian/patches/unhide_lv3_enter_switch.diff        |   12 
 docs/Makefile.in                                   |   12 
 geometry/Makefile.in                               |   12 
 geometry/digital_vndr/Makefile.in                  |   12 
 geometry/geometry.dir                              |   90 
 geometry/hhk                                       |    2 
 geometry/sgi_vndr/Makefile.in                      |   12 
 intltool-extract.in                                |  397 ---
 intltool-merge.in                                  |  329 ---
 intltool-update.in                                 |  223 --
 keycodes/Makefile.in                               |   12 
 keycodes/digital_vndr/Makefile.in                  |   12 
 keycodes/keycodes.dir                              |   81 
 keycodes/sgi_vndr/Makefile.in                      |   12 
 keymap/Makefile.in                                 |   12 
 keymap/digital_vndr/Makefile.in                    |   12 
 keymap/keymap.dir                                  |  326 +--
 keymap/sgi_vndr/Makefile.in                        |   12 
 keymap/sun_vndr/Makefile.in                        |   12 
 po/ChangeLog                                       |    4 
 po/POTFILES.in                                     |    1 
 po/cs.po                                           | 1580 ++++++---------
 po/nl.po                                           | 1851 +++++++++---------
 po/sr@Latn.po                                      | 2104 +++++++++++++++------
 po/vi.po                                           | 1694 +++++++---------
 rules/Makefile.am                                  |    6 
 rules/Makefile.in                                  |   18 
 rules/base                                         |   75 
 rules/base.lst                                     |    4 
 rules/base.xml.in                                  |    8 
 rules/compat/Makefile.in                           |   12 
 rules/compat/base.l2_s.part                        |    8 
 rules/compat/base.l2v2_s.part                      |    7 
 rules/compat/base.l3_s.part                        |    8 
 rules/compat/base.l3v3_s.part                      |    7 
 rules/compat/base.l4_s.part                        |    8 
 rules/compat/base.l4v4_s.part                      |    7 
 rules/compat/base.ml1_s.part                       |    8 
 rules/compat/base.ml1v1_s.part                     |    7 
 rules/compat/base.ml_s.part                        |    8 
 rules/compat/base.mlv_s.part                       |    7 
 rules/compat/variantRename.lst                     |    1 
 semantics/Makefile.in                              |   12 
 semantics/semantics.dir                            |    4 
 symbols/Makefile.in                                |   12 
 symbols/ad                                         |    2 
 symbols/al                                         |    2 
 symbols/altwin                                     |    2 
 symbols/az                                         |    2 
 symbols/bd                                         |    2 
 symbols/be                                         |    2 
 symbols/bg                                         |    2 
 symbols/braille                                    |    2 
 symbols/bt                                         |    2 
 symbols/by                                         |    2 
 symbols/cd                                         |    2 
 symbols/ch                                         |    2 
 symbols/cn                                         |    2 
 symbols/ctrl                                       |    2 
 symbols/digital_vndr/Makefile.in                   |   12 
 symbols/epo                                        |    2 
 symbols/fi                                         |    4 
 symbols/fo                                         |    2 
 symbols/fujitsu_vndr/Makefile.in                   |   12 
 symbols/ge                                         |    4 
 symbols/gh                                         |    2 
 symbols/hp_vndr/Makefile.in                        |   12 
 symbols/hu                                         |    2 
 symbols/ie                                         |    2 
 symbols/il                                         |    2 
 symbols/inet                                       |    3 
 symbols/iq                                         |    2 
 symbols/ir                                         |    2 
 symbols/is                                         |    2 
 symbols/keypad                                     |    2 
 symbols/kg                                         |    2 
 symbols/kpdl                                       |    2 
 symbols/kr                                         |    2 
 symbols/latin                                      |    2 
 symbols/level5                                     |    2 
 symbols/lk                                         |    2 
 symbols/macintosh_vndr/Makefile.in                 |   12 
 symbols/macintosh_vndr/ch                          |    2 
 symbols/macintosh_vndr/is                          |    2 
 symbols/mao                                        |    2 
 symbols/mk                                         |    2 
 symbols/mm                                         |    2 
 symbols/mt                                         |    2 
 symbols/mv                                         |    2 
 symbols/nec_vndr/Makefile.in                       |   12 
 symbols/nl                                         |    2 
 symbols/no                                         |    2 
 symbols/ro                                         |   61 
 symbols/ru                                         |   18 
 symbols/se                                         |    2 
 symbols/sgi_vndr/Makefile.in                       |   12 
 symbols/sony_vndr/Makefile.in                      |   12 
 symbols/srvr_ctrl                                  |    2 
 symbols/sun_vndr/Makefile.in                       |   12 
 symbols/sy                                         |    2 
 symbols/symbols.dir                                | 1100 +++++-----
 symbols/tj                                         |    2 
 symbols/ua                                         |    8 
 symbols/us                                         |   44 
 symbols/uz                                         |    2 
 symbols/vn                                         |    2 
 symbols/xfree68_vndr/Makefile.in                   |   12 
 symbols/za                                         |    2 
 types/Makefile.in                                  |   12 
 types/complete                                     |    2 
 types/default                                      |    2 
 types/level5                                       |    2 
 types/types.dir                                    |   10 
 xkeyboard-config.spec                              |    2 
 135 files changed, 5615 insertions(+), 6525 deletions(-)

New commits:
commit 95d845b9b39eafa3698ef780653852e17289e06b
Author: Mohammed Adnene Trojette <adn@uracile.diwi.org>
Date:   Wed May 28 14:12:58 2008 +0200

    Refresh (timestamp-only changes)

diff --git a/debian/patches/add_void_definition_pl-324647.diff b/debian/patches/add_void_definition_pl-324647.diff
index b60ba44..daea0d2 100644
--- a/debian/patches/add_void_definition_pl-324647.diff
+++ b/debian/patches/add_void_definition_pl-324647.diff
@@ -1,7 +1,7 @@
 Index: xkb-data/symbols/pl
 ===================================================================
---- xkb-data.orig/symbols/pl
-+++ xkb-data/symbols/pl
+--- xkb-data.orig/symbols/pl	2008-05-28 14:11:56.000000000 +0200
++++ xkb-data/symbols/pl	2008-05-28 14:12:01.000000000 +0200
 @@ -11,11 +11,14 @@
  
      name[Group1]="Poland";
diff --git a/debian/patches/clean.diff b/debian/patches/clean.diff
index 5aa766a..3568604 100644
--- a/debian/patches/clean.diff
+++ b/debian/patches/clean.diff
@@ -4,8 +4,8 @@ Not submitted upstream.
 
 Index: xkb-data/rules/compat/Makefile.am
 ===================================================================
---- xkb-data.orig/rules/compat/Makefile.am	2008-05-28 13:37:20.000000000 +0200
-+++ xkb-data/rules/compat/Makefile.am	2008-05-28 14:08:04.000000000 +0200
+--- xkb-data.orig/rules/compat/Makefile.am	2008-05-28 14:11:57.000000000 +0200
++++ xkb-data/rules/compat/Makefile.am	2008-05-28 14:12:01.000000000 +0200
 @@ -7,15 +7,17 @@
  
  if USE_COMPAT_RULES
@@ -33,8 +33,8 @@ Index: xkb-data/rules/compat/Makefile.am
 +CLEANFILES=$(gen_parts)
 Index: xkb-data/rules/compat/Makefile.in
 ===================================================================
---- xkb-data.orig/rules/compat/Makefile.in	2008-05-28 13:37:20.000000000 +0200
-+++ xkb-data/rules/compat/Makefile.in	2008-05-28 14:08:04.000000000 +0200
+--- xkb-data.orig/rules/compat/Makefile.in	2008-05-28 14:11:57.000000000 +0200
++++ xkb-data/rules/compat/Makefile.in	2008-05-28 14:12:01.000000000 +0200
 @@ -181,14 +181,17 @@
  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
diff --git a/debian/patches/docs.diff b/debian/patches/docs.diff
index 7af4b79..24a9ffc 100644
--- a/debian/patches/docs.diff
+++ b/debian/patches/docs.diff
@@ -1,5 +1,7 @@
---- xkeyboard-config-0.8.orig/docs/README.config
-+++ xkeyboard-config-0.8/docs/README.config
+Index: xkb-data/docs/README.config
+===================================================================
+--- xkb-data.orig/docs/README.config	2008-05-28 14:11:57.000000000 +0200
++++ xkb-data/docs/README.config	2008-05-28 14:12:01.000000000 +0200
 @@ -41,7 +41,7 @@
  The proper rules file depends on your vendor. In reality, the commonest file
  of rules is xfree86. For each rules file there is a description file named
diff --git a/debian/patches/mac_poweroff.diff b/debian/patches/mac_poweroff.diff
index 805985e..f752661 100644
--- a/debian/patches/mac_poweroff.diff
+++ b/debian/patches/mac_poweroff.diff
@@ -3,8 +3,8 @@ Add the power key, as requested by Jörg Sommer in
 
 Index: xkb-data/symbols/inet
 ===================================================================
---- xkb-data.orig/symbols/inet	2008-05-28 13:37:20.000000000 +0200
-+++ xkb-data/symbols/inet	2008-05-28 14:08:18.000000000 +0200
+--- xkb-data.orig/symbols/inet	2008-05-28 14:11:57.000000000 +0200
++++ xkb-data/symbols/inet	2008-05-28 14:12:01.000000000 +0200
 @@ -2028,6 +2028,7 @@
      key <I2E>	{	[ XF86AudioLowerVolume	]	};
      key <I30>	{	[ XF86AudioRaiseVolume	]	};
diff --git a/debian/patches/resync_rules_base.diff b/debian/patches/resync_rules_base.diff
index 0389b14..31966d1 100644
--- a/debian/patches/resync_rules_base.diff
+++ b/debian/patches/resync_rules_base.diff
@@ -20,8 +20,8 @@
 
 Index: xkb-data/rules/base
 ===================================================================
---- xkb-data.orig/rules/base	2008-05-28 13:37:20.000000000 +0200
-+++ xkb-data/rules/base	2008-05-28 14:09:18.000000000 +0200
+--- xkb-data.orig/rules/base	2008-05-28 14:11:56.000000000 +0200
++++ xkb-data/rules/base	2008-05-28 14:12:01.000000000 +0200
 @@ -202,9 +202,6 @@
    *		yu		unicode		=	pc+srp(latinunicode)
    *		yu		yz		=	pc+srp(latinyz)
@@ -58,8 +58,8 @@ Index: xkb-data/rules/base
    nbsp:level3           =	+nbsp(level3)
 Index: xkb-data/rules/base.lst
 ===================================================================
---- xkb-data.orig/rules/base.lst	2008-05-28 13:37:20.000000000 +0200
-+++ xkb-data/rules/base.lst	2008-05-28 14:09:19.000000000 +0200
+--- xkb-data.orig/rules/base.lst	2008-05-28 14:11:56.000000000 +0200
++++ xkb-data/rules/base.lst	2008-05-28 14:12:01.000000000 +0200
 @@ -582,6 +582,7 @@
    grp:rshift_toggle    Right Shift key changes layout.
    grp:lctrl_toggle     Left Ctrl key changes layout.
diff --git a/debian/patches/sclk_toggle.diff b/debian/patches/sclk_toggle.diff
index 4f7aac1..5bef635 100644
--- a/debian/patches/sclk_toggle.diff
+++ b/debian/patches/sclk_toggle.diff
@@ -5,8 +5,8 @@ Not submitted yet.
 
 Index: xkb-data/symbols/group
 ===================================================================
---- xkb-data.orig/symbols/group
-+++ xkb-data/symbols/group
+--- xkb-data.orig/symbols/group	2008-05-28 14:11:57.000000000 +0200
++++ xkb-data/symbols/group	2008-05-28 14:12:01.000000000 +0200
 @@ -333,3 +333,15 @@
    key <I219>  { [ ISO_Next_Group, ISO_Prev_Group ] };
  };
@@ -25,8 +25,8 @@ Index: xkb-data/symbols/group
 +
 Index: xkb-data/rules/base.o_s.part
 ===================================================================
---- xkb-data.orig/rules/base.o_s.part
-+++ xkb-data/rules/base.o_s.part
+--- xkb-data.orig/rules/base.o_s.part	2008-05-28 14:11:57.000000000 +0200
++++ xkb-data/rules/base.o_s.part	2008-05-28 14:12:23.000000000 +0200
 @@ -32,6 +32,7 @@
    grp:lctrl_toggle	=	+group(lctrl_toggle)
    grp:rctrl_toggle	=	+group(rctrl_toggle)
@@ -37,8 +37,8 @@ Index: xkb-data/rules/base.o_s.part
    lv3:ralt_switch_multikey	=	+level3(ralt_switch_multikey)
 Index: xkb-data/rules/base.xml.in
 ===================================================================
---- xkb-data.orig/rules/base.xml.in
-+++ xkb-data/rules/base.xml.in
+--- xkb-data.orig/rules/base.xml.in	2008-05-28 14:11:57.000000000 +0200
++++ xkb-data/rules/base.xml.in	2008-05-28 14:12:23.000000000 +0200
 @@ -4076,6 +4076,12 @@
            <_description>Right Ctrl key changes layout.</_description>
          </configItem>
diff --git a/debian/patches/send-upstream/001_keypad_comma.diff b/debian/patches/send-upstream/001_keypad_comma.diff
index 91efe6e..36dd620 100644
--- a/debian/patches/send-upstream/001_keypad_comma.diff
+++ b/debian/patches/send-upstream/001_keypad_comma.diff
@@ -1,7 +1,7 @@
 Index: xkb-data/rules/base.o_s.part
 ===================================================================
---- xkb-data.orig/rules/base.o_s.part	2008-05-01 01:49:17.000000000 +0200
-+++ xkb-data/rules/base.o_s.part	2008-05-01 01:49:30.000000000 +0200
+--- xkb-data.orig/rules/base.o_s.part	2008-05-28 14:12:01.000000000 +0200
++++ xkb-data/rules/base.o_s.part	2008-05-28 14:12:01.000000000 +0200
 @@ -70,6 +70,7 @@
    keypad:legacy_wang    =	+keypad(legacy_wang)
    keypad:oss_wang       =	+keypad(oss_wang)
@@ -12,8 +12,8 @@ Index: xkb-data/rules/base.o_s.part
    nbsp:level3           =	+nbsp(level3)
 Index: xkb-data/rules/base.xml.in
 ===================================================================
---- xkb-data.orig/rules/base.xml.in	2008-05-01 01:48:53.000000000 +0200
-+++ xkb-data/rules/base.xml.in	2008-05-01 01:48:55.000000000 +0200
+--- xkb-data.orig/rules/base.xml.in	2008-05-28 14:12:01.000000000 +0200
++++ xkb-data/rules/base.xml.in	2008-05-28 14:12:01.000000000 +0200
 @@ -4233,6 +4233,12 @@
        </option>
        <option>
diff --git a/debian/patches/unhide_lv3_enter_switch.diff b/debian/patches/unhide_lv3_enter_switch.diff
index ce1df6c..ff586f3 100644
--- a/debian/patches/unhide_lv3_enter_switch.diff
+++ b/debian/patches/unhide_lv3_enter_switch.diff
@@ -5,8 +5,8 @@ Not submitted upstream.
 
 Index: xkb-data/rules/base.o_s.part
 ===================================================================
---- xkb-data.orig/rules/base.o_s.part
-+++ xkb-data/rules/base.o_s.part
+--- xkb-data.orig/rules/base.o_s.part	2008-05-28 14:12:01.000000000 +0200
++++ xkb-data/rules/base.o_s.part	2008-05-28 14:12:20.000000000 +0200
 @@ -43,6 +43,7 @@
    lv3:win_switch	=	+level3(win_switch)
    lv3:lwin_switch	=	+level3(lwin_switch)
@@ -17,8 +17,8 @@ Index: xkb-data/rules/base.o_s.part
    caps:grouplock	=	+capslock(grouplock)
 Index: xkb-data/symbols/level3
 ===================================================================
---- xkb-data.orig/symbols/level3
-+++ xkb-data/symbols/level3
+--- xkb-data.orig/symbols/level3	2008-05-28 14:11:56.000000000 +0200
++++ xkb-data/symbols/level3	2008-05-28 14:12:01.000000000 +0200
 @@ -136,7 +136,7 @@
  // using the level3(enter_switch) map, the Enter key on the keypad
  // temporarily chooses the third shift level.  This is especially
@@ -30,8 +30,8 @@ Index: xkb-data/symbols/level3
      type[Group1]="ONE_LEVEL",
 Index: xkb-data/rules/base.xml.in
 ===================================================================
---- xkb-data.orig/rules/base.xml.in
-+++ xkb-data/rules/base.xml.in
+--- xkb-data.orig/rules/base.xml.in	2008-05-28 14:12:01.000000000 +0200
++++ xkb-data/rules/base.xml.in	2008-05-28 14:12:20.000000000 +0200
 @@ -4150,6 +4150,12 @@
            <_description>Right Alt key never chooses 3rd level.</_description>
          </configItem>

commit 9e0c5f11c7e0c8a94795aec9b014afa86c5b2afc
Author: Mohammed Adnene Trojette <adn@uracile.diwi.org>
Date:   Wed May 28 14:10:11 2008 +0200

    Refresh patches

diff --git a/debian/patches/clean.diff b/debian/patches/clean.diff
index 972fecf..5aa766a 100644
--- a/debian/patches/clean.diff
+++ b/debian/patches/clean.diff
@@ -4,8 +4,8 @@ Not submitted upstream.
 
 Index: xkb-data/rules/compat/Makefile.am
 ===================================================================
---- xkb-data.orig/rules/compat/Makefile.am	2008-01-05 00:22:37.000000000 +0100
-+++ xkb-data/rules/compat/Makefile.am	2008-01-05 00:26:02.000000000 +0100
+--- xkb-data.orig/rules/compat/Makefile.am	2008-05-28 13:37:20.000000000 +0200
++++ xkb-data/rules/compat/Makefile.am	2008-05-28 14:08:04.000000000 +0200
 @@ -7,15 +7,17 @@
  
  if USE_COMPAT_RULES
@@ -33,9 +33,9 @@ Index: xkb-data/rules/compat/Makefile.am
 +CLEANFILES=$(gen_parts)
 Index: xkb-data/rules/compat/Makefile.in
 ===================================================================
---- xkb-data.orig/rules/compat/Makefile.in	2008-01-05 00:22:37.000000000 +0100
-+++ xkb-data/rules/compat/Makefile.in	2008-01-05 00:26:02.000000000 +0100
-@@ -191,14 +191,17 @@
+--- xkb-data.orig/rules/compat/Makefile.in	2008-05-28 13:37:20.000000000 +0200
++++ xkb-data/rules/compat/Makefile.in	2008-05-28 14:08:04.000000000 +0200
+@@ -181,14 +181,17 @@
  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
  dist_parts = base.o_s.part
@@ -56,7 +56,7 @@ Index: xkb-data/rules/compat/Makefile.in
  all: all-am
  
  .SUFFIXES:
-@@ -287,6 +290,7 @@
+@@ -277,6 +280,7 @@
  mostlyclean-generic:
  
  clean-generic:
diff --git a/debian/patches/mac_poweroff.diff b/debian/patches/mac_poweroff.diff
index 024b6a0..805985e 100644
--- a/debian/patches/mac_poweroff.diff
+++ b/debian/patches/mac_poweroff.diff
@@ -3,9 +3,9 @@ Add the power key, as requested by Jörg Sommer in
 
 Index: xkb-data/symbols/inet
 ===================================================================
---- xkb-data.orig/symbols/inet
-+++ xkb-data/symbols/inet
-@@ -2027,6 +2027,7 @@
+--- xkb-data.orig/symbols/inet	2008-05-28 13:37:20.000000000 +0200
++++ xkb-data/symbols/inet	2008-05-28 14:08:18.000000000 +0200
+@@ -2028,6 +2028,7 @@
      key <I2E>	{	[ XF86AudioLowerVolume	]	};
      key <I30>	{	[ XF86AudioRaiseVolume	]	};
      key <I56>   {       [ XF86RotateWindows	]	};
diff --git a/debian/patches/resync_rules_base.diff b/debian/patches/resync_rules_base.diff
index bf238cd..0389b14 100644
--- a/debian/patches/resync_rules_base.diff
+++ b/debian/patches/resync_rules_base.diff
@@ -20,31 +20,9 @@
 
 Index: xkb-data/rules/base
 ===================================================================
---- xkb-data.orig/rules/base	2008-05-01 01:56:51.000000000 +0200
-+++ xkb-data/rules/base	2008-05-01 01:57:01.000000000 +0200
-@@ -165,6 +165,8 @@
-   *		dvorak		pl		=	pc+pl(dvorak_quotes)
-   *		dvorak		pl_altquotes		=	pc+pl(dvorak_altquotes)
-   *		dzdwi		basic		=	pc+bt(basic)
-+  *		fi		basic		=	pc+fi(classic)
-+  *		ge		azerty_tskapo		=	pc+fr(geo)
-   *		guj		basic		=	pc+in(guj)
-   *		gur		basic		=	pc+in(guru)
-   *		ie		laptop		=	pc+ie(basic)
-@@ -181,7 +183,11 @@
-   *		ogham		is434laptop		=	pc+ie(ogam_is434)
-   *		ori		basic		=	pc+in(ori)
-   *		ro		de		=	pc+ro(winkeys)
--  *		ro		us		=	pc+ro(std)
-+  *		ro		us		=	pc+ro(std_comma)
-+  *		ro		std		=	pc+ro(std_cedilla)
-+  *		ro		academic		=	pc+ro(std_comma)
-+  *		ru		winkeys		=	pc+ru(basic)
-+  *		ru		os		=	pc+ru(os_legacy)
-   *		sapmi		basic		=	pc+no(smi)
-   *		sapmi		nodeadkeys		=	pc+no(smi_nodeadkeys)
-   *		sapmi		sefi		=	pc+fi(smi)
-@@ -197,14 +203,12 @@
+--- xkb-data.orig/rules/base	2008-05-28 13:37:20.000000000 +0200
++++ xkb-data/rules/base	2008-05-28 14:09:18.000000000 +0200
+@@ -202,9 +202,6 @@
    *		yu		unicode		=	pc+srp(latinunicode)
    *		yu		yz		=	pc+srp(latinyz)
    *		yu		unicodeyz		=	pc+srp(latinunicodeyz)
@@ -54,243 +32,7 @@ Index: xkb-data/rules/base
  
  ! model		layout				=	symbols
    *		ar			=	pc+ara
-   *		ben			=	pc+in(ben)
-   *		bs			=	pc+ba
-+  *		cs			=	pc+rs
-   *		cz_qwerty			=	pc+cz(qwerty)
-   *		dev			=	pc+in(deva)
-   *		dvorak			=	pc+us(dvorak)
-@@ -237,6 +241,8 @@
-   *		dvorak(pl)			=	pc+pl(dvorak_quotes)
-   *		dvorak(pl_altquotes)			=	pc+pl(dvorak_altquotes)
-   *		dzdwi(basic)			=	pc+bt(basic)
-+  *		fi(basic)			=	pc+fi(classic)
-+  *		ge(azerty_tskapo)			=	pc+fr(geo)
-   *		guj(basic)			=	pc+in(guj)
-   *		gur(basic)			=	pc+in(guru)
-   *		ie(laptop)			=	pc+ie(basic)
-@@ -253,7 +259,11 @@
-   *		ogham(is434laptop)			=	pc+ie(ogam_is434)
-   *		ori(basic)			=	pc+in(ori)
-   *		ro(de)			=	pc+ro(winkeys)
--  *		ro(us)			=	pc+ro(std)
-+  *		ro(us)			=	pc+ro(std_comma)
-+  *		ro(std)			=	pc+ro(std_cedilla)
-+  *		ro(academic)			=	pc+ro(std_comma)
-+  *		ru(winkeys)			=	pc+ru(basic)
-+  *		ru(os)			=	pc+ru(os_legacy)
-   *		sapmi(basic)			=	pc+no(smi)
-   *		sapmi(nodeadkeys)			=	pc+no(smi_nodeadkeys)
-   *		sapmi(sefi)			=	pc+fi(smi)
-@@ -300,6 +310,7 @@
-   *		ar			=	pc+ara%(v[1])
-   *		ben			=	pc+in(ben)%(v[1])
-   *		bs			=	pc+ba%(v[1])
-+  *		cs			=	pc+rs%(v[1])
-   *		cz_qwerty			=	pc+cz(qwerty)%(v[1])
-   *		dev			=	pc+in(deva)%(v[1])
-   *		dvorak			=	pc+us(dvorak)%(v[1])
-@@ -332,6 +343,8 @@
-   *		dvorak(pl)			=	pc+pl(dvorak_quotes)
-   *		dvorak(pl_altquotes)			=	pc+pl(dvorak_altquotes)
-   *		dzdwi(basic)			=	pc+bt(basic)
-+  *		fi(basic)			=	pc+fi(classic)
-+  *		ge(azerty_tskapo)			=	pc+fr(geo)
-   *		guj(basic)			=	pc+in(guj)
-   *		gur(basic)			=	pc+in(guru)
-   *		ie(laptop)			=	pc+ie(basic)
-@@ -348,7 +361,11 @@
-   *		ogham(is434laptop)			=	pc+ie(ogam_is434)
-   *		ori(basic)			=	pc+in(ori)
-   *		ro(de)			=	pc+ro(winkeys)
--  *		ro(us)			=	pc+ro(std)
-+  *		ro(us)			=	pc+ro(std_comma)
-+  *		ro(std)			=	pc+ro(std_cedilla)
-+  *		ro(academic)			=	pc+ro(std_comma)
-+  *		ru(winkeys)			=	pc+ru(basic)
-+  *		ru(os)			=	pc+ru(os_legacy)
-   *		sapmi(basic)			=	pc+no(smi)
-   *		sapmi(nodeadkeys)			=	pc+no(smi_nodeadkeys)
-   *		sapmi(sefi)			=	pc+fi(smi)
-@@ -385,6 +402,8 @@
-   *		dvorak		pl		=	pc+pl(dvorak_quotes)
-   *		dvorak		pl_altquotes		=	pc+pl(dvorak_altquotes)
-   *		dzdwi		basic		=	pc+bt(basic)
-+  *		fi		basic		=	pc+fi(classic)
-+  *		ge		azerty_tskapo		=	pc+fr(geo)
-   *		guj		basic		=	pc+in(guj)
-   *		gur		basic		=	pc+in(guru)
-   *		ie		laptop		=	pc+ie(basic)
-@@ -401,7 +420,11 @@
-   *		ogham		is434laptop		=	pc+ie(ogam_is434)
-   *		ori		basic		=	pc+in(ori)
-   *		ro		de		=	pc+ro(winkeys)
--  *		ro		us		=	pc+ro(std)
-+  *		ro		us		=	pc+ro(std_comma)
-+  *		ro		std		=	pc+ro(std_cedilla)
-+  *		ro		academic		=	pc+ro(std_comma)
-+  *		ru		winkeys		=	pc+ru(basic)
-+  *		ru		os		=	pc+ru(os_legacy)
-   *		sapmi		basic		=	pc+no(smi)
-   *		sapmi		nodeadkeys		=	pc+no(smi_nodeadkeys)
-   *		sapmi		sefi		=	pc+fi(smi)
-@@ -422,6 +445,7 @@
-   ar		=	+ara%(v[2]):2
-   ben		=	+in(ben)%(v[2]):2
-   bs		=	+ba%(v[2]):2
-+  cs		=	+rs%(v[2]):2
-   cz_qwerty		=	+cz(qwerty)%(v[2]):2
-   dev		=	+in(deva)%(v[2]):2
-   dvorak		=	+us(dvorak)%(v[2]):2
-@@ -454,6 +478,8 @@
-   dvorak(pl)	=	+pl(dvorak_quotes):2
-   dvorak(pl_altquotes)	=	+pl(dvorak_altquotes):2
-   dzdwi(basic)	=	+bt(basic):2
-+  fi(basic)	=	+fi(classic):2
-+  ge(azerty_tskapo)	=	+fr(geo):2
-   guj(basic)	=	+in(guj):2
-   gur(basic)	=	+in(guru):2
-   ie(laptop)	=	+ie(basic):2
-@@ -470,7 +496,11 @@
-   ogham(is434laptop)	=	+ie(ogam_is434):2
-   ori(basic)	=	+in(ori):2
-   ro(de)	=	+ro(winkeys):2
--  ro(us)	=	+ro(std):2
-+  ro(us)	=	+ro(std_comma):2
-+  ro(std)	=	+ro(std_cedilla):2
-+  ro(academic)	=	+ro(std_comma):2
-+  ru(winkeys)	=	+ru(basic):2
-+  ru(os)	=	+ru(os_legacy):2
-   sapmi(basic)	=	+no(smi):2
-   sapmi(nodeadkeys)	=	+no(smi_nodeadkeys):2
-   sapmi(sefi)	=	+fi(smi):2
-@@ -492,6 +522,7 @@
-   ar		=	+ara%(v[3]):3
-   ben		=	+in(ben)%(v[3]):3
-   bs		=	+ba%(v[3]):3
-+  cs		=	+rs%(v[3]):3
-   cz_qwerty		=	+cz(qwerty)%(v[3]):3
-   dev		=	+in(deva)%(v[3]):3
-   dvorak		=	+us(dvorak)%(v[3]):3
-@@ -524,6 +555,8 @@
-   dvorak(pl)	=	+pl(dvorak_quotes):3
-   dvorak(pl_altquotes)	=	+pl(dvorak_altquotes):3
-   dzdwi(basic)	=	+bt(basic):3
-+  fi(basic)	=	+fi(classic):3
-+  ge(azerty_tskapo)	=	+fr(geo):3
-   guj(basic)	=	+in(guj):3
-   gur(basic)	=	+in(guru):3
-   ie(laptop)	=	+ie(basic):3
-@@ -540,7 +573,11 @@
-   ogham(is434laptop)	=	+ie(ogam_is434):3
-   ori(basic)	=	+in(ori):3
-   ro(de)	=	+ro(winkeys):3
--  ro(us)	=	+ro(std):3
-+  ro(us)	=	+ro(std_comma):3
-+  ro(std)	=	+ro(std_cedilla):3
-+  ro(academic)	=	+ro(std_comma):3
-+  ru(winkeys)	=	+ru(basic):3
-+  ru(os)	=	+ru(os_legacy):3
-   sapmi(basic)	=	+no(smi):3
-   sapmi(nodeadkeys)	=	+no(smi_nodeadkeys):3
-   sapmi(sefi)	=	+fi(smi):3
-@@ -562,6 +599,7 @@
-   ar		=	+ara%(v[4]):4
-   ben		=	+in(ben)%(v[4]):4
-   bs		=	+ba%(v[4]):4
-+  cs		=	+rs%(v[4]):4
-   cz_qwerty		=	+cz(qwerty)%(v[4]):4
-   dev		=	+in(deva)%(v[4]):4
-   dvorak		=	+us(dvorak)%(v[4]):4
-@@ -594,6 +632,8 @@
-   dvorak(pl)	=	+pl(dvorak_quotes):4
-   dvorak(pl_altquotes)	=	+pl(dvorak_altquotes):4
-   dzdwi(basic)	=	+bt(basic):4
-+  fi(basic)	=	+fi(classic):4
-+  ge(azerty_tskapo)	=	+fr(geo):4
-   guj(basic)	=	+in(guj):4
-   gur(basic)	=	+in(guru):4
-   ie(laptop)	=	+ie(basic):4
-@@ -610,7 +650,11 @@
-   ogham(is434laptop)	=	+ie(ogam_is434):4
-   ori(basic)	=	+in(ori):4
-   ro(de)	=	+ro(winkeys):4
--  ro(us)	=	+ro(std):4
-+  ro(us)	=	+ro(std_comma):4
-+  ro(std)	=	+ro(std_cedilla):4
-+  ro(academic)	=	+ro(std_comma):4
-+  ru(winkeys)	=	+ru(basic):4
-+  ru(os)	=	+ru(os_legacy):4
-   sapmi(basic)	=	+no(smi):4
-   sapmi(nodeadkeys)	=	+no(smi_nodeadkeys):4
-   sapmi(sefi)	=	+fi(smi):4
-@@ -638,6 +682,8 @@
-   dvorak		pl	=	+pl(dvorak_quotes):2
-   dvorak		pl_altquotes	=	+pl(dvorak_altquotes):2
-   dzdwi		basic	=	+bt(basic):2
-+  fi		basic	=	+fi(classic):2
-+  ge		azerty_tskapo	=	+fr(geo):2
-   guj		basic	=	+in(guj):2
-   gur		basic	=	+in(guru):2
-   ie		laptop	=	+ie(basic):2
-@@ -654,7 +700,11 @@
-   ogham		is434laptop	=	+ie(ogam_is434):2
-   ori		basic	=	+in(ori):2
-   ro		de	=	+ro(winkeys):2
--  ro		us	=	+ro(std):2
-+  ro		us	=	+ro(std_comma):2
-+  ro		std	=	+ro(std_cedilla):2
-+  ro		academic	=	+ro(std_comma):2
-+  ru		winkeys	=	+ru(basic):2
-+  ru		os	=	+ru(os_legacy):2
-   sapmi		basic	=	+no(smi):2
-   sapmi		nodeadkeys	=	+no(smi_nodeadkeys):2
-   sapmi		sefi	=	+fi(smi):2
-@@ -681,6 +731,8 @@
-   dvorak		pl	=	+pl(dvorak_quotes):3
-   dvorak		pl_altquotes	=	+pl(dvorak_altquotes):3
-   dzdwi		basic	=	+bt(basic):3
-+  fi		basic	=	+fi(classic):3
-+  ge		azerty_tskapo	=	+fr(geo):3
-   guj		basic	=	+in(guj):3
-   gur		basic	=	+in(guru):3
-   ie		laptop	=	+ie(basic):3
-@@ -697,7 +749,11 @@
-   ogham		is434laptop	=	+ie(ogam_is434):3
-   ori		basic	=	+in(ori):3
-   ro		de	=	+ro(winkeys):3
--  ro		us	=	+ro(std):3
-+  ro		us	=	+ro(std_comma):3
-+  ro		std	=	+ro(std_cedilla):3
-+  ro		academic	=	+ro(std_comma):3
-+  ru		winkeys	=	+ru(basic):3
-+  ru		os	=	+ru(os_legacy):3
-   sapmi		basic	=	+no(smi):3
-   sapmi		nodeadkeys	=	+no(smi_nodeadkeys):3
-   sapmi		sefi	=	+fi(smi):3
-@@ -724,6 +780,8 @@
-   dvorak		pl	=	+pl(dvorak_quotes):4
-   dvorak		pl_altquotes	=	+pl(dvorak_altquotes):4
-   dzdwi		basic	=	+bt(basic):4
-+  fi		basic	=	+fi(classic):4
-+  ge		azerty_tskapo	=	+fr(geo):4
-   guj		basic	=	+in(guj):4
-   gur		basic	=	+in(guru):4
-   ie		laptop	=	+ie(basic):4
-@@ -740,7 +798,11 @@
-   ogham		is434laptop	=	+ie(ogam_is434):4
-   ori		basic	=	+in(ori):4
-   ro		de	=	+ro(winkeys):4
--  ro		us	=	+ro(std):4
-+  ro		us	=	+ro(std_comma):4
-+  ro		std	=	+ro(std_cedilla):4
-+  ro		academic	=	+ro(std_comma):4
-+  ru		winkeys	=	+ru(basic):4
-+  ru		os	=	+ru(os_legacy):4
-   sapmi		basic	=	+no(smi):4
-   sapmi		nodeadkeys	=	+no(smi_nodeadkeys):4
-   sapmi		sefi	=	+fi(smi):4
-@@ -851,6 +913,7 @@
+@@ -906,6 +903,7 @@
    grp:lctrl_toggle	=	+group(lctrl_toggle)
    grp:rctrl_toggle	=	+group(rctrl_toggle)
    grp:lalt_toggle	=	+group(lalt_toggle)
@@ -298,7 +40,7 @@ Index: xkb-data/rules/base
    lv3:switch		=	+level3(switch)
    lv3:ralt_switch	=	+level3(ralt_switch)
    lv3:ralt_switch_multikey	=	+level3(ralt_switch_multikey)
-@@ -861,6 +924,7 @@
+@@ -916,6 +914,7 @@
    lv3:win_switch	=	+level3(win_switch)
    lv3:lwin_switch	=	+level3(lwin_switch)
    lv3:rwin_switch	=	+level3(rwin_switch)
@@ -306,7 +48,7 @@ Index: xkb-data/rules/base
    caps:capslock		=	+capslock(capslock)
    caps:shiftlock	=	+capslock(shiftlock)
    caps:grouplock	=	+capslock(grouplock)
-@@ -887,6 +951,7 @@
+@@ -942,6 +941,7 @@
    keypad:legacy_wang    =	+keypad(legacy_wang)
    keypad:oss_wang       =	+keypad(oss_wang)
    keypad:future_wang    =	+keypad(future_wang)
@@ -316,8 +58,8 @@ Index: xkb-data/rules/base
    nbsp:level3           =	+nbsp(level3)
 Index: xkb-data/rules/base.lst
 ===================================================================
---- xkb-data.orig/rules/base.lst	2008-05-01 01:56:51.000000000 +0200
-+++ xkb-data/rules/base.lst	2008-05-01 01:57:02.000000000 +0200
+--- xkb-data.orig/rules/base.lst	2008-05-28 13:37:20.000000000 +0200
++++ xkb-data/rules/base.lst	2008-05-28 14:09:19.000000000 +0200
 @@ -582,6 +582,7 @@
    grp:rshift_toggle    Right Shift key changes layout.
    grp:lctrl_toggle     Left Ctrl key changes layout.
@@ -342,303 +84,3 @@ Index: xkb-data/rules/base.lst
    keypad:oss           Keypad with unicode additions (arrows and math operators)
    keypad:future        Keypad with unicode additions (arrows and math operators). Math operators on default level.
    keypad:legacy_wang   Legacy Wang 724 keypad
-Index: xkb-data/rules/compat/base.l2_s.part
-===================================================================
---- xkb-data.orig/rules/compat/base.l2_s.part	2008-05-01 01:56:51.000000000 +0200
-+++ xkb-data/rules/compat/base.l2_s.part	2008-05-01 01:57:00.000000000 +0200
-@@ -1,6 +1,7 @@
-   ar		=	+ara%(v[2]):2
-   ben		=	+in(ben)%(v[2]):2
-   bs		=	+ba%(v[2]):2
-+  cs		=	+rs%(v[2]):2
-   cz_qwerty		=	+cz(qwerty)%(v[2]):2
-   dev		=	+in(deva)%(v[2]):2
-   dvorak		=	+us(dvorak)%(v[2]):2
-@@ -33,6 +34,8 @@
-   dvorak(pl)	=	+pl(dvorak_quotes):2
-   dvorak(pl_altquotes)	=	+pl(dvorak_altquotes):2
-   dzdwi(basic)	=	+bt(basic):2
-+  fi(basic)	=	+fi(classic):2
-+  ge(azerty_tskapo)	=	+fr(geo):2
-   guj(basic)	=	+in(guj):2
-   gur(basic)	=	+in(guru):2
-   ie(laptop)	=	+ie(basic):2
-@@ -49,7 +52,11 @@
-   ogham(is434laptop)	=	+ie(ogam_is434):2
-   ori(basic)	=	+in(ori):2
-   ro(de)	=	+ro(winkeys):2
--  ro(us)	=	+ro(std):2
-+  ro(us)	=	+ro(std_comma):2
-+  ro(std)	=	+ro(std_cedilla):2
-+  ro(academic)	=	+ro(std_comma):2
-+  ru(winkeys)	=	+ru(basic):2
-+  ru(os)	=	+ru(os_legacy):2
-   sapmi(basic)	=	+no(smi):2
-   sapmi(nodeadkeys)	=	+no(smi_nodeadkeys):2
-   sapmi(sefi)	=	+fi(smi):2
-Index: xkb-data/rules/compat/base.l2v2_s.part
-===================================================================
---- xkb-data.orig/rules/compat/base.l2v2_s.part	2008-05-01 01:56:51.000000000 +0200
-+++ xkb-data/rules/compat/base.l2v2_s.part	2008-05-01 01:57:00.000000000 +0200
-@@ -7,6 +7,8 @@
-   dvorak		pl	=	+pl(dvorak_quotes):2
-   dvorak		pl_altquotes	=	+pl(dvorak_altquotes):2
-   dzdwi		basic	=	+bt(basic):2
-+  fi		basic	=	+fi(classic):2
-+  ge		azerty_tskapo	=	+fr(geo):2
-   guj		basic	=	+in(guj):2
-   gur		basic	=	+in(guru):2
-   ie		laptop	=	+ie(basic):2
-@@ -23,7 +25,11 @@
-   ogham		is434laptop	=	+ie(ogam_is434):2
-   ori		basic	=	+in(ori):2
-   ro		de	=	+ro(winkeys):2
--  ro		us	=	+ro(std):2
-+  ro		us	=	+ro(std_comma):2
-+  ro		std	=	+ro(std_cedilla):2
-+  ro		academic	=	+ro(std_comma):2
-+  ru		winkeys	=	+ru(basic):2
-+  ru		os	=	+ru(os_legacy):2
-   sapmi		basic	=	+no(smi):2
-   sapmi		nodeadkeys	=	+no(smi_nodeadkeys):2
-   sapmi		sefi	=	+fi(smi):2
-Index: xkb-data/rules/compat/base.l3_s.part
-===================================================================
---- xkb-data.orig/rules/compat/base.l3_s.part	2008-05-01 01:56:51.000000000 +0200
-+++ xkb-data/rules/compat/base.l3_s.part	2008-05-01 01:57:00.000000000 +0200
-@@ -1,6 +1,7 @@
-   ar		=	+ara%(v[3]):3
-   ben		=	+in(ben)%(v[3]):3
-   bs		=	+ba%(v[3]):3
-+  cs		=	+rs%(v[3]):3
-   cz_qwerty		=	+cz(qwerty)%(v[3]):3
-   dev		=	+in(deva)%(v[3]):3
-   dvorak		=	+us(dvorak)%(v[3]):3
-@@ -33,6 +34,8 @@
-   dvorak(pl)	=	+pl(dvorak_quotes):3
-   dvorak(pl_altquotes)	=	+pl(dvorak_altquotes):3
-   dzdwi(basic)	=	+bt(basic):3
-+  fi(basic)	=	+fi(classic):3
-+  ge(azerty_tskapo)	=	+fr(geo):3
-   guj(basic)	=	+in(guj):3
-   gur(basic)	=	+in(guru):3
-   ie(laptop)	=	+ie(basic):3
-@@ -49,7 +52,11 @@
-   ogham(is434laptop)	=	+ie(ogam_is434):3
-   ori(basic)	=	+in(ori):3
-   ro(de)	=	+ro(winkeys):3
--  ro(us)	=	+ro(std):3
-+  ro(us)	=	+ro(std_comma):3
-+  ro(std)	=	+ro(std_cedilla):3
-+  ro(academic)	=	+ro(std_comma):3
-+  ru(winkeys)	=	+ru(basic):3
-+  ru(os)	=	+ru(os_legacy):3
-   sapmi(basic)	=	+no(smi):3
-   sapmi(nodeadkeys)	=	+no(smi_nodeadkeys):3
-   sapmi(sefi)	=	+fi(smi):3
-Index: xkb-data/rules/compat/base.l3v3_s.part
-===================================================================
---- xkb-data.orig/rules/compat/base.l3v3_s.part	2008-05-01 01:56:51.000000000 +0200
-+++ xkb-data/rules/compat/base.l3v3_s.part	2008-05-01 01:57:00.000000000 +0200
-@@ -7,6 +7,8 @@
-   dvorak		pl	=	+pl(dvorak_quotes):3
-   dvorak		pl_altquotes	=	+pl(dvorak_altquotes):3
-   dzdwi		basic	=	+bt(basic):3
-+  fi		basic	=	+fi(classic):3
-+  ge		azerty_tskapo	=	+fr(geo):3
-   guj		basic	=	+in(guj):3
-   gur		basic	=	+in(guru):3
-   ie		laptop	=	+ie(basic):3
-@@ -23,7 +25,11 @@
-   ogham		is434laptop	=	+ie(ogam_is434):3
-   ori		basic	=	+in(ori):3
-   ro		de	=	+ro(winkeys):3
--  ro		us	=	+ro(std):3
-+  ro		us	=	+ro(std_comma):3
-+  ro		std	=	+ro(std_cedilla):3
-+  ro		academic	=	+ro(std_comma):3
-+  ru		winkeys	=	+ru(basic):3
-+  ru		os	=	+ru(os_legacy):3
-   sapmi		basic	=	+no(smi):3
-   sapmi		nodeadkeys	=	+no(smi_nodeadkeys):3
-   sapmi		sefi	=	+fi(smi):3
-Index: xkb-data/rules/compat/base.l4_s.part
-===================================================================
---- xkb-data.orig/rules/compat/base.l4_s.part	2008-05-01 01:56:51.000000000 +0200
-+++ xkb-data/rules/compat/base.l4_s.part	2008-05-01 01:57:00.000000000 +0200
-@@ -1,6 +1,7 @@
-   ar		=	+ara%(v[4]):4
-   ben		=	+in(ben)%(v[4]):4
-   bs		=	+ba%(v[4]):4
-+  cs		=	+rs%(v[4]):4
-   cz_qwerty		=	+cz(qwerty)%(v[4]):4
-   dev		=	+in(deva)%(v[4]):4
-   dvorak		=	+us(dvorak)%(v[4]):4
-@@ -33,6 +34,8 @@
-   dvorak(pl)	=	+pl(dvorak_quotes):4
-   dvorak(pl_altquotes)	=	+pl(dvorak_altquotes):4
-   dzdwi(basic)	=	+bt(basic):4
-+  fi(basic)	=	+fi(classic):4
-+  ge(azerty_tskapo)	=	+fr(geo):4
-   guj(basic)	=	+in(guj):4
-   gur(basic)	=	+in(guru):4
-   ie(laptop)	=	+ie(basic):4
-@@ -49,7 +52,11 @@
-   ogham(is434laptop)	=	+ie(ogam_is434):4
-   ori(basic)	=	+in(ori):4
-   ro(de)	=	+ro(winkeys):4
--  ro(us)	=	+ro(std):4
-+  ro(us)	=	+ro(std_comma):4
-+  ro(std)	=	+ro(std_cedilla):4
-+  ro(academic)	=	+ro(std_comma):4
-+  ru(winkeys)	=	+ru(basic):4
-+  ru(os)	=	+ru(os_legacy):4
-   sapmi(basic)	=	+no(smi):4
-   sapmi(nodeadkeys)	=	+no(smi_nodeadkeys):4
-   sapmi(sefi)	=	+fi(smi):4
-Index: xkb-data/rules/compat/base.l4v4_s.part
-===================================================================
---- xkb-data.orig/rules/compat/base.l4v4_s.part	2008-05-01 01:56:51.000000000 +0200
-+++ xkb-data/rules/compat/base.l4v4_s.part	2008-05-01 01:57:00.000000000 +0200
-@@ -7,6 +7,8 @@
-   dvorak		pl	=	+pl(dvorak_quotes):4
-   dvorak		pl_altquotes	=	+pl(dvorak_altquotes):4
-   dzdwi		basic	=	+bt(basic):4
-+  fi		basic	=	+fi(classic):4
-+  ge		azerty_tskapo	=	+fr(geo):4
-   guj		basic	=	+in(guj):4
-   gur		basic	=	+in(guru):4
-   ie		laptop	=	+ie(basic):4
-@@ -23,7 +25,11 @@
-   ogham		is434laptop	=	+ie(ogam_is434):4
-   ori		basic	=	+in(ori):4
-   ro		de	=	+ro(winkeys):4
--  ro		us	=	+ro(std):4
-+  ro		us	=	+ro(std_comma):4
-+  ro		std	=	+ro(std_cedilla):4
-+  ro		academic	=	+ro(std_comma):4
-+  ru		winkeys	=	+ru(basic):4
-+  ru		os	=	+ru(os_legacy):4
-   sapmi		basic	=	+no(smi):4
-   sapmi		nodeadkeys	=	+no(smi_nodeadkeys):4
-   sapmi		sefi	=	+fi(smi):4
-Index: xkb-data/rules/compat/base.ml1_s.part
-===================================================================
---- xkb-data.orig/rules/compat/base.ml1_s.part	2008-05-01 01:56:51.000000000 +0200
-+++ xkb-data/rules/compat/base.ml1_s.part	2008-05-01 01:57:01.000000000 +0200
-@@ -1,6 +1,7 @@
-   *		ar			=	pc+ara%(v[1])
-   *		ben			=	pc+in(ben)%(v[1])
-   *		bs			=	pc+ba%(v[1])
-+  *		cs			=	pc+rs%(v[1])
-   *		cz_qwerty			=	pc+cz(qwerty)%(v[1])
-   *		dev			=	pc+in(deva)%(v[1])
-   *		dvorak			=	pc+us(dvorak)%(v[1])
-@@ -33,6 +34,8 @@
-   *		dvorak(pl)			=	pc+pl(dvorak_quotes)
-   *		dvorak(pl_altquotes)			=	pc+pl(dvorak_altquotes)
-   *		dzdwi(basic)			=	pc+bt(basic)
-+  *		fi(basic)			=	pc+fi(classic)
-+  *		ge(azerty_tskapo)			=	pc+fr(geo)
-   *		guj(basic)			=	pc+in(guj)
-   *		gur(basic)			=	pc+in(guru)
-   *		ie(laptop)			=	pc+ie(basic)
-@@ -49,7 +52,11 @@
-   *		ogham(is434laptop)			=	pc+ie(ogam_is434)
-   *		ori(basic)			=	pc+in(ori)
-   *		ro(de)			=	pc+ro(winkeys)
--  *		ro(us)			=	pc+ro(std)
-+  *		ro(us)			=	pc+ro(std_comma)
-+  *		ro(std)			=	pc+ro(std_cedilla)
-+  *		ro(academic)			=	pc+ro(std_comma)
-+  *		ru(winkeys)			=	pc+ru(basic)
-+  *		ru(os)			=	pc+ru(os_legacy)
-   *		sapmi(basic)			=	pc+no(smi)
-   *		sapmi(nodeadkeys)			=	pc+no(smi_nodeadkeys)
-   *		sapmi(sefi)			=	pc+fi(smi)
-Index: xkb-data/rules/compat/base.ml1v1_s.part
-===================================================================
---- xkb-data.orig/rules/compat/base.ml1v1_s.part	2008-05-01 01:56:51.000000000 +0200
-+++ xkb-data/rules/compat/base.ml1v1_s.part	2008-05-01 01:57:01.000000000 +0200
-@@ -7,6 +7,8 @@
-   *		dvorak		pl		=	pc+pl(dvorak_quotes)
-   *		dvorak		pl_altquotes		=	pc+pl(dvorak_altquotes)
-   *		dzdwi		basic		=	pc+bt(basic)
-+  *		fi		basic		=	pc+fi(classic)
-+  *		ge		azerty_tskapo		=	pc+fr(geo)
-   *		guj		basic		=	pc+in(guj)
-   *		gur		basic		=	pc+in(guru)
-   *		ie		laptop		=	pc+ie(basic)
-@@ -23,7 +25,11 @@
-   *		ogham		is434laptop		=	pc+ie(ogam_is434)
-   *		ori		basic		=	pc+in(ori)
-   *		ro		de		=	pc+ro(winkeys)
--  *		ro		us		=	pc+ro(std)
-+  *		ro		us		=	pc+ro(std_comma)
-+  *		ro		std		=	pc+ro(std_cedilla)
-+  *		ro		academic		=	pc+ro(std_comma)
-+  *		ru		winkeys		=	pc+ru(basic)
-+  *		ru		os		=	pc+ru(os_legacy)
-   *		sapmi		basic		=	pc+no(smi)
-   *		sapmi		nodeadkeys		=	pc+no(smi_nodeadkeys)
-   *		sapmi		sefi		=	pc+fi(smi)
-Index: xkb-data/rules/compat/base.ml_s.part
-===================================================================
---- xkb-data.orig/rules/compat/base.ml_s.part	2008-05-01 01:56:51.000000000 +0200
-+++ xkb-data/rules/compat/base.ml_s.part	2008-05-01 01:57:01.000000000 +0200
-@@ -1,6 +1,7 @@
-   *		ar			=	pc+ara
-   *		ben			=	pc+in(ben)
-   *		bs			=	pc+ba
-+  *		cs			=	pc+rs
-   *		cz_qwerty			=	pc+cz(qwerty)
-   *		dev			=	pc+in(deva)
-   *		dvorak			=	pc+us(dvorak)
-@@ -33,6 +34,8 @@
-   *		dvorak(pl)			=	pc+pl(dvorak_quotes)
-   *		dvorak(pl_altquotes)			=	pc+pl(dvorak_altquotes)
-   *		dzdwi(basic)			=	pc+bt(basic)
-+  *		fi(basic)			=	pc+fi(classic)
-+  *		ge(azerty_tskapo)			=	pc+fr(geo)
-   *		guj(basic)			=	pc+in(guj)
-   *		gur(basic)			=	pc+in(guru)
-   *		ie(laptop)			=	pc+ie(basic)
-@@ -49,7 +52,11 @@
-   *		ogham(is434laptop)			=	pc+ie(ogam_is434)
-   *		ori(basic)			=	pc+in(ori)
-   *		ro(de)			=	pc+ro(winkeys)
--  *		ro(us)			=	pc+ro(std)
-+  *		ro(us)			=	pc+ro(std_comma)
-+  *		ro(std)			=	pc+ro(std_cedilla)
-+  *		ro(academic)			=	pc+ro(std_comma)
-+  *		ru(winkeys)			=	pc+ru(basic)
-+  *		ru(os)			=	pc+ru(os_legacy)
-   *		sapmi(basic)			=	pc+no(smi)
-   *		sapmi(nodeadkeys)			=	pc+no(smi_nodeadkeys)
-   *		sapmi(sefi)			=	pc+fi(smi)
-Index: xkb-data/rules/compat/base.mlv_s.part
-===================================================================
---- xkb-data.orig/rules/compat/base.mlv_s.part	2008-05-01 01:56:51.000000000 +0200
-+++ xkb-data/rules/compat/base.mlv_s.part	2008-05-01 01:57:01.000000000 +0200
-@@ -7,6 +7,8 @@
-   *		dvorak		pl		=	pc+pl(dvorak_quotes)
-   *		dvorak		pl_altquotes		=	pc+pl(dvorak_altquotes)
-   *		dzdwi		basic		=	pc+bt(basic)
-+  *		fi		basic		=	pc+fi(classic)
-+  *		ge		azerty_tskapo		=	pc+fr(geo)


Reply to: