debian/changelog | 6 debian/patches/resync_rules_base.diff | 1341 +-------------------- debian/patches/send-upstream/001_keypad_comma.diff | 8 3 files changed, 110 insertions(+), 1245 deletions(-)
New commits: commit a5ce917b3c77fb9f542fe34a729af44cd2e63abf Author: Mohammed Adnene Trojette <[EMAIL PROTECTED]> Date: Tue Sep 18 17:17:07 2007 +0200 Refresh diff --git a/debian/patches/send-upstream/001_keypad_comma.diff b/debian/patches/send-upstream/001_keypad_comma.diff index fc08214..5a27cee 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 2007-09-14 19:19:09.000000000 +0200 -+++ xkb-data/rules/base.o_s.part 2007-09-14 19:20:40.000000000 +0200 +--- xkb-data.orig/rules/base.o_s.part 2007-09-18 17:03:25.000000000 +0200 ++++ xkb-data/rules/base.o_s.part 2007-09-18 17:03:37.000000000 +0200 @@ -66,6 +66,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 2007-09-14 19:19:09.000000000 +0200 -+++ xkb-data/rules/base.xml.in 2007-09-14 19:20:40.000000000 +0200 +--- xkb-data.orig/rules/base.xml.in 2007-09-18 17:03:25.000000000 +0200 ++++ xkb-data/rules/base.xml.in 2007-09-18 17:03:37.000000000 +0200 @@ -3618,6 +3618,12 @@ </option> <option> commit 9dbac548bbd4b6122e40b9c9f93259ba0bcc728d Author: Mohammed Adnene Trojette <[EMAIL PROTECTED]> Date: Tue Sep 18 17:16:19 2007 +0200 Clean debian/patches/resync_rules_base.diff. (Closes: #442942) diff --git a/debian/changelog b/debian/changelog index 8ed8a36..cb25022 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xkeyboard-config (1.0~cvs.20070916-2) UNRELEASED; urgency=low + + * Refresh resync_rules_base.diff. (Closes: #442942) + + -- Mohammed Adnène Trojette <[EMAIL PROTECTED]> Tue, 18 Sep 2007 16:54:39 +0200 + xkeyboard-config (1.0~cvs.20070916-1) unstable; urgency=low * New upstream CVS snapshot from September 16th 2007: diff --git a/debian/patches/resync_rules_base.diff b/debian/patches/resync_rules_base.diff index 62ba800..950356f 100644 --- a/debian/patches/resync_rules_base.diff +++ b/debian/patches/resync_rules_base.diff @@ -18,1274 +18,133 @@ quilt refresh --sort exit 0 -Index: xkb-data/rules/base.lst -=================================================================== ---- xkb-data.orig/rules/base.lst 2007-09-14 19:20:30.000000000 +0200 -+++ /dev/null 1970-01-01 00:00:00.000000000 +0000 -@@ -1,604 +0,0 @@ --! model -- pc101 Generic 101-key PC -- pc102 Generic 102-key (Intl) PC -- pc104 Generic 104-key PC -- pc105 Generic 105-key (Intl) PC -- dell101 Dell 101-key PC -- latitude Dell Latitude series laptop -- dellm65 Dell Precision M65 -- everex Everex STEPnote -- flexpro Keytronic FlexPro -- microsoft Microsoft Natural -- omnikey101 Northgate OmniKey 101 -- winbook Winbook Model XP5 -- jp106 Japanese 106-key -- pc98 PC-98xx Series -- a4techKB21 A4Tech KB-21 -- a4techKBS8 A4Tech KBS-8 -- a4_rfkb23 A4Tech Wireless Desktop RFKB-23 -- abnt2 Brazilian ABNT2 -- airkey Acer AirKey V -- acpi ACPI Standard -- azonaRF2300 Azona RF2300 wireless Internet Keyboard -- scorpius Advance Scorpius KI -- brother Brother Internet Keyboard -- btc5113rf BTC 5113RF Multimedia -- btc5126t BTC 5126T -- btc9000 BTC 9000 -- btc9000a BTC 9000A -- btc9001ah BTC 9001AH -- btc5090 BTC 5090 -- btc9019u BTC 9019U -- cherryblue Cherry Blue Line [EMAIL PROTECTED] -- cherryblueb Cherry CyMotion Master XPress -- cherrybluea Cherry Blue Line [EMAIL PROTECTED] (alternate option) -- cherrycyboard Cherry [EMAIL PROTECTED] USB-Hub -- chicony Chicony Internet Keyboard -- chicony9885 Chicony KB-9885 -- compaqeak8 Compaq Easy Access Keyboard -- compaqik7 Compaq Internet Keyboard (7 keys) -- compaqik13 Compaq Internet Keyboard (13 keys) -- compaqik18 Compaq Internet Keyboard (18 keys) -- cymotionlinux Cherry CyMotion Master Linux -- armada Laptop/notebook Compaq (eg. Armada) Laptop Keyboard -- presario Laptop/notebook Compaq (eg. Presario) Internet Keyboard -- ipaq Compaq iPaq Keyboard -- dell Dell -- dellusbmm Dell USB Multimedia Keybard -- inspiron Dell Laptop/notebook Inspiron 6xxx/8xxx -- precision_m Dell Laptop/notebook Precision M series -- dexxa Dexxa Wireless Desktop Keyboard -- diamond Diamond 9801 / 9802 series -- dtk2000 DTK2000 -- ennyah_dkb1008 Ennyah DKB-1008 -- genius Genius Comfy KB-16M / Genius MM Keyboard KWD-910 -- geniuscomfy Genius Comfy KB-12e -- geniuscomfy2 Genius Comfy KB-21e-Scroll -- geniuskb19e Genius KB-19e NB -- gyration Gyration -- logitech_g15 Logitech G15 extra keys via G15daemon -- hpi6 Hewlett-Packard Internet Keyboard -- hp2501 Hewlett-Packard SK-2501 Multimedia Keyboard -- hp2505 Hewlett-Packard SK-2505 Internet Keyboard -- hpxe3gc Hewlett-Packard Omnibook XE3 GC -- hpxe3gf Hewlett-Packard Omnibook XE3 GF -- hpxt1000 Hewlett-Packard Omnibook XT1000 -- hpzt11xx Hewlett-Packard Pavilion ZT11xx -- hp500fa Hewlett-Packard Omnibook 500 FA -- hp5xx Hewlett-Packard Omnibook 5xx -- hp6000 Hewlett-Packard Omnibook 6000/6100 -- honeywell_euroboard Honeywell Euroboard -- rapidaccess IBM Rapid Access -- rapidaccess2 IBM Rapid Access II -- rapidaccess2a IBM Rapid Access II (alternate option) -- thinkpad IBM ThinkPad 560Z/600/600E/A22E -- thinkpadintl IBM ThinkPad 560Z/600/600E/A22E, Intl -- logiaccess Logitech Access Keyboard -- logiclx300 Logitech Cordless Desktop LX-300 -- logicd Logitech Cordless Desktop -- logicda Logitech Cordless Desktop (alternate option) -- logicdpa2 Logitech Cordless Desktop Pro (alternate option2) -- logicfn Logitech Cordless Freedom/Desktop Navigator -- logicdn Logitech Cordless Desktop Navigator -- logiitc Logitech iTouch Cordless Keyboard (model Y-RB6) -- logiik Logitech Internet Keyboard -- itouch Logitech iTouch -- logicink Logitech Internet Navigator Keyboard -- logiex110 Logitech Cordless Desktop EX110 -- logiinkse Logitech iTouch Internet Navigator Keyboard SE -- logiinkseusb Logitech iTouch Internet Navigator Keyboard SE (USB) -- logiultrax Logitech Ultra-X Keyboard -- dinovo Logitech diNovo Keyboard -- mx1998 Memorex MX1998 -- mx2500 Memorex MX2500 EZ-Access Keyboard -- mx2750 Memorex MX2750 -- microsoftinet Microsoft Internet Keyboard -- microsoftpro Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro -- microsoftprousb Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro -- microsoftprooem Microsoft Natural Keyboard Pro OEM -- microsoftprose Microsoft Internet Keyboard Pro, Swedish -- microsoftoffice Microsoft Office Keyboard -- microsoftmult Microsoft Wireless Multimedia Keyboard 1.0A -- oretec Ortek MCK-800 MM/Internet keyboard -- propeller Propeller Voyager (KTEZ-1000) -- qtronix QTronix Scorpius 98N+ -- samsung4500 Samsung SDM 4500P -- samsung4510 Samsung SDM 4510P -- sk1300 SK-1300 -- sk2500 SK-2500 -- sk6200 SK-6200 -- sk7100 SK-7100 -- sp_inet Super Power Multimedia Keyboard -- sven SVEN Ergonomic 2500 -- symplon Symplon PaceBook (tablet PC) -- toshiba_s3000 Toshiba Satellite S3000 -- trust Trust Wireless Keyboard Classic -- trustda Trust Direct Access Keyboard -- yahoo Yahoo! Internet Keyboard -- macbook78 MacBook/MacBook Pro -- macbook79 MacBook/MacBook Pro (Intl) -- macintosh Macintosh -- macintosh_old Macintosh Old -- macintosh_hhk Happy Hacking Keyboard for Mac -- acer_c300 Acer C300 -- acer_ferrari4k Acer Ferrari 4000 -- acer_laptop Acer Laptop -- asus_laptop Asus Laptop -- apple Apple -- apple_laptop Apple Laptop -- silvercrest SILVERCREST Multimedia Wireless Keyboard -- emachines Laptop/notebook eMachines m68xx -- kr106 Korean 106-key -- evdev Evdev-managed keyboard -- benqx BenQ X-Touch -- hhk Happy Hacking Keyboard -- classmate Classmate PC -- --! layout -- us U.S. English -- ad Andorra -- af Afghanistan -- ara Arabic -- al Albania -- am Armenia -- az Azerbaijan -- by Belarus -- be Belgium -- bd Bangladesh -- in India -- ba Bosnia and Herzegovina -- br Brazil -- bg Bulgaria -- ma Morocco -- mm Myanmar -- ca Canada -- cd Congo, Democratic Republic of the -- cn China -- hr Croatia -- cz Czechia -- dk Denmark -- nl Netherlands -- bt Bhutan -- ee Estonia -- ir Iran -- iq Iraq -- fo Faroe Islands -- fi Finland -- fr France -- gh Ghana -- gn Guinea -- ge Georgia -- de Germany -- gr Greece -- hu Hungary -- is Iceland -- il Israel -- it Italy -- jp Japan -- kg Kyrgyzstan -- kh Cambodia -- kz Kazakhstan -- la Laos -- latam Latin American -- lt Lithuania -- lv Latvia -- mao Maori -- mk Macedonia -- mt Malta -- mn Mongolia -- no Norway -- pl Poland -- pt Portugal -- ro Romania -- ru Russia -- cs Serbia and Montenegro -- si Slovenia -- sk Slovakia -- es Spain -- se Sweden -- ch Switzerland -- sy Syria -- tj Tajikistan -- lk Sri Lanka -- th Thailand -- tr Turkey -- ua Ukraine -- gb United Kingdom -- uz Uzbekistan -- vn Vietnam -- kr Korea, Republic of -- nec_vndr/jp Japan (PC-98xx Series) -- ie Ireland -- pk Pakistan -- mv Maldives -- za South Africa -- epo Esperanto -- np Nepal -- ng Nigeria -- et Ethiopia -- braille Braille -- --! variant -- euro us: With EuroSign on 5 -- intl us: International (with dead keys) -- alt-intl us: Alternative international (former us_intl) -- colemak us: Colemak -- dvorak us: Dvorak -- dvorak-l us: Left handed Dvorak -- dvorak-r us: Right handed Dvorak -- dvorak-classic us: Classic Dvorak -- rus us: Russian phonetic -- mac us: Macintosh -- altgr-intl us: International (AltGr dead keys) -- ps af: Pashto -- uz af: Southern Uzbek -- azerty ara: azerty -- azerty_digits ara: azerty/digits -- digits ara: digits -- qwerty ara: qwerty -- qwerty_digits ara: qwerty/digits -- buckwalter ara: Buckwalter -- phonetic am: Phonetic -- phonetic-alt am: Alternative Phonetic -- eastern am: Eastern -- western am: Western -- eastern-alt am: Alternative Eastern -- cyrillic az: Cyrillic -- winkeys by: Winkeys -- latin by: Latin -- iso-alternate be: ISO Alternate -- nodeadkeys be: Eliminate dead keys -- sundeadkeys be: Sun dead keys -- wang be: Wang model 724 azerty -- probhat bd: Probhat -- ben in: Bengali -- ben_probhat in: Bengali Probhat -- guj in: Gujarati -- guru in: Gurmukhi -- kan in: Kannada -- mal in: Malayalam -- ori in: Oriya -- tam_unicode in: Tamil Unicode -- tam_TAB in: Tamil TAB Typewriter -- tam_TSCII in: Tamil TSCII Typewriter -- tam in: Tamil -- tel in: Telugu -- urd in: Urdu -- bolnagri in: Hindi Bolnagri -- alternatequotes ba: Use guillemets for quotes -- unicode ba: Use Bosnian digraphs -- unicodeus ba: US keyboard with Bosnian digraphs -- us ba: US keyboard with Bosnian letters -- nodeadkeys br: Eliminate dead keys -- phonetic bg: Phonetic -- french ma: French -- tifinagh ma: Tifinagh -- tifinagh-alt ma: Tifinagh Alternative -- tifinagh-alt-phonetic ma: Tifinagh Alternative Phonetic -- tifinagh-extended ma: Tifinagh Extended -- tifinagh-phonetic ma: Tifinagh Phonetic -- tifinagh-extended-phonetic ma: Tifinagh Extended Phonetic -- fr-dvorak ca: French Dvorak -- fr-legacy ca: French (legacy) -- multix ca: Multilingual -- multi ca: Multilingual, first part -- multi-2gr ca: Multilingual, second part -- ike ca: Inuktitut -- tib cn: Tibetan -- tib_asciinum cn: Tibetan (with ASCII numerals) -- alternatequotes hr: Use guillemets for quotes -- unicode hr: Use Croatian digraphs -- unicodeus hr: US keyboard with Croatian digraphs -- us hr: US keyboard with Croatian letters -- bksl cz: With <\|> key -- qwerty cz: qwerty -- qwerty_bksl cz: qwerty, extended Backslash -- nodeadkeys dk: Eliminate dead keys -- mac dk: Macintosh -- mac_nodeadkeys dk: Macintosh, eliminate dead keys -- sundeadkeys nl: Sun dead keys -- mac nl: Macintosh -- std nl: Standard -- nodeadkeys ee: Eliminate dead keys -- dvorak ee: Dvorak -- pro ir: Pro -- keypad ir: Keypad -- pro_keypad ir: Pro Keypad -- ku ir: Kurdish, Latin Q -- ku_f ir: Kurdish, (F) -- ku_alt ir: Kurdish, Latin Alt-Q -- ku_ara ir: Kurdish, Arabic-Latin -- ku iq: Kurdish, Latin Q -- ku_f iq: Kurdish, (F) -- ku_alt iq: Kurdish, Latin Alt-Q -- ku_ara iq: Kurdish, Arabic-Latin -- nodeadkeys fo: Eliminate dead keys -- nodeadkeys fi: Eliminate dead keys -- smi fi: Northern Saami -- kotoistus fi: Kotoistus -- mac fi: Macintosh -- nodeadkeys fr: Eliminate dead keys -- sundeadkeys fr: 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 -- bepo fr: Bepo, ergonomic, Dvorak way -- bepo_latin9 fr: Bepo, ergonomic, Dvorak way, latin-9 only -- dvorak fr: (Legacy) Dvorak -- mac fr: Macintosh -- generic gh: Multilingual -- akan gh: Akan -- ewe gh: Ewe -- fula gh: Fula -- ga gh: Ga -- hausa gh: Hausa -- azerty_tskapo ge: AZERTY Tskapo -- ergonomic ge: Ergonomic -- mess ge: MESS -- ru ge: Russian -- os ge: Ossetian -- deadacute de: Dead acute -- deadgraveacute de: Dead grave acute -- nodeadkeys de: Eliminate dead keys -- ro de: Romanian keyboard with German letters -- ro_nodeadkeys de: Romanian keyboard with German letters, eliminate dead keys -- dvorak de: Dvorak -- sundeadkeys de: Sun dead keys -- neo de: Neostyle -- mac de: Macintosh -- mac_nodeadkeys de: Macintosh, eliminate dead keys -- extended gr: Extended -- nodeadkeys gr: Eliminate dead keys -- polytonic gr: Polytonic -- standard hu: Standard -- nodeadkeys hu: Eliminate dead keys -- qwerty hu: qwerty -- 101_qwertz_comma_dead hu: 101/qwertz/comma/Dead keys -- 101_qwertz_comma_nodead hu: 101/qwertz/comma/Eliminate dead keys -- 101_qwertz_dot_dead hu: 101/qwertz/dot/Dead keys -- 101_qwertz_dot_nodead hu: 101/qwertz/dot/Eliminate dead keys -- 101_qwerty_comma_dead hu: 101/qwerty/comma/Dead keys -- 101_qwerty_comma_nodead hu: 101/qwerty/comma/Eliminate dead keys -- 101_qwerty_dot_dead hu: 101/qwerty/dot/Dead keys -- 101_qwerty_dot_nodead hu: 101/qwerty/dot/Eliminate dead keys -- 102_qwertz_comma_dead hu: 102/qwertz/comma/Dead keys -- 102_qwertz_comma_nodead hu: 102/qwertz/comma/Eliminate dead keys -- 102_qwertz_dot_dead hu: 102/qwertz/dot/Dead keys -- 102_qwertz_dot_nodead hu: 102/qwertz/dot/Eliminate dead keys -- 102_qwerty_comma_dead hu: 102/qwerty/comma/Dead keys -- 102_qwerty_comma_nodead hu: 102/qwerty/comma/Eliminate dead keys -- 102_qwerty_dot_dead hu: 102/qwerty/dot/Dead keys -- 102_qwerty_dot_nodead hu: 102/qwerty/dot/Eliminate dead keys -- Sundeadkeys is: Sun dead keys -- nodeadkeys is: Eliminate dead keys -- mac is: Macintosh -- lyx il: lyx -- phonetic il: Phonetic -- biblical il: Biblical Hebrew (Tiro) -- nodeadkeys it: Eliminate dead keys -- mac it: Macintosh -- geo it: Georgian -- kana jp: Kana -- OADG109A jp: OADG 109A -- ruskaz kz: Russian with Kazakh -- kazrus kz: Kazakh with Russian -- nodeadkeys latam: Eliminate dead keys -- sundeadkeys latam: Sun dead keys -- std lt: Standard -- us lt: US keyboard with Lithuanian letters -- ibm lt: IBM (LST 1205-92) -- apostrophe lv: Apostrophe (') variant -- tilde lv: Tilde (~) variant -- fkey lv: F-letter (F) variant -- nodeadkeys mk: Eliminate dead keys -- us mt: Maltese keyboard with US layout -- nodeadkeys no: Eliminate dead keys -- dvorak no: Dvorak -- smi no: Northern Saami -- smi_nodeadkeys no: Northern Saami, eliminate dead keys -- mac no: Macintosh -- mac_nodeadkeys no: Macintosh, eliminate dead keys -- qwertz pl: qwertz -- dvorak pl: Dvorak -- dvorak_quotes pl: Dvorak, Polish quotes on quotemark key -- dvorak_altquotes pl: Dvorak, Polish quotes on key "1/!" -- csb pl: Kashubian -- nodeadkeys pt: Eliminate dead keys -- sundeadkeys pt: Sun dead keys -- mac pt: Macintosh -- mac_nodeadkeys pt: Macintosh, eliminate dead keys -- mac_sundeadkeys pt: Macintosh, Sun dead keys -- comma ro: Commabelow -- std ro: Standard -- academic ro: Standard (Commabelow) -- winkeys ro: Winkeys -- phonetic ru: Phonetic -- typewriter ru: Typewriter -- winkeys ru: Winkeys -- tt ru: Tatar -- os ru: Ossetian -- os_winkeys ru: Ossetian, Winkeys -- cv ru: Chuvash -- cv_latin ru: Chuvash Latin -- udm ru: Udmurt -- yz cs: Z and ZHE swapped -- latin cs: Latin -- latinunicode cs: Latin Unicode -- latinyz cs: Latin qwerty -- latinunicodeyz cs: Latin Unicode qwerty -- alternatequotes cs: With guillemets -- latinalternatequotes cs: Latin with guillemets -- alternatequotes si: Use guillemets for quotes -- unicode si: Use Slovenian digraphs -- unicodeus si: US keyboard with Slovenian digraphs -- us si: US keyboard with Slovenian letters -- bksl sk: Extended Backslash -- qwerty sk: qwerty -- qwerty_bksl sk: qwerty, extended Backslash -- nodeadkeys es: Eliminate dead keys -- sundeadkeys es: Sun dead keys -- dvorak es: Dvorak -- cat es: Catalan variant with middle-dot L -- mac es: Macintosh -- nodeadkeys se: Eliminate dead keys -- dvorak se: Dvorak -- rus se: Russian phonetic -- rus_nodeadkeys se: Russian phonetic, eliminate dead keys -- smi se: Northern Saami -- mac se: Macintosh -- svdvorak se: Svdvorak -- de_nodeadkeys ch: German, eliminate dead keys -- de_sundeadkeys ch: German, Sun dead keys -- fr ch: French -- fr_nodeadkeys ch: French, eliminate dead keys -- fr_sundeadkeys ch: French, Sun dead keys -- fr_mac ch: French (Macintosh) -- de_mac ch: German (Macintosh) -- syc sy: Syriac -- syc_phonetic sy: Syriac phonetic -- ku sy: Kurdish, Latin Q -- ku_f sy: Kurdish, (F) -- ku_alt sy: Kurdish, Latin Alt-Q -- tam_unicode lk: Tamil Unicode -- tam_TAB lk: Tamil TAB Typewriter -- tis th: TIS-820.2538 -- pat th: Pattachote -- f tr: (F) -- alt tr: Alt-Q -- sundeadkeys tr: Sun dead keys -- ku tr: Kurdish, Latin Q -- ku_f tr: Kurdish, (F) -- ku_alt tr: Kurdish, Latin Alt-Q -- phonetic ua: Phonetic -- typewriter ua: Typewriter -- winkeys ua: Winkeys -- rstu ua: Standard RSTU -- rstu_ru ua: Standard RSTU on Russian layout -- intl gb: International (with dead keys) -- dvorak gb: Dvorak -- mac gb: Macintosh -- latin uz: Latin -- kr104 kr: 101/104 key Compatible -- CloGaelach ie: CloGaelach -- UnicodeExpert ie: UnicodeExpert -- ogam ie: Ogham -- ogam_is434 ie: Ogham IS434 -- legacy epo: displaced semicolon and quote (obsolete) -- igbo ng: Igbo -- yoruba ng: Yoruba -- hausa ng: Hausa -- left_hand braille: Left hand -- right_hand braille: Right hand -- --! option -- grp Layout switching -- grp:switch R-Alt switches layout while pressed. -- grp:lswitch Left Alt key switches layout while pressed. -- grp:lwin_switch Left Win-key switches layout while pressed. -- grp:rwin_switch Right Win-key switches layout while pressed. -- grp:win_switch Both Win-keys switch layout while pressed. -- grp:rctrl_switch Right Ctrl key switches layout while pressed. -- grp:toggle Right Alt key changes layout. -- grp:lalt_toggle Left Alt key changes layout. -- grp:caps_toggle CapsLock key changes layout. -- grp:shift_caps_toggle Shift+CapsLock changes layout. -- grp:alt_caps_toggle Alt+CapsLock changes layout. -- grp:shifts_toggle Both Shift keys together change layout. -- grp:alts_toggle Both Alt keys together change layout. -- grp:ctrls_toggle Both Ctrl keys together change layout. -- grp:ctrl_shift_toggle Ctrl+Shift change layout. -- grp:lctrl_lshift_toggle LCtrl+LShift change layout. -- grp:ctrl_alt_toggle Alt+Ctrl change layout. -- grp:alt_shift_toggle Alt+Shift change layout. -- grp:menu_toggle Menu key changes layout. -- grp:lwin_toggle Left Win-key changes layout. -- grp:rwin_toggle Right Win-key changes layout. -- grp:lshift_toggle Left Shift key changes layout. -- grp:rshift_toggle Right Shift key changes layout. -- grp:lctrl_toggle Left Ctrl key changes layout. -- grp:rctrl_toggle Right Ctrl key changes layout. -- lv3 Third level choosers -- lv3:switch Press Right Ctrl to choose 3rd level. -- lv3:menu_switch Press Menu key to choose 3rd level. -- lv3:win_switch Press any of Win-keys to choose 3rd level. -- lv3:lwin_switch Press Left Win-key to choose 3rd level. -- lv3:rwin_switch Press Right Win-key to choose 3rd level. -- 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. -- 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. -- ctrl Ctrl key position -- ctrl:nocaps Make CapsLock an additional Ctrl. -- ctrl:swapcaps Swap Ctrl and CapsLock. -- ctrl:ctrl_ac Ctrl key at left of 'A' -- ctrl:ctrl_aa Ctrl key at bottom left -- ctrl:ctrl_ra Right Ctrl key works as Right Alt. -- grp_led Use keyboard LED to show alternative layout. -- grp_led:num NumLock LED shows alternative layout. -- grp_led:caps CapsLock LED shows alternative layout. -- grp_led:scroll ScrollLock LED shows alternative layout. -- keypad Numeric keypad layout selection -- keypad:legacy Legacy 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 -- keypad:oss_wang Wang 724 keypad with unicode additions (arrows and math operators) -- keypad:future_wang Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level. -- kpdl Numeric keypad delete key behaviour -- kpdl:dot Legacy key with dot -- kpdl:comma Legacy key with comma -- kpdl:dotoss Four-level key with dot -- kpdl:commaoss Four-level key with comma -- kpdl:momayyezoss Four-level key with momayyez -- kpdl:kposs Four-level key with abstract separators -- caps CapsLock key behavior -- caps:internal CapsLock uses internal capitalization. Shift "pauses" CapsLock. -- caps:internal_nocancel CapsLock uses internal capitalization. Shift doesn't affect CapsLock. -- caps:shift CapsLock acts as Shift with locking. Shift "pauses" CapsLock. -- caps:shift_nocancel CapsLock acts as Shift with locking. Shift doesn't affect CapsLock. -- 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. -- altwin Alt/Win key behavior -- altwin:menu Add the standard behavior to Menu key. -- altwin:meta_alt Alt and Meta are on the Alt keys. -- altwin:ctrl_win Control is mapped to the Win-keys (and the usual Ctrl keys). -- altwin:meta_win Meta is mapped to the Win-keys. -- altwin:left_meta_win Meta is mapped to the left Win-key. -- altwin:super_win Super is mapped to the Win-keys. -- 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. -- altwin:swap_lalt_lwin Left Alt is swapped with left Win-key. -- Compose key Compose key position -- compose:ralt Right Alt is Compose. -- compose:lwin Left Win-key is Compose. -- compose:rwin Right Win-key is Compose. -- compose:menu Menu is Compose. -- compose:rctrl Right Ctrl is Compose. -- compose:caps Caps Lock is Compose. -- compat Miscellaneous compatibility options -- numpad:pc Default numeric keypad keys. -- numpad:mac Numeric keypad keys work as with Mac. -- numpad:microsoft Shift with numeric keypad keys works as in MS Windows. -- srvrkeys:none Special keys (Ctrl+Alt+<key>) handled in a server. -- apple:badmap Swap keycodes of two keys when Mac keyboards are misdetected by kernel. -- eurosign Adding the EuroSign to certain keys -- eurosign:e Add the EuroSign to the E key. -- eurosign:5 Add the EuroSign to the 5 key. -- eurosign:2 Add the EuroSign to the 2 key. -- nbsp Using space key to input non-breakable space character -- nbsp:none Space key outputs usual space at any level. -- nbsp:level2 Space key outputs non-breakable space character at second level. -- nbsp:level3 Space key outputs non-breakable space character at third level. -- nbsp:level3s Space key outputs non-breakable space character at third level, nothing at fourth level. -- nbsp:level3n Space key outputs non-breakable space character at third level, thin non-breakable space character at fourth level -- nbsp:level4 Space key outputs non-breakable space character at fourth level. -- nbsp:level4n Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level -- japan Japanese keyboard options -- japan:kana_lock Kana Lock key is locking -- japan:nicola_f_bs NICOLA-F style Backspace Index: xkb-data/rules/compat/base.l2_s.part =================================================================== ---- xkb-data.orig/rules/compat/base.l2_s.part 2007-09-14 19:20:30.000000000 +0200 -+++ /dev/null 1970-01-01 00:00:00.000000000 +0000 -@@ -1,67 +0,0 @@ -- ar = +ara%(v[2]):2 -- ben = +in(ben)%(v[2]):2 -- bs = +ba%(v[2]):2 -- cz_qwerty = +cz(qwerty)%(v[2]):2 -- dev = +in(deva)%(v[2]):2 -- dvorak = +us(dvorak)%(v[2]):2 -- dzdwi = +bt%(v[2]):2 -- el = +gr%(v[2]):2 -- en_US = +latin%(v[2]):2 -- guj = +in(guj)%(v[2]):2 -- gur = +in(guru)%(v[2]):2 -- iu = +ca(ike)%(v[2]):2 -- lo = +la%(v[2]):2 -- kan = +in(kan)%(v[2]):2 -- mi = +mao%(v[2]):2 -- ml = +in(mal)%(v[2]):2 -- ogham = +ie(ogam)%(v[2]):2 -- ori = +ie(ori)%(v[2]):2 -- sapmi = +no(smi)%(v[2]):2 -- sr = +srp%(v[2]):2 -- syr = +sy(syc)%(v[2]):2 -- tel = +in(tel)%(v[2]):2 -- tml = +in(tam)%(v[2]):2 -- yu = +srp%(v[2]):2 -- fr-latin9 = +fr(latin9)%(v[2]):2 -- us_intl = +us(alt-intl)%(v[2]):2 -- ben(basic) = +in(ben):2 -- ben(probhat) = +in(ben_probhat):2 -- dev(basic) = +in(deva):2 +--- xkb-data.orig/rules/compat/base.l2_s.part 2007-09-18 17:02:08.000000000 +0200 ++++ xkb-data/rules/compat/base.l2_s.part 2007-09-18 17:04:14.000000000 +0200 +@@ -27,7 +27,7 @@ + ben(basic) = +in(ben):2 + ben(probhat) = +in(ben_probhat):2 + dev(basic) = +in(deva):2 - dvorak($dvoraklayouts) = +%l(dvorak):2 -- dvorak(basic) = +us(dvorak):2 -- dvorak(pl_basic) = +pl(dvorak):2 -- dvorak(pl) = +pl(dvorak_quotes):2 -- dvorak(pl_altquotes) = +pl(dvorak_altquotes):2 -- dzdwi(basic) = +bt(basic):2 -- guj(basic) = +in(guj):2 -- gur(basic) = +in(guru):2 -- ie(laptop) = +ie(basic):2 -- ie(CloGaelachLaptop) = +ie(CloGaelach):2 -- il(si1452) = +ie(basic):2 -- iu(basic) = +ca(ike):2 -- lo(basic) = +la(basic):2 -- kan(basic) = +in(kan):2 -- mal(basic) = +in(mal):2 -- mal(mlplusnum) = +in(mal):2 -- ogham(basic) = +ie(ogam):2 -- ogham(laptop) = +ie(ogam):2 -- ogham(is434) = +ie(ogam_is434):2 -- ogham(is434laptop) = +ie(ogam_is434):2 -- ori(basic) = +in(ori):2 -- ro(de) = +ro(winkeys):2 -- ro(us) = +ro(std):2 -- sapmi(basic) = +no(smi):2 -- sapmi(nodeadkeys) = +no(smi_nodeadkeys):2 -- sapmi(sefi) = +fi(smi):2 -- sin(phonetic-static) = +in(sin_phonetic):2 -- syr(basic) = +sy(syc):2 -- syr(phonetic) = +sy(syc_phonetic):2 -- tam(INSCRIPT) = +in(tam):2 -- tam(UNI) = +in(tam_unicode):2 -- tam(TAB) = +in(tam_TAB):2 -- tam(TSCII) = +in(tam_TSCII):2 -- tel(basic) = +in(tel):2 -- yu(basic) = +srp(latin):2 -- yu(unicode) = +srp(latinunicode):2 -- yu(yz) = +srp(latinyz):2 -- yu(unicodeyz) = +srp(latinunicodeyz):2 ++ dvorak($dvoraklayouts) = +%v(dvorak):2 + dvorak(basic) = +us(dvorak):2 + dvorak(pl_basic) = +pl(dvorak):2 + dvorak(pl) = +pl(dvorak_quotes):2 Index: xkb-data/rules/compat/base.l2v2_s.part =================================================================== ---- xkb-data.orig/rules/compat/base.l2v2_s.part 2007-09-14 19:20:30.000000000 +0200 -+++ /dev/null 1970-01-01 00:00:00.000000000 +0000 -@@ -1,41 +0,0 @@ -- ben basic = +in(ben):2 -- ben probhat = +in(ben_probhat):2 -- dev basic = +in(deva):2 +--- xkb-data.orig/rules/compat/base.l2v2_s.part 2007-09-18 17:02:08.000000000 +0200 ++++ xkb-data/rules/compat/base.l2v2_s.part 2007-09-18 17:04:14.000000000 +0200 +@@ -1,7 +1,7 @@ + ben basic = +in(ben):2 + ben probhat = +in(ben_probhat):2 + dev basic = +in(deva):2 - dvorak $dvoraklayouts = +%l(dvorak):2 -- dvorak basic = +us(dvorak):2 -- dvorak pl_basic = +pl(dvorak):2 -- dvorak pl = +pl(dvorak_quotes):2 -- dvorak pl_altquotes = +pl(dvorak_altquotes):2 -- dzdwi basic = +bt(basic):2 -- guj basic = +in(guj):2 -- gur basic = +in(guru):2 -- ie laptop = +ie(basic):2 -- ie CloGaelachLaptop = +ie(CloGaelach):2 -- il si1452 = +ie(basic):2 -- iu basic = +ca(ike):2 -- lo basic = +la(basic):2 -- kan basic = +in(kan):2 -- mal basic = +in(mal):2 -- mal mlplusnum = +in(mal):2 -- ogham basic = +ie(ogam):2 -- ogham laptop = +ie(ogam):2 -- ogham is434 = +ie(ogam_is434):2 -- ogham is434laptop = +ie(ogam_is434):2 -- ori basic = +in(ori):2 -- ro de = +ro(winkeys):2 -- ro us = +ro(std):2 -- sapmi basic = +no(smi):2 -- sapmi nodeadkeys = +no(smi_nodeadkeys):2 -- sapmi sefi = +fi(smi):2 -- sin phonetic-static = +in(sin_phonetic):2 -- syr basic = +sy(syc):2 -- syr phonetic = +sy(syc_phonetic):2 -- tam INSCRIPT = +in(tam):2 -- tam UNI = +in(tam_unicode):2 -- tam TAB = +in(tam_TAB):2 -- tam TSCII = +in(tam_TSCII):2 -- tel basic = +in(tel):2 -- yu basic = +srp(latin):2 -- yu unicode = +srp(latinunicode):2 -- yu yz = +srp(latinyz):2 -- yu unicodeyz = +srp(latinunicodeyz):2 ++ dvorak $dvoraklayouts = +%v(dvorak):2 + dvorak basic = +us(dvorak):2 + dvorak pl_basic = +pl(dvorak):2 + dvorak pl = +pl(dvorak_quotes):2 Index: xkb-data/rules/compat/base.l3_s.part =================================================================== ---- xkb-data.orig/rules/compat/base.l3_s.part 2007-09-14 19:20:30.000000000 +0200 -+++ /dev/null 1970-01-01 00:00:00.000000000 +0000 -@@ -1,67 +0,0 @@ -- ar = +ara%(v[3]):3 -- ben = +in(ben)%(v[3]):3 -- bs = +ba%(v[3]):3 -- cz_qwerty = +cz(qwerty)%(v[3]):3 -- dev = +in(deva)%(v[3]):3 -- dvorak = +us(dvorak)%(v[3]):3 -- dzdwi = +bt%(v[3]):3 -- el = +gr%(v[3]):3 -- en_US = +latin%(v[3]):3 -- guj = +in(guj)%(v[3]):3 -- gur = +in(guru)%(v[3]):3 -- iu = +ca(ike)%(v[3]):3 -- lo = +la%(v[3]):3 -- kan = +in(kan)%(v[3]):3 -- mi = +mao%(v[3]):3 -- ml = +in(mal)%(v[3]):3 -- ogham = +ie(ogam)%(v[3]):3 -- ori = +ie(ori)%(v[3]):3 -- sapmi = +no(smi)%(v[3]):3 -- sr = +srp%(v[3]):3 -- syr = +sy(syc)%(v[3]):3 -- tel = +in(tel)%(v[3]):3 -- tml = +in(tam)%(v[3]):3 -- yu = +srp%(v[3]):3 -- fr-latin9 = +fr(latin9)%(v[3]):3 -- us_intl = +us(alt-intl)%(v[3]):3 -- ben(basic) = +in(ben):3 -- ben(probhat) = +in(ben_probhat):3 -- dev(basic) = +in(deva):3 +--- xkb-data.orig/rules/compat/base.l3_s.part 2007-09-18 17:02:08.000000000 +0200 ++++ xkb-data/rules/compat/base.l3_s.part 2007-09-18 17:04:14.000000000 +0200 +@@ -27,7 +27,7 @@ + ben(basic) = +in(ben):3 + ben(probhat) = +in(ben_probhat):3 + dev(basic) = +in(deva):3 - dvorak($dvoraklayouts) = +%l(dvorak):3 -- dvorak(basic) = +us(dvorak):3 -- dvorak(pl_basic) = +pl(dvorak):3 -- dvorak(pl) = +pl(dvorak_quotes):3 -- dvorak(pl_altquotes) = +pl(dvorak_altquotes):3 -- dzdwi(basic) = +bt(basic):3 -- guj(basic) = +in(guj):3 -- gur(basic) = +in(guru):3 -- ie(laptop) = +ie(basic):3 -- ie(CloGaelachLaptop) = +ie(CloGaelach):3 -- il(si1452) = +ie(basic):3 -- iu(basic) = +ca(ike):3 -- lo(basic) = +la(basic):3 -- kan(basic) = +in(kan):3 -- mal(basic) = +in(mal):3 -- mal(mlplusnum) = +in(mal):3 -- ogham(basic) = +ie(ogam):3 -- ogham(laptop) = +ie(ogam):3 -- ogham(is434) = +ie(ogam_is434):3 -- ogham(is434laptop) = +ie(ogam_is434):3 -- ori(basic) = +in(ori):3 -- ro(de) = +ro(winkeys):3 -- ro(us) = +ro(std):3 -- sapmi(basic) = +no(smi):3 -- sapmi(nodeadkeys) = +no(smi_nodeadkeys):3 -- sapmi(sefi) = +fi(smi):3 -- sin(phonetic-static) = +in(sin_phonetic):3 -- syr(basic) = +sy(syc):3 -- syr(phonetic) = +sy(syc_phonetic):3 -- tam(INSCRIPT) = +in(tam):3 -- tam(UNI) = +in(tam_unicode):3 -- tam(TAB) = +in(tam_TAB):3 -- tam(TSCII) = +in(tam_TSCII):3 -- tel(basic) = +in(tel):3 -- yu(basic) = +srp(latin):3 -- yu(unicode) = +srp(latinunicode):3 -- yu(yz) = +srp(latinyz):3 -- yu(unicodeyz) = +srp(latinunicodeyz):3 ++ dvorak($dvoraklayouts) = +%v(dvorak):3 + dvorak(basic) = +us(dvorak):3 + dvorak(pl_basic) = +pl(dvorak):3 + dvorak(pl) = +pl(dvorak_quotes):3 Index: xkb-data/rules/compat/base.l3v3_s.part =================================================================== ---- xkb-data.orig/rules/compat/base.l3v3_s.part 2007-09-14 19:20:30.000000000 +0200 -+++ /dev/null 1970-01-01 00:00:00.000000000 +0000 -@@ -1,41 +0,0 @@ -- ben basic = +in(ben):3 -- ben probhat = +in(ben_probhat):3 -- dev basic = +in(deva):3 +--- xkb-data.orig/rules/compat/base.l3v3_s.part 2007-09-18 17:02:08.000000000 +0200 ++++ xkb-data/rules/compat/base.l3v3_s.part 2007-09-18 17:04:14.000000000 +0200 +@@ -1,7 +1,7 @@ + ben basic = +in(ben):3 + ben probhat = +in(ben_probhat):3 + dev basic = +in(deva):3 - dvorak $dvoraklayouts = +%l(dvorak):3 -- dvorak basic = +us(dvorak):3 -- dvorak pl_basic = +pl(dvorak):3 -- dvorak pl = +pl(dvorak_quotes):3 -- dvorak pl_altquotes = +pl(dvorak_altquotes):3 -- dzdwi basic = +bt(basic):3 -- guj basic = +in(guj):3 -- gur basic = +in(guru):3 -- ie laptop = +ie(basic):3 -- ie CloGaelachLaptop = +ie(CloGaelach):3 -- il si1452 = +ie(basic):3 -- iu basic = +ca(ike):3 -- lo basic = +la(basic):3 -- kan basic = +in(kan):3 -- mal basic = +in(mal):3 -- mal mlplusnum = +in(mal):3 -- ogham basic = +ie(ogam):3 -- ogham laptop = +ie(ogam):3 -- ogham is434 = +ie(ogam_is434):3 -- ogham is434laptop = +ie(ogam_is434):3 -- ori basic = +in(ori):3 -- ro de = +ro(winkeys):3 -- ro us = +ro(std):3 -- sapmi basic = +no(smi):3 -- sapmi nodeadkeys = +no(smi_nodeadkeys):3 -- sapmi sefi = +fi(smi):3 -- sin phonetic-static = +in(sin_phonetic):3 -- syr basic = +sy(syc):3 -- syr phonetic = +sy(syc_phonetic):3 -- tam INSCRIPT = +in(tam):3 -- tam UNI = +in(tam_unicode):3 -- tam TAB = +in(tam_TAB):3 -- tam TSCII = +in(tam_TSCII):3 -- tel basic = +in(tel):3 -- yu basic = +srp(latin):3 -- yu unicode = +srp(latinunicode):3 -- yu yz = +srp(latinyz):3 -- yu unicodeyz = +srp(latinunicodeyz):3 ++ dvorak $dvoraklayouts = +%v(dvorak):3 + dvorak basic = +us(dvorak):3 + dvorak pl_basic = +pl(dvorak):3 + dvorak pl = +pl(dvorak_quotes):3 Index: xkb-data/rules/compat/base.l4_s.part =================================================================== ---- xkb-data.orig/rules/compat/base.l4_s.part 2007-09-14 19:20:30.000000000 +0200 -+++ /dev/null 1970-01-01 00:00:00.000000000 +0000 -@@ -1,67 +0,0 @@ -- ar = +ara%(v[4]):4 -- ben = +in(ben)%(v[4]):4 -- bs = +ba%(v[4]):4 -- cz_qwerty = +cz(qwerty)%(v[4]):4 -- dev = +in(deva)%(v[4]):4 -- dvorak = +us(dvorak)%(v[4]):4 -- dzdwi = +bt%(v[4]):4 -- el = +gr%(v[4]):4 -- en_US = +latin%(v[4]):4 -- guj = +in(guj)%(v[4]):4 -- gur = +in(guru)%(v[4]):4 -- iu = +ca(ike)%(v[4]):4 -- lo = +la%(v[4]):4 -- kan = +in(kan)%(v[4]):4 -- mi = +mao%(v[4]):4 -- ml = +in(mal)%(v[4]):4 -- ogham = +ie(ogam)%(v[4]):4 -- ori = +ie(ori)%(v[4]):4 -- sapmi = +no(smi)%(v[4]):4 -- sr = +srp%(v[4]):4 -- syr = +sy(syc)%(v[4]):4 -- tel = +in(tel)%(v[4]):4 -- tml = +in(tam)%(v[4]):4 -- yu = +srp%(v[4]):4 -- fr-latin9 = +fr(latin9)%(v[4]):4 -- us_intl = +us(alt-intl)%(v[4]):4 -- ben(basic) = +in(ben):4 -- ben(probhat) = +in(ben_probhat):4 -- dev(basic) = +in(deva):4 +--- xkb-data.orig/rules/compat/base.l4_s.part 2007-09-18 17:02:08.000000000 +0200 ++++ xkb-data/rules/compat/base.l4_s.part 2007-09-18 17:04:14.000000000 +0200 +@@ -27,7 +27,7 @@ + ben(basic) = +in(ben):4 + ben(probhat) = +in(ben_probhat):4 + dev(basic) = +in(deva):4 - dvorak($dvoraklayouts) = +%l(dvorak):4 -- dvorak(basic) = +us(dvorak):4 -- dvorak(pl_basic) = +pl(dvorak):4 -- dvorak(pl) = +pl(dvorak_quotes):4 -- dvorak(pl_altquotes) = +pl(dvorak_altquotes):4 -- dzdwi(basic) = +bt(basic):4 -- guj(basic) = +in(guj):4 -- gur(basic) = +in(guru):4 -- ie(laptop) = +ie(basic):4 -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]