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

X Strike Force X.Org X11 SVN commit: r3490 - in trunk/data/xkb-data/debian: . patches



Author: barbier
Date: 2006-09-25 16:41:44 -0400 (Mon, 25 Sep 2006)
New Revision: 3490

Added:
   trunk/data/xkb-data/debian/patches/bz1576.diff
   trunk/data/xkb-data/debian/patches/thinkpad.diff
Modified:
   trunk/data/xkb-data/debian/changelog
   trunk/data/xkb-data/debian/patches/cvs.diff
   trunk/data/xkb-data/debian/patches/resync_rules_base.diff
   trunk/data/xkb-data/debian/patches/series
   trunk/data/xkb-data/debian/symbols.dir
Log:
* debian/patches/bz1576.diff: Minor fixes in Macintosh layouts.
* debian/patches/thinkpad.diff: Fix geometry/thinkpad.
  Closes: #389358  Thanks Wouter Cloetens
* Remove po/POTFILES from debian/patches/cvs.diff
* Regenerate debian/patches/resync_rules_base.diff and debian/symbols.dir
* xkeyboard-config 0.8-14 uploaded into unstable


Modified: trunk/data/xkb-data/debian/changelog
===================================================================
--- trunk/data/xkb-data/debian/changelog	2006-09-25 19:42:30 UTC (rev 3489)
+++ trunk/data/xkb-data/debian/changelog	2006-09-25 20:41:44 UTC (rev 3490)
@@ -1,10 +1,15 @@
-xkeyboard-config (0.8-14) UNRELEASED; urgency=low
+xkeyboard-config (0.8-14) unstable; urgency=low
 
   * Sync to CVS 2006-09-25.
   * These patches have been merged upstream and are removed:
     + debian/patches/macbook_layouts.diff
     + debian/patches/fr.po.diff
 
+  * debian/patches/bz1576.diff: Minor fixes in Macintosh layouts.
+
+  * debian/patches/thinkpad.diff: Fix geometry/thinkpad.
+    Closes: #389358  Thanks Wouter Cloetens
+
  -- Denis Barbier <barbier@debian.org>  Mon, 25 Sep 2006 21:38:39 +0200
 
 xkeyboard-config (0.8-13) unstable; urgency=low

Added: trunk/data/xkb-data/debian/patches/bz1576.diff
===================================================================
--- trunk/data/xkb-data/debian/patches/bz1576.diff	                        (rev 0)
+++ trunk/data/xkb-data/debian/patches/bz1576.diff	2006-09-25 20:41:44 UTC (rev 3490)
@@ -0,0 +1,186 @@
+Index: xkb-data/rules/base.lists.part
+===================================================================
+--- xkb-data.orig/rules/base.lists.part
++++ xkb-data/rules/base.lists.part
+@@ -18,7 +18,7 @@
+ ! $maclaptop = ibook powerbook macbook78 macbook79
+ ! $macs = macintosh macintosh_old ibook powerbook macbook78 macbook79
+ 
+-! $macvendorlayouts = ch de dk es fi fr gb is it nl no pt se us
++! $macvendorlayouts = ch de dk es fi fr gb is it latam nl no pt se us
+ 
+ ! $azerty = be fr
+ ! $qwertz = al cz de hr hu ro si sk 
+Index: xkb-data/symbols/macintosh_vndr/Makefile.am
+===================================================================
+--- xkb-data.orig/symbols/macintosh_vndr/Makefile.am
++++ xkb-data/symbols/macintosh_vndr/Makefile.am
+@@ -4,5 +4,5 @@
+ apple ch de dk \
+ es fi fr \
+ gb is it \
+-nl no pt \
++latam nl no pt \
+ se us
+Index: xkb-data/symbols/macintosh_vndr/Makefile.in
+===================================================================
+--- xkb-data.orig/symbols/macintosh_vndr/Makefile.in
++++ xkb-data/symbols/macintosh_vndr/Makefile.in
+@@ -159,7 +159,7 @@
+ apple ch de dk \
+ es fi fr \
+ gb is it \
+-nl no pt \
++latam nl no pt \
+ se us
+ 
+ all: all-am
+Index: xkb-data/symbols/macintosh_vndr/dk
+===================================================================
+--- xkb-data.orig/symbols/macintosh_vndr/dk
++++ xkb-data/symbols/macintosh_vndr/dk
+@@ -29,7 +29,7 @@
+     key <AB10> {	[    minus,      underscore,           hyphen,          macron	]};
+     key <AC01> {        [        a,               A,      ordfeminine,       masculine      ]};
+     key <AC03> {        [        d,               D,              eth,             ETH      ]};
+-    key <AD03> {        [        e,               E,         NoSymbol,            cent      ]};
++    key <AD03> {        [        e,               E,         EuroSign,            cent      ]};
+     key <AD04> {        [        r,               R,       registered,        NoSymbol      ]};
+     key <AD05> {        [        t,               T,            thorn,           THORN      ]};
+     key <AD08> {        [        i,               I,         NoSymbol,        NoSymbol      ]};
+Index: xkb-data/symbols/macintosh_vndr/es
+===================================================================
+--- xkb-data.orig/symbols/macintosh_vndr/es
++++ xkb-data/symbols/macintosh_vndr/es
+@@ -1,38 +1,6 @@
+ 
+ partial default alphanumeric_keys 
+ xkb_symbols "basic" {
+-
+-    // Describes the differences between a very simple mac_US
+-    // keyboard and a very simple Spanish keybaord
+-
+-    include "latin"
++    include "es"
+     name[Group1]= "Spain - Mac";
+-
+-    key <TLDE> {	[     bracketleft,    bracketright,        braceleft,      braceright	]	};
+-    key <LSGT> {	[            less,         greater,      bracketleft,       braceleft	]	};
+-    key <AE01> {	[               1,          exclam 	]	};
+-    key <AE02> {	[               2,      exclamdown,               at,       oneeighth	]	};
+-    key <AE03> {	[               3,      numbersign,    guillemotleft,  guillemotright	]	};
+-    key <AE04> {	[               4,          dollar,              yen,     Icircumflex	]	};
+-    key <AE05> {	[               5,         percent	]	};
+-    key <AE06> {	[               6,           slash,        backslash,      Idiaeresis	]	};
+-    key <AE07> {	[               7,       ampersand,              bar,          Iacute	]	};
+-    key <AE08> {	[               8,        asterisk,           degree	]	};
+-    key <AE09> {	[               9,       parenleft,         sterling,     Ocircumflex	]	};
+-    key <AE10> {	[               0,      parenright     	]	};
+-    key <AE11> {	[           minus,      underscore	]	};
+-    key <AE12> {	[           equal,            plus,        plusminus	]	};
+-    key <AD11> {	[      dead_grave,          degree 	]	};
+-    key <AD12> {	[      dead_acute,  dead_diaeresis,              bar	]	};
+-
+-    key <AB08> {	[           comma,    questiondown   	]	};
+-    key <AB09> {	[          period,        question     	]	};
+-    key <AB10> {	[        ccedilla,        Ccedilla     	]	};
+-    key	<AC10> {	[	   ntilde,          Ntilde,       asciitilde, dead_doubleacute	]	};
+-    key <AC11> {	[       semicolon,    	     colon 	]	};
+-    key <BKSL> {	[      apostrophe,        quotedbl	]	};
+-
+-    // End alphanumeric section
+-
+-    include "level3(ralt_switch)"
+ };
+Index: xkb-data/symbols/macintosh_vndr/it
+===================================================================
+--- xkb-data.orig/symbols/macintosh_vndr/it
++++ xkb-data/symbols/macintosh_vndr/it
+@@ -21,7 +21,7 @@
+ 
+     key <AD01> {	[           q,  Q 		]	};
+     key <AD02> {	[	    z,  Z		]	};
+-    key <AD03> {	[	    e,  E		]	};
++    key <AD03> {	[	    e,  E,     EuroSign		]	};
+     key <AD04> {	[	    r,  R,   registered			] 	};
+     key <AD05> {	[	    t,  T		]	};
+     key <AD06> {	[	    y,  Y,       Uacute,	ydiaeresis      ] 	};
+Index: xkb-data/symbols/macintosh_vndr/latam
+===================================================================
+--- /dev/null
++++ xkb-data/symbols/macintosh_vndr/latam
+@@ -0,0 +1,38 @@
++
++partial default alphanumeric_keys 
++xkb_symbols "basic" {
++
++    // Describes the differences between a very simple mac_US
++    // keyboard and a very simple Spanish keybaord
++
++    include "latin"
++    name[Group1]= "Latin American - Mac";
++
++    key <TLDE> {	[     bracketleft,    bracketright,        braceleft,      braceright	]	};
++    key <LSGT> {	[            less,         greater,      bracketleft,       braceleft	]	};
++    key <AE01> {	[               1,      exclamdown 	]	};
++    key <AE02> {	[               2,          exclam,               at,       oneeighth	]	};
++    key <AE03> {	[               3,      numbersign,    guillemotleft,  guillemotright	]	};
++    key <AE04> {	[               4,          dollar,              yen,     Icircumflex	]	};
++    key <AE05> {	[               5,         percent	]	};
++    key <AE06> {	[               6,           slash,        backslash,      Idiaeresis	]	};
++    key <AE07> {	[               7,       ampersand,              bar,          Iacute	]	};
++    key <AE08> {	[               8,        asterisk,           degree	]	};
++    key <AE09> {	[               9,       parenleft,         sterling,     Ocircumflex	]	};
++    key <AE10> {	[               0,      parenright     	]	};
++    key <AE11> {	[           minus,      underscore	]	};
++    key <AE12> {	[           equal,            plus,        plusminus	]	};
++    key <AD11> {	[      dead_grave,          degree 	]	};
++    key <AD12> {	[      dead_acute,  dead_diaeresis,              bar	]	};
++
++    key <AB08> {	[           comma,    questiondown   	]	};
++    key <AB09> {	[          period,        question     	]	};
++    key <AB10> {	[        ccedilla,        Ccedilla     	]	};
++    key	<AC10> {	[	   ntilde,          Ntilde,       asciitilde, dead_doubleacute	]	};
++    key <AC11> {	[       semicolon,    	     colon 	]	};
++    key <BKSL> {	[      apostrophe,        quotedbl	]	};
++
++    // End alphanumeric section
++
++    include "level3(ralt_switch)"
++};
+Index: xkb-data/symbols/macintosh_vndr/no
+===================================================================
+--- xkb-data.orig/symbols/macintosh_vndr/no
++++ xkb-data/symbols/macintosh_vndr/no
+@@ -34,6 +34,7 @@
+ 
+     // End alphanumeric section
+ 
++    include "eurosign(e)"
+     include "level3(ralt_switch)"
+ };
+ 
+Index: xkb-data/symbols/macintosh_vndr/pt
+===================================================================
+--- xkb-data.orig/symbols/macintosh_vndr/pt
++++ xkb-data/symbols/macintosh_vndr/pt
+@@ -33,6 +33,7 @@
+     key <AD12> {	[      dead_acute,      dead_grave 	]	};
+     // End alphanumeric section
+ 
++    include "eurosign(e)"
+     include "level3(ralt_switch)"
+ };
+ 
+Index: xkb-data/symbols/macintosh_vndr/se
+===================================================================
+--- xkb-data.orig/symbols/macintosh_vndr/se
++++ xkb-data/symbols/macintosh_vndr/se
+@@ -34,6 +34,7 @@
+     key <LSGT> {        [            less,         greater,              bar,       brokenbar      ]       };
+ 
+     include "keypad(comma)"
++    include "eurosign(e)"
+     include "level3(ralt_switch)"
+ };
+ 

Modified: trunk/data/xkb-data/debian/patches/cvs.diff
===================================================================
--- trunk/data/xkb-data/debian/patches/cvs.diff	2006-09-25 19:42:30 UTC (rev 3489)
+++ trunk/data/xkb-data/debian/patches/cvs.diff	2006-09-25 20:41:44 UTC (rev 3490)
@@ -8042,12 +8042,6 @@
 +# This is the list of locale categories, beyond LC_MESSAGES, for which the
 +# message catalogs shall be used.  It is usually empty.
 +EXTRA_LOCALE_CATEGORIES =
-Index: xkb-data/po/POTFILES
-===================================================================
---- xkb-data.orig/po/POTFILES
-+++ /dev/null
-@@ -1 +0,0 @@
--	../rules/base.xml.in
 Index: xkb-data/po/af.po
 ===================================================================
 --- xkb-data.orig/po/af.po

Modified: trunk/data/xkb-data/debian/patches/resync_rules_base.diff
===================================================================
--- trunk/data/xkb-data/debian/patches/resync_rules_base.diff	2006-09-25 19:42:30 UTC (rev 3489)
+++ trunk/data/xkb-data/debian/patches/resync_rules_base.diff	2006-09-25 20:41:44 UTC (rev 3490)
@@ -28,7 +28,8 @@
  ! $pcmodels = pc101 pc102 pc104 pc105
 -! $maclaptop = ibook powerbook
 -! $mac = macintosh macintosh_old ibook powerbook
-+
+ 
+-! $macvendorlayouts = ch de dk es fi fr gb is it nl no pt se us
 +// Microsoft models (using MS geometry)
 +! $msmodels = microsoft microsoftpro microsoftprousb microsoftprose
 +
@@ -38,9 +39,9 @@
 +! $macbooks = macbook78 macbook79
 +! $maclaptop = ibook powerbook macbook78 macbook79
 +! $macs = macintosh macintosh_old ibook powerbook macbook78 macbook79
++
++! $macvendorlayouts = ch de dk es fi fr gb is it latam nl no pt se us
  
- ! $macvendorlayouts = ch de dk es fi fr gb is it nl no pt se us
- 
  ! $azerty = be fr
  ! $qwertz = al cz de hr hu ro si sk 
  
@@ -963,7 +964,16 @@
    compose:rwin		=	+compose(rwin)
    compose:menu		=	+compose(menu)
    compose:rctrl		=	+compose(rctrl)
-@@ -1016,4 +836,6 @@
+@@ -1002,6 +822,8 @@
+   eurosign:e		=	+eurosign(e)
+   eurosign:5		=	+eurosign(5)
+   eurosign:2		=	+eurosign(2)
++  keypad:oss            =       +keypad(oss)
++  keypad:legacy         =	+keypad(legacy)
+ 
+ ! option	=	compat
+   grp_led:num		=	+lednum(group_lock)
+@@ -1016,4 +838,6 @@
    caps:internal_nocancel	=	+caps(internal_nocancel)
    caps:shift			=	+caps(shift)
    caps:shift_nocancel		=	+caps(shift_nocancel)
@@ -1099,15 +1109,18 @@
    rus             us: Russian phonetic
    ps              af: Pashto
    uz              af: Southern Uzbek
-@@ -205,6 +222,7 @@
+@@ -205,13 +222,18 @@
    digits          ara: digits
    qwerty          ara: qwerty
    qwerty_digits   ara: qwerty/digits
 +  buckwalter      ara: Buckwalter
    phonetic        am: Phonetic
++  eastern         am: Eastern
++  western         am: Western
++  eastern-alt     am: Alternative Eastern
    cyrillic        az: Cyrillic
    winkeys         by: Winkeys
-@@ -212,6 +230,7 @@
+   latin           by: Latin
    iso-alternate   be: ISO Alternate
    nodeadkeys      be: Eliminate dead keys
    sundeadkeys     be: Sun dead keys
@@ -1115,7 +1128,7 @@
    probhat         bd: Probhat
    ben             in: Bengali
    ben_probhat     in: Bengali Probhat
-@@ -226,7 +245,7 @@
+@@ -226,7 +248,7 @@
    tam             in: Tamil
    tel             in: Telugu
    urd             in: Urdu
@@ -1124,7 +1137,7 @@
    unicode         ba: Use Bosnian digraphs
    unicodeus       ba: US keyboard with Bosnian digraphs
    us              ba: US keyboard with Bosnian letters
-@@ -238,7 +257,7 @@
+@@ -238,7 +260,7 @@
    multi           ca: Multilingual, first part
    multi-2gr       ca: Multilingual, second part
    ike             ca: Inuktitut
@@ -1133,7 +1146,7 @@
    unicode         hr: Use Croatian digraphs
    unicodeus       hr: US keyboard with Croatian digraphs
    us              hr: US keyboard with Croatian letters
-@@ -252,9 +271,18 @@
+@@ -252,14 +274,27 @@
    pro             ir: Pro
    keypad          ir: Keypad
    pro_keypad      ir: Pro Keypad
@@ -1151,8 +1164,20 @@
 +  kotoistus       fi: Kotoistus
    nodeadkeys      fr: Eliminate dead keys
    sundeadkeys     fr: Sun dead keys
-   latin9          fr: Alternative
-@@ -275,6 +303,9 @@
+-  latin9          fr: Alternative
+-  latin9_nodeadkeys fr: Alternative, eliminate dead keys
+-  latin9_sundeadkeys fr: Alternative, Sun dead keys
++  oss             fr: Alternative
++  oss_latin9      fr: Alternative, latin-9 only
++  oss_nodeadkeys  fr: Alternative, eliminate dead keys
++  oss_sundeadkeys fr: Alternative, Sun dead keys
++  latin9          fr: (Legacy) Alternative
++  latin9_nodeadkeys fr: (Legacy) Alternative, eliminate dead keys
++  latin9_sundeadkeys fr: (Legacy) Alternative, Sun dead keys
+   dvorak          fr: Dvorak
+   generic         gh: Multilingual
+   akan            gh: Akan
+@@ -275,6 +310,9 @@
    ro_nodeadkeys   de: Romanian keyboard with German letters, eliminate dead keys
    dvorak          de: Dvorak
    sundeadkeys     de: Sun dead keys
@@ -1162,7 +1187,7 @@
    extended        gr: Extended
    nodeadkeys      gr: Eliminate dead keys
    polytonic       gr: Polytonic
-@@ -300,7 +331,6 @@
+@@ -300,7 +338,6 @@
    Sundeadkeys     is: Sun dead keys
    nodeadkeys      is: Eliminate dead keys
    lyx             il: lyx
@@ -1170,7 +1195,7 @@
    phonetic        il: Phonetic
    nodeadkeys      it: Eliminate dead keys
    ruskaz          kz: Russian with Kazakh
-@@ -309,11 +339,12 @@
+@@ -309,11 +346,12 @@
    sundeadkeys     latam: Sun dead keys
    std             lt: Standard
    us              lt: US keyboard with Lithuanian letters
@@ -1184,7 +1209,7 @@
    nodeadkeys      no: Eliminate dead keys
    dvorak          no: Dvorak
    smi             no: Northern Saami
-@@ -322,6 +353,7 @@
+@@ -322,6 +360,7 @@
    dvorak          pl: Dvorak
    dvorak_quotes   pl: Dvorak, Polish quotes on quotemark key
    dvorak_altquotes pl: Dvorak, Polish quotes on key "1/!"
@@ -1192,7 +1217,7 @@
    nodeadkeys      pt: Eliminate dead keys
    sundeadkeys     pt: Sun dead keys
    std             ro: Standard
-@@ -330,14 +362,16 @@
+@@ -330,14 +369,16 @@
    typewriter      ru: Typewriter
    winkeys         ru: Winkeys
    tt              ru: Tatar
@@ -1212,7 +1237,7 @@
    unicode         si: Use Slovenian digraphs
    unicodeus       si: US keyboard with Slovenian digraphs
    us              si: US keyboard with Slovenian letters
-@@ -358,8 +392,13 @@
+@@ -358,8 +399,13 @@
    fr              ch: French
    fr_nodeadkeys   ch: French, eliminate dead keys
    fr_sundeadkeys  ch: French, Sun dead keys
@@ -1226,7 +1251,7 @@
    tam_unicode     lk: Tamil Unicode
    tam_TAB         lk: Tamil TAB Typewriter
    tis             th: TIS-820.2538
-@@ -367,6 +406,9 @@
+@@ -367,6 +413,9 @@
    f               tr: (F)
    alt             tr: Alt-Q
    sundeadkeys     tr: Sun dead keys
@@ -1236,7 +1261,7 @@
    phonetic        ua: Phonetic
    typewriter      ua: Typewriter
    winkeys         ua: Winkeys
-@@ -374,6 +416,7 @@
+@@ -374,6 +423,7 @@
    rstu_ru         ua: Standard RSTU on Russian layout
    intl            gb: International (with dead keys)
    dvorak          gb: Dvorak
@@ -1244,7 +1269,7 @@
    CloGaelach      ie: CloGaelach
    UnicodeExpert   ie: UnicodeExpert
    ogam            ie: Ogham
-@@ -391,6 +434,7 @@
+@@ -391,6 +441,7 @@
    grp:lalt_toggle      Left Alt key changes group.
    grp:caps_toggle      CapsLock key changes group.
    grp:shift_caps_toggle Shift+CapsLock changes group.
@@ -1252,7 +1277,7 @@
    grp:shifts_toggle    Both Shift keys together change group.
    grp:alts_toggle      Both Alt keys together change group.
    grp:ctrls_toggle     Both Ctrl keys together change group.
-@@ -404,6 +448,7 @@
+@@ -404,6 +455,7 @@
    grp:rshift_toggle    Right Shift key changes group.
    grp:lctrl_toggle     Left Ctrl key changes group.
    grp:rctrl_toggle     Right Ctrl key changes group.
@@ -1260,7 +1285,7 @@
    lv3                  Third level choosers
    lv3:switch           Press Right Ctrl to choose 3rd level.
    lv3:menu_switch      Press Menu key to choose 3rd level.
-@@ -413,6 +458,7 @@
+@@ -413,6 +465,7 @@
    lv3:alt_switch       Press any of Alt keys to choose 3rd level.
    lv3:lalt_switch      Press Left Alt key to choose 3rd level.
    lv3:ralt_switch      Press Right Alt key to choose 3rd level.
@@ -1268,7 +1293,7 @@
    ctrl                 Ctrl key position
    ctrl:nocaps          Make CapsLock an additional Ctrl.
    ctrl:swapcaps        Swap Ctrl and CapsLock.
-@@ -424,10 +470,10 @@
+@@ -424,10 +477,10 @@
    grp_led:caps         CapsLock LED shows alternative group.
    grp_led:scroll       ScrollLock LED shows alternative group.
    caps                 CapsLock key behavior
@@ -1283,7 +1308,7 @@
    caps:shift_lock      CapsLock just locks the Shift modifier.
    caps:capslock        CapsLock toggles normal capitalization of alphabetic characters.
    caps:shiftlock       CapsLock toggles Shift so all keys are affected.
-@@ -439,15 +485,20 @@
+@@ -439,15 +492,20 @@
    altwin:super_win     Super is mapped to the Win-keys (default).
    altwin:hyper_win     Hyper is mapped to the Win-keys.
    altwin:alt_super_win Alt is mapped to the right Win-key and Super to Menu.

Modified: trunk/data/xkb-data/debian/patches/series
===================================================================
--- trunk/data/xkb-data/debian/patches/series	2006-09-25 19:42:30 UTC (rev 3489)
+++ trunk/data/xkb-data/debian/patches/series	2006-09-25 20:41:44 UTC (rev 3490)
@@ -5,5 +5,7 @@
 sclk_toggle.diff
 latin_quotes.diff
 mac_poweroff.diff
+bz1576.diff
 mac-gb-euro.diff
+thinkpad.diff
 resync_rules_base.diff

Added: trunk/data/xkb-data/debian/patches/thinkpad.diff
===================================================================
--- trunk/data/xkb-data/debian/patches/thinkpad.diff	                        (rev 0)
+++ trunk/data/xkb-data/debian/patches/thinkpad.diff	2006-09-25 20:41:44 UTC (rev 3490)
@@ -0,0 +1,25 @@
+Submitted upstream:
+  https://bugs.freedesktop.org/show_bug.cgi?id=8419
+
+Index: xkb-data/geometry/thinkpad
+===================================================================
+--- xkb-data.orig/geometry/thinkpad
++++ xkb-data/geometry/thinkpad
+@@ -167,7 +167,7 @@
+ // 85 keys
+ // US/English (FRU 02K4785).
+ xkb_geometry "us" {
+-    include "ibm_vndr/thinkpad(common)"
++    include "thinkpad(common)"
+     description = "IBM ThinkPad 560Z/600/600E/A22E, US";
+ 
+     shape "RTRN" { cornerRadius = 1, { [43, 18] }, { [2.5, 0], [40.5, 14] } };
+@@ -217,7 +217,7 @@
+ // 86 keys
+ // Tested on: DE/German, UK/English (FRU 02K4787).
+ xkb_geometry "intl" {
+-    include "ibm_vndr/thinkpad(common)"
++    include "thinkpad(common)"
+     description = "IBM ThinkPad 560Z/600/600E/A22E, Intl";
+ 
+     shape "RTRN" { cornerRadius = 1, { [28, 0], [28, 37], [4, 37], [4, 18],

Modified: trunk/data/xkb-data/debian/symbols.dir
===================================================================
--- trunk/data/xkb-data/debian/symbols.dir	2006-09-25 19:42:30 UTC (rev 3489)
+++ trunk/data/xkb-data/debian/symbols.dir	2006-09-25 20:41:44 UTC (rev 3490)
@@ -12,7 +12,10 @@
 --p----- -m------ altwin(super_win)
 --p----- -m------ altwin(swap_lalt_lwin)
 -dp----- a------- am(basic)
+--p----- a------- am(eastern)
+--p----- a------- am(eastern-alt)
 -------- -------- am(phonetic)
+--p----- a------- am(western)
 --p----- a------- ara(azerty)
 --p----- a------- ara(azerty_digits)
 -dp----- a------- ara(basic)
@@ -156,6 +159,11 @@
 --p----- a------- fr(latin9_nodeadkeys)
 --p----- a------- fr(latin9_sundeadkeys)
 --p----- a------- fr(nodeadkeys)
+--p----- a------- fr(oss)
+--p----- a------- fr(oss_Sundeadkeys)
+--p----- a------- fr(oss_latin9)
+--p----- a------- fr(oss_nodeadkeys)
+--p----- a------- fr(oss_sundeadkeys)
 --p----- a------- fr(sundeadkeys)
 -------- -------- fujitsu_vndr/jp
 -------- -------- fujitsu_vndr/us
@@ -389,7 +397,16 @@
 -d------ -------- jp(jp106)
 h-p----- -------- jp(latin)
 --p----- --k----- keypad(comma)
+--p----- --k----- keypad(core)
 --p----- --k----- keypad(dot)
+-------- --k----- keypad(legacy)
+--p----- --k----- keypad(legacymath)
+--p----- --k----- keypad(legacynumber)
+-------- --k----- keypad(oss)
+-------- --k----- keypad(oss_latin9)
+--p----- --k----- keypad(ossmath)
+--p----- --k----- keypad(ossmath_latin9)
+--p----- --k----- keypad(ossnumber)
 h-p----- --k----- keypad(overlay)
 h-p----- --k----- keypad(overlay1)
 h-p----- --k----- keypad(overlay2)
@@ -461,6 +478,7 @@
 -dp----- a------- macintosh_vndr/is(basic)
 --p----- a------- macintosh_vndr/is(nodeadkeys)
 -------- -------- macintosh_vndr/it(extended)
+-dp----- a------- macintosh_vndr/latam(basic)
 -dp----- a------- macintosh_vndr/nl(basic)
 -dp----- a------- macintosh_vndr/no(basic)
 --p----- a------- macintosh_vndr/no(nodeadkeys)



Reply to: