xkb-data: Changes to 'debian-unstable'
ChangeLog | 175
NEWS | 5
configure.in | 2
debian/README.Debian | 9
debian/changelog | 14
debian/patches/add_void_definition_pl-324647.diff | 2244 -------
debian/patches/mac_poweroff.diff | 6
debian/patches/obsolete_merged-upstream/01_cymotion_master_and_ibm_space_saver.diff | 76
debian/patches/obsolete_merged-upstream/02_xkb_symbols_euro_support.diff | 72
debian/patches/obsolete_merged-upstream/03_drop_rules_xorg_duplicates.diff | 64
debian/patches/obsolete_merged-upstream/04_czech_include_location.diff | 31
debian/patches/obsolete_merged-upstream/05_evdev_xkb.diff | 763 --
debian/patches/obsolete_merged-upstream/06_AB10_minus_underscore.diff | 42
debian/patches/obsolete_merged-upstream/07_AE12_apostrophe_on_pc_de_nodeadkeys.diff | 22
debian/patches/obsolete_merged-upstream/08_implement_grp:sclk_toggle.diff | 75
debian/patches/obsolete_merged-upstream/09_enable_ca_variants.diff | 16
debian/patches/obsolete_merged-upstream/10_ralt_switch_multikey.diff | 63
debian/patches/obsolete_merged-upstream/11_uk_macintosh_problems.diff | 50
debian/patches/obsolete_merged-upstream/12_implement_compose:caps.diff | 65
debian/patches/obsolete_merged-upstream/13_macintosh_problems.diff | 22
debian/patches/obsolete_merged-upstream/14_dead_diaresis.diff | 21
debian/patches/obsolete_merged-upstream/15_symbols_polish_keypad_separator.diff | 55
debian/patches/obsolete_merged-upstream/16_brazilian_keypad_separator.diff | 32
debian/patches/obsolete_merged-upstream/17_tr_fix_eacute.diff | 15
debian/patches/obsolete_merged-upstream/18_riscpc_keycodes.diff | 155
debian/patches/obsolete_merged-upstream/19_sun_loads_srvr_ctrl.diff | 65
debian/patches/obsolete_merged-upstream/bz1576.diff | 202
debian/patches/obsolete_merged-upstream/bz8668.diff | 53
debian/patches/obsolete_merged-upstream/compat-misc.diff | 18
debian/patches/obsolete_merged-upstream/compatibility.diff | 132
debian/patches/obsolete_merged-upstream/cvs.diff | 1
debian/patches/obsolete_merged-upstream/fix_xkbcomp_crash.diff | 204
debian/patches/obsolete_merged-upstream/japan.diff | 143
debian/patches/obsolete_merged-upstream/po.diff | 1978 ------
debian/patches/obsolete_merged-upstream/revert_bz8572.diff | 63
debian/patches/obsolete_merged-upstream/uz.diff | 86
debian/patches/resync_rules_base.diff | 2157 +------
debian/patches/sclk_toggle.diff | 20
debian/patches/send-upstream/001_keypad_comma.diff | 18
debian/patches/series | 4
debian/patches/unhide_lv3_enter_switch.diff | 16
geometry/thinkpad | 204
intltool-extract.in | 2
intltool-merge.in | 2
intltool-update.in | 4
keycodes/sun | 29
keycodes/xfree86 | 6
po/ChangeLog | 4
po/Makefile.in.in | 8
po/bg.po | 1284 ++--
po/cs.po | 2988 +++++++---
po/hu.po | 1204 ++--
po/it.po | 2439 ++++++--
po/ko.po | 1581 +++--
po/sl.po | 1854 ++++--
po/sv.po | 1200 ++--
po/uk.po | 286
po/vi.po | 1284 ++--
rules/base | 584 +
rules/base.lists.part | 9
rules/base.lst | 33
rules/base.m_g.part | 1
rules/base.m_k.part | 1
rules/base.m_s.part | 14
rules/base.ml_s.part | 8
rules/base.o_s.part | 11
rules/base.xml.in | 413 +
rules/compat/variantRename.lst | 2
symbols/af | 63
symbols/am | 10
symbols/ara | 6
symbols/ca | 29
symbols/compose | 7
symbols/cz | 5
symbols/es | 15
symbols/et | 4
symbols/fi | 5
symbols/fr | 11
symbols/gb | 25
symbols/gn | 6
symbols/gr | 6
symbols/group | 15
symbols/in | 1021 +--
symbols/inet | 32
symbols/it | 47
symbols/jp | 5
symbols/kh | 18
symbols/kz | 5
symbols/latam | 4
symbols/lt | 156
symbols/lv | 5
symbols/mn | 17
symbols/nbsp | 14
symbols/ng | 4
symbols/np | 4
symbols/pk | 5
symbols/ru | 66
symbols/sk | 5
symbols/sun_vndr/us | 181
symbols/th | 4
symbols/tr | 17
symbols/ua | 62
symbols/us | 66
types/pc | 41
104 files changed, 12326 insertions(+), 14369 deletions(-)
New commits:
commit 72d4ae9c85b1a20ecc757b7cf9c73cf51c9263ce
Author: Mohammed Adnene Trojette <adn@uracile.diwi.org>
Date: Thu May 1 03:08:28 2008 +0200
+ reactivate right control key in fr(oss). (Closes: #460550) + fix olpc variants in the Afghan layout. (Closes: #461521)
* Clean up add_void_definition_pl-324647.diff and apply it before resync_rules_base.diff to avoid unclean patch applying and unapplying. (Closes: #460838)
+ reactivate right control key in fr(oss). (Closes: #460550)
+ fix olpc variants in the Afghan layout. (Closes: #461521)
* Clean up add_void_definition_pl-324647.diff and apply it before
resync_rules_base.diff to avoid unclean patch applying and
unapplying. (Closes: #460838)
* Document issues with the "Fn" key on some laptops in
README.Debian. (Closes: #461489)
diff --git a/debian/README.Debian b/debian/README.Debian
index 70ce8eb..43f2b95 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -90,3 +90,12 @@ example, insert the following lines (without the pipes):
/etc/X11/xkb/base.xml is a configuration file.
Mohammed Adnène Trojette <adn+deb@diwi.org> Sun, 23 Sep 2007 00:05:50 +0200
+
+Your 'Fn' key is not working
+----------------------------
+
+On some laptops (Gateway MX6453 for instance), when X starts with
+numlock on, the 'Fn' key is toggled the wrong way. Just turn numlock off
+to get the 'Fn' key work again.
+
+Mohammed Adnène Trojette <adn+deb@diwi.org> Thu, 01 May 2008 02:36:13 +0200
diff --git a/debian/changelog b/debian/changelog
index b8b0bc4..444aa31 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,13 @@ xkeyboard-config (1.2~cvs.20080501.1-1) unstable; urgency=low
* New upstream CVS snapshot from May 1st 2008:
+ revert Latin American layout. (Closes: #477197)
- * Clean up add_void_definition_pl-324647.diff.
+ + reactivate right control key in fr(oss). (Closes: #460550)
+ + fix olpc variants in the Afghan layout. (Closes: #461521)
+ * Clean up add_void_definition_pl-324647.diff and apply it before
+ resync_rules_base.diff to avoid unclean patch applying and
+ unapplying. (Closes: #460838)
+ * Document issues with the "Fn" key on some laptops in
+ README.Debian. (Closes: #461489)
-- Mohammed Adnène Trojette <adn+deb@diwi.org> Thu, 01 May 2008 01:29:51 +0200
commit 761539a4b8639cc33990db50cd843339e32a03ca
Author: Mohammed Adnene Trojette <adn@uracile.diwi.org>
Date: Thu May 1 01:57:23 2008 +0200
Refresh patches
diff --git a/debian/patches/resync_rules_base.diff b/debian/patches/resync_rules_base.diff
index aaa0fb5..bf238cd 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-01 01:52:42.000000000 +0200
-+++ xkb-data/rules/base 2008-05-01 01:53:06.000000000 +0200
+--- 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)
@@ -316,8 +316,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:52:43.000000000 +0200
-+++ xkb-data/rules/base.lst 2008-05-01 01:53:08.000000000 +0200
+--- 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
@@ -582,6 +582,7 @@
grp:rshift_toggle Right Shift key changes layout.
grp:lctrl_toggle Left Ctrl key changes layout.
@@ -344,8 +344,8 @@ Index: xkb-data/rules/base.lst
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:52:43.000000000 +0200
-+++ xkb-data/rules/compat/base.l2_s.part 2008-05-01 01:53:06.000000000 +0200
+--- 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
@@ -378,8 +378,8 @@ Index: xkb-data/rules/compat/base.l2_s.part
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:52:43.000000000 +0200
-+++ xkb-data/rules/compat/base.l2v2_s.part 2008-05-01 01:53:06.000000000 +0200
+--- 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
@@ -404,8 +404,8 @@ Index: xkb-data/rules/compat/base.l2v2_s.part
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:52:43.000000000 +0200
-+++ xkb-data/rules/compat/base.l3_s.part 2008-05-01 01:53:06.000000000 +0200
+--- 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
@@ -438,8 +438,8 @@ Index: xkb-data/rules/compat/base.l3_s.part
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:52:43.000000000 +0200
-+++ xkb-data/rules/compat/base.l3v3_s.part 2008-05-01 01:53:06.000000000 +0200
+--- 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
@@ -464,8 +464,8 @@ Index: xkb-data/rules/compat/base.l3v3_s.part
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:52:42.000000000 +0200
-+++ xkb-data/rules/compat/base.l4_s.part 2008-05-01 01:53:06.000000000 +0200
+--- 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
@@ -498,8 +498,8 @@ Index: xkb-data/rules/compat/base.l4_s.part
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:52:42.000000000 +0200
-+++ xkb-data/rules/compat/base.l4v4_s.part 2008-05-01 01:53:06.000000000 +0200
+--- 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
@@ -524,8 +524,8 @@ Index: xkb-data/rules/compat/base.l4v4_s.part
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:52:42.000000000 +0200
-+++ xkb-data/rules/compat/base.ml1_s.part 2008-05-01 01:53:06.000000000 +0200
+--- 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])
@@ -558,8 +558,8 @@ Index: xkb-data/rules/compat/base.ml1_s.part
* 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:52:42.000000000 +0200
-+++ xkb-data/rules/compat/base.ml1v1_s.part 2008-05-01 01:53:06.000000000 +0200
+--- 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)
@@ -584,8 +584,8 @@ Index: xkb-data/rules/compat/base.ml1v1_s.part
* 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:52:43.000000000 +0200
-+++ xkb-data/rules/compat/base.ml_s.part 2008-05-01 01:53:06.000000000 +0200
+--- 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)
@@ -618,8 +618,8 @@ Index: xkb-data/rules/compat/base.ml_s.part
* 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:52:43.000000000 +0200
-+++ xkb-data/rules/compat/base.mlv_s.part 2008-05-01 01:53:06.000000000 +0200
+--- 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)
diff --git a/debian/patches/send-upstream/001_keypad_comma.diff b/debian/patches/send-upstream/001_keypad_comma.diff
index 9d6275e..91efe6e 100644
--- a/debian/patches/send-upstream/001_keypad_comma.diff
+++ b/debian/patches/send-upstream/001_keypad_comma.diff
@@ -1,3 +1,15 @@
+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
+@@ -70,6 +70,7 @@
+ keypad:legacy_wang = +keypad(legacy_wang)
+ keypad:oss_wang = +keypad(oss_wang)
+ keypad:future_wang = +keypad(future_wang)
++ keypad:comma = +keypad(comma)
+ nbsp:none = +nbsp(none)
+ nbsp:level2 = +nbsp(level2)
+ 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
@@ -15,15 +27,3 @@ Index: xkb-data/rules/base.xml.in
<name>keypad:oss</name>
<_description>Keypad with unicode additions (arrows and math operators)</_description>
</configItem>
-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
-@@ -70,6 +70,7 @@
- keypad:legacy_wang = +keypad(legacy_wang)
- keypad:oss_wang = +keypad(oss_wang)
- keypad:future_wang = +keypad(future_wang)
-+ keypad:comma = +keypad(comma)
- nbsp:none = +nbsp(none)
- nbsp:level2 = +nbsp(level2)
- nbsp:level3 = +nbsp(level3)
commit 9345eaebe3c9afa5c163d736b56df4975ae707b7
Author: Mohammed Adnene Trojette <adn@uracile.diwi.org>
Date: Thu May 1 01:53:55 2008 +0200
refresh patch
diff --git a/debian/patches/resync_rules_base.diff b/debian/patches/resync_rules_base.diff
index 3280239..aaa0fb5 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-01 01:42:03.000000000 +0200
-+++ xkb-data/rules/base 2008-05-01 01:42:03.000000000 +0200
+--- xkb-data.orig/rules/base 2008-05-01 01:52:42.000000000 +0200
++++ xkb-data/rules/base 2008-05-01 01:53:06.000000000 +0200
@@ -165,6 +165,8 @@
* dvorak pl = pc+pl(dvorak_quotes)
* dvorak pl_altquotes = pc+pl(dvorak_altquotes)
@@ -306,10 +306,18 @@ Index: xkb-data/rules/base
caps:capslock = +capslock(capslock)
caps:shiftlock = +capslock(shiftlock)
caps:grouplock = +capslock(grouplock)
+@@ -887,6 +951,7 @@
+ keypad:legacy_wang = +keypad(legacy_wang)
+ keypad:oss_wang = +keypad(oss_wang)
+ keypad:future_wang = +keypad(future_wang)
++ keypad:comma = +keypad(comma)
+ nbsp:none = +nbsp(none)
+ nbsp:level2 = +nbsp(level2)
+ nbsp:level3 = +nbsp(level3)
Index: xkb-data/rules/base.lst
===================================================================
---- xkb-data.orig/rules/base.lst 2008-05-01 01:42:03.000000000 +0200
-+++ xkb-data/rules/base.lst 2008-05-01 01:42:04.000000000 +0200
+--- xkb-data.orig/rules/base.lst 2008-05-01 01:52:43.000000000 +0200
++++ xkb-data/rules/base.lst 2008-05-01 01:53:08.000000000 +0200
@@ -582,6 +582,7 @@
grp:rshift_toggle Right Shift key changes layout.
grp:lctrl_toggle Left Ctrl key changes layout.
@@ -336,8 +344,8 @@ Index: xkb-data/rules/base.lst
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:38:42.000000000 +0200
-+++ xkb-data/rules/compat/base.l2_s.part 2008-05-01 01:42:03.000000000 +0200
+--- xkb-data.orig/rules/compat/base.l2_s.part 2008-05-01 01:52:43.000000000 +0200
++++ xkb-data/rules/compat/base.l2_s.part 2008-05-01 01:53:06.000000000 +0200
@@ -1,6 +1,7 @@
ar = +ara%(v[2]):2
ben = +in(ben)%(v[2]):2
@@ -370,8 +378,8 @@ Index: xkb-data/rules/compat/base.l2_s.part
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:38:42.000000000 +0200
-+++ xkb-data/rules/compat/base.l2v2_s.part 2008-05-01 01:42:03.000000000 +0200
+--- xkb-data.orig/rules/compat/base.l2v2_s.part 2008-05-01 01:52:43.000000000 +0200
++++ xkb-data/rules/compat/base.l2v2_s.part 2008-05-01 01:53:06.000000000 +0200
@@ -7,6 +7,8 @@
dvorak pl = +pl(dvorak_quotes):2
dvorak pl_altquotes = +pl(dvorak_altquotes):2
@@ -396,8 +404,8 @@ Index: xkb-data/rules/compat/base.l2v2_s.part
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:38:42.000000000 +0200
-+++ xkb-data/rules/compat/base.l3_s.part 2008-05-01 01:42:03.000000000 +0200
+--- xkb-data.orig/rules/compat/base.l3_s.part 2008-05-01 01:52:43.000000000 +0200
++++ xkb-data/rules/compat/base.l3_s.part 2008-05-01 01:53:06.000000000 +0200
@@ -1,6 +1,7 @@
ar = +ara%(v[3]):3
ben = +in(ben)%(v[3]):3
@@ -430,8 +438,8 @@ Index: xkb-data/rules/compat/base.l3_s.part
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:38:41.000000000 +0200
-+++ xkb-data/rules/compat/base.l3v3_s.part 2008-05-01 01:42:03.000000000 +0200
+--- xkb-data.orig/rules/compat/base.l3v3_s.part 2008-05-01 01:52:43.000000000 +0200
++++ xkb-data/rules/compat/base.l3v3_s.part 2008-05-01 01:53:06.000000000 +0200
@@ -7,6 +7,8 @@
dvorak pl = +pl(dvorak_quotes):3
dvorak pl_altquotes = +pl(dvorak_altquotes):3
@@ -456,8 +464,8 @@ Index: xkb-data/rules/compat/base.l3v3_s.part
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:38:41.000000000 +0200
-+++ xkb-data/rules/compat/base.l4_s.part 2008-05-01 01:42:03.000000000 +0200
+--- xkb-data.orig/rules/compat/base.l4_s.part 2008-05-01 01:52:42.000000000 +0200
++++ xkb-data/rules/compat/base.l4_s.part 2008-05-01 01:53:06.000000000 +0200
@@ -1,6 +1,7 @@
ar = +ara%(v[4]):4
ben = +in(ben)%(v[4]):4
@@ -490,8 +498,8 @@ Index: xkb-data/rules/compat/base.l4_s.part
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:38:41.000000000 +0200
-+++ xkb-data/rules/compat/base.l4v4_s.part 2008-05-01 01:42:03.000000000 +0200
+--- xkb-data.orig/rules/compat/base.l4v4_s.part 2008-05-01 01:52:42.000000000 +0200
++++ xkb-data/rules/compat/base.l4v4_s.part 2008-05-01 01:53:06.000000000 +0200
@@ -7,6 +7,8 @@
dvorak pl = +pl(dvorak_quotes):4
dvorak pl_altquotes = +pl(dvorak_altquotes):4
@@ -516,8 +524,8 @@ Index: xkb-data/rules/compat/base.l4v4_s.part
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:38:41.000000000 +0200
-+++ xkb-data/rules/compat/base.ml1_s.part 2008-05-01 01:42:03.000000000 +0200
+--- xkb-data.orig/rules/compat/base.ml1_s.part 2008-05-01 01:52:42.000000000 +0200
++++ xkb-data/rules/compat/base.ml1_s.part 2008-05-01 01:53:06.000000000 +0200
@@ -1,6 +1,7 @@
* ar = pc+ara%(v[1])
* ben = pc+in(ben)%(v[1])
@@ -550,8 +558,8 @@ Index: xkb-data/rules/compat/base.ml1_s.part
* 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:38:41.000000000 +0200
-+++ xkb-data/rules/compat/base.ml1v1_s.part 2008-05-01 01:42:03.000000000 +0200
+--- xkb-data.orig/rules/compat/base.ml1v1_s.part 2008-05-01 01:52:42.000000000 +0200
++++ xkb-data/rules/compat/base.ml1v1_s.part 2008-05-01 01:53:06.000000000 +0200
@@ -7,6 +7,8 @@
* dvorak pl = pc+pl(dvorak_quotes)
* dvorak pl_altquotes = pc+pl(dvorak_altquotes)
@@ -576,8 +584,8 @@ Index: xkb-data/rules/compat/base.ml1v1_s.part
* 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:38:42.000000000 +0200
-+++ xkb-data/rules/compat/base.ml_s.part 2008-05-01 01:42:03.000000000 +0200
+--- xkb-data.orig/rules/compat/base.ml_s.part 2008-05-01 01:52:43.000000000 +0200
++++ xkb-data/rules/compat/base.ml_s.part 2008-05-01 01:53:06.000000000 +0200
@@ -1,6 +1,7 @@
* ar = pc+ara
* ben = pc+in(ben)
@@ -610,8 +618,8 @@ Index: xkb-data/rules/compat/base.ml_s.part
* 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:38:42.000000000 +0200
-+++ xkb-data/rules/compat/base.mlv_s.part 2008-05-01 01:42:03.000000000 +0200
+--- xkb-data.orig/rules/compat/base.mlv_s.part 2008-05-01 01:52:43.000000000 +0200
++++ xkb-data/rules/compat/base.mlv_s.part 2008-05-01 01:53:06.000000000 +0200
@@ -7,6 +7,8 @@
* dvorak pl = pc+pl(dvorak_quotes)
* dvorak pl_altquotes = pc+pl(dvorak_altquotes)
commit 322be62dd17cf33a3adb7878a82440945a7dbf22
Author: Mohammed Adnene Trojette <adn@uracile.diwi.org>
Date: Thu May 1 01:49:59 2008 +0200
refresh patch
diff --git a/debian/patches/send-upstream/001_keypad_comma.diff b/debian/patches/send-upstream/001_keypad_comma.diff
index c2a9db8..9d6275e 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.xml.in
===================================================================
---- xkb-data.orig/rules/base.xml.in
-+++ 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
@@ -4233,6 +4233,12 @@
</option>
<option>
@@ -15,3 +15,15 @@ Index: xkb-data/rules/base.xml.in
<name>keypad:oss</name>
<_description>Keypad with unicode additions (arrows and math operators)</_description>
</configItem>
+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
+@@ -70,6 +70,7 @@
+ keypad:legacy_wang = +keypad(legacy_wang)
+ keypad:oss_wang = +keypad(oss_wang)
+ keypad:future_wang = +keypad(future_wang)
++ keypad:comma = +keypad(comma)
+ nbsp:none = +nbsp(none)
+ nbsp:level2 = +nbsp(level2)
+ nbsp:level3 = +nbsp(level3)
commit 756b1307b43c4498450df188f919050f00ce4959
Author: Mohammed Adnene Trojette <adn@uracile.diwi.org>
Date: Thu May 1 01:43:04 2008 +0200
refresh
diff --git a/debian/patches/resync_rules_base.diff b/debian/patches/resync_rules_base.diff
index 178507b..3280239 100644
--- a/debian/patches/resync_rules_base.diff
+++ b/debian/patches/resync_rules_base.diff
@@ -18,10 +18,326 @@
quilt refresh --sort
exit 0
+Index: xkb-data/rules/base
+===================================================================
+--- xkb-data.orig/rules/base 2008-05-01 01:42:03.000000000 +0200
++++ xkb-data/rules/base 2008-05-01 01:42:03.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 @@
+ * yu unicode = pc+srp(latinunicode)
+ * yu yz = pc+srp(latinyz)
+ * yu unicodeyz = pc+srp(latinunicodeyz)
+- classmate us intl = pc+us(classmate-intl)
+- classmate us alt-intl = pc+us(classmate-alt-intl)
+- classmate us altgr-intl = pc+us(classmate-altgr-intl)
+
+ ! 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 @@
+ grp:lctrl_toggle = +group(lctrl_toggle)
+ grp:rctrl_toggle = +group(rctrl_toggle)
+ grp:lalt_toggle = +group(lalt_toggle)
++ grp:sclk_toggle = +group(sclk_toggle)
+ lv3:switch = +level3(switch)
+ lv3:ralt_switch = +level3(ralt_switch)
+ lv3:ralt_switch_multikey = +level3(ralt_switch_multikey)
+@@ -861,6 +924,7 @@
+ lv3:win_switch = +level3(win_switch)
+ lv3:lwin_switch = +level3(lwin_switch)
+ lv3:rwin_switch = +level3(rwin_switch)
++ lv3:enter_switch = +level3(enter_switch)
+ caps:capslock = +capslock(capslock)
+ caps:shiftlock = +capslock(shiftlock)
+ caps:grouplock = +capslock(grouplock)
+Index: xkb-data/rules/base.lst
+===================================================================
+--- xkb-data.orig/rules/base.lst 2008-05-01 01:42:03.000000000 +0200
++++ xkb-data/rules/base.lst 2008-05-01 01:42:04.000000000 +0200
+@@ -582,6 +582,7 @@
+ grp:rshift_toggle Right Shift key changes layout.
+ grp:lctrl_toggle Left Ctrl key changes layout.
+ grp:rctrl_toggle Right Ctrl key changes layout.
++ grp:sclk_toggle ScrollLock key changes group.
+ lv3 Third level choosers
+ lv3:switch Press Right Ctrl to choose 3rd level.
+ lv3:menu_switch Press Menu key to choose 3rd level.
+@@ -593,6 +594,7 @@
+ lv3:ralt_switch Press Right Alt key to choose 3rd level.
+ lv3:ralt_switch_multikey Press Right Alt key to choose 3rd level, Shift+Right Alt key is Multi_Key.
+ lv3:ralt_alt Right Alt key never chooses 3rd level.
++ lv3:enter_switch Press Enter key on keypad to choose 3rd level.
+ ctrl Ctrl key position
+ ctrl:nocaps Make CapsLock an additional Ctrl.
+ ctrl:swapcaps Swap Ctrl and CapsLock.
+@@ -605,6 +607,7 @@
+ grp_led:scroll ScrollLock LED shows alternative layout.
+ keypad Numeric keypad layout selection
+ keypad:legacy Legacy keypad
++ keypad:comma Force standard comma keypad
+ 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:37:00.000000000 +0200
-+++ xkb-data/rules/compat/base.l2_s.part 2008-05-01 01:38:32.000000000 +0200
+--- xkb-data.orig/rules/compat/base.l2_s.part 2008-05-01 01:38:42.000000000 +0200
++++ xkb-data/rules/compat/base.l2_s.part 2008-05-01 01:42:03.000000000 +0200
@@ -1,6 +1,7 @@
ar = +ara%(v[2]):2
ben = +in(ben)%(v[2]):2
@@ -54,8 +370,8 @@ Index: xkb-data/rules/compat/base.l2_s.part
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:36:59.000000000 +0200
-+++ xkb-data/rules/compat/base.l2v2_s.part 2008-05-01 01:38:32.000000000 +0200
+--- xkb-data.orig/rules/compat/base.l2v2_s.part 2008-05-01 01:38:42.000000000 +0200
++++ xkb-data/rules/compat/base.l2v2_s.part 2008-05-01 01:42:03.000000000 +0200
@@ -7,6 +7,8 @@
dvorak pl = +pl(dvorak_quotes):2
dvorak pl_altquotes = +pl(dvorak_altquotes):2
@@ -80,8 +396,8 @@ Index: xkb-data/rules/compat/base.l2v2_s.part
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:36:59.000000000 +0200
-+++ xkb-data/rules/compat/base.l3_s.part 2008-05-01 01:38:32.000000000 +0200
+--- xkb-data.orig/rules/compat/base.l3_s.part 2008-05-01 01:38:42.000000000 +0200
++++ xkb-data/rules/compat/base.l3_s.part 2008-05-01 01:42:03.000000000 +0200
@@ -1,6 +1,7 @@
ar = +ara%(v[3]):3
ben = +in(ben)%(v[3]):3
@@ -114,8 +430,8 @@ Index: xkb-data/rules/compat/base.l3_s.part
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:36:59.000000000 +0200
-+++ xkb-data/rules/compat/base.l3v3_s.part 2008-05-01 01:38:32.000000000 +0200
+--- xkb-data.orig/rules/compat/base.l3v3_s.part 2008-05-01 01:38:41.000000000 +0200
++++ xkb-data/rules/compat/base.l3v3_s.part 2008-05-01 01:42:03.000000000 +0200
@@ -7,6 +7,8 @@
dvorak pl = +pl(dvorak_quotes):3
dvorak pl_altquotes = +pl(dvorak_altquotes):3
@@ -140,8 +456,8 @@ Index: xkb-data/rules/compat/base.l3v3_s.part
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:36:59.000000000 +0200
-+++ xkb-data/rules/compat/base.l4_s.part 2008-05-01 01:38:32.000000000 +0200
+--- xkb-data.orig/rules/compat/base.l4_s.part 2008-05-01 01:38:41.000000000 +0200
++++ xkb-data/rules/compat/base.l4_s.part 2008-05-01 01:42:03.000000000 +0200
@@ -1,6 +1,7 @@
ar = +ara%(v[4]):4
ben = +in(ben)%(v[4]):4
@@ -174,8 +490,8 @@ Index: xkb-data/rules/compat/base.l4_s.part
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:36:59.000000000 +0200
-+++ xkb-data/rules/compat/base.l4v4_s.part 2008-05-01 01:38:32.000000000 +0200
+--- xkb-data.orig/rules/compat/base.l4v4_s.part 2008-05-01 01:38:41.000000000 +0200
++++ xkb-data/rules/compat/base.l4v4_s.part 2008-05-01 01:42:03.000000000 +0200
@@ -7,6 +7,8 @@
dvorak pl = +pl(dvorak_quotes):4
dvorak pl_altquotes = +pl(dvorak_altquotes):4
@@ -200,128 +516,8 @@ Index: xkb-data/rules/compat/base.l4v4_s.part
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:36:59.000000000 +0200
-+++ xkb-data/rules/compat/base.ml1_s.part 2008-05-01 01:38:32.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:36:59.000000000 +0200
-+++ xkb-data/rules/compat/base.ml1v1_s.part 2008-05-01 01:38:32.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:36:59.000000000 +0200
-+++ xkb-data/rules/compat/base.ml_s.part 2008-05-01 01:38:32.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)
Reply to: