debian/patches/mac_poweroff.diff | 8 debian/patches/resync_rules_base.diff | 1732 ++++++++++++--------- debian/patches/sclk_toggle.diff | 16 debian/patches/send-upstream/001_keypad_comma.diff | 38 debian/patches/unhide_lv3_enter_switch.diff | 16 5 files changed, 1071 insertions(+), 739 deletions(-)
New commits: commit a823fb6079718e2108de39c21f2d3070f9bec6b9 Author: Mohammed Adnene Trojette <[EMAIL PROTECTED]> Date: Fri Sep 14 20:46:06 2007 +0200 Refresh patches diff --git a/debian/patches/mac_poweroff.diff b/debian/patches/mac_poweroff.diff index 6d3f133..1763877 100644 --- a/debian/patches/mac_poweroff.diff +++ b/debian/patches/mac_poweroff.diff @@ -1,11 +1,11 @@ Add the power key, as requested by Jörg Sommer in http://lists.debian.org/debian-powerpc/2006/09/msg00227.html -Index: xkb-data-experimental/symbols/inet +Index: xkb-data/symbols/inet =================================================================== ---- xkb-data-experimental.orig/symbols/inet -+++ xkb-data-experimental/symbols/inet -@@ -2261,6 +2261,7 @@ +--- xkb-data.orig/symbols/inet 2007-09-14 19:16:52.000000000 +0200 ++++ xkb-data/symbols/inet 2007-09-14 19:17:35.000000000 +0200 +@@ -2025,6 +2025,7 @@ key <I2E> { [ XF86AudioLowerVolume ] }; key <I30> { [ XF86AudioRaiseVolume ] }; key <I56> { [ XF86RotateWindows ] }; diff --git a/debian/patches/resync_rules_base.diff b/debian/patches/resync_rules_base.diff index f530d28..62ba800 100644 --- a/debian/patches/resync_rules_base.diff +++ b/debian/patches/resync_rules_base.diff @@ -18,470 +18,1046 @@ quilt refresh --sort exit 0 -Index: xkb-data/rules/base +Index: xkb-data/rules/base.lst =================================================================== ---- xkb-data.orig/rules/base 2007-07-21 20:04:00.000000000 +0200 -+++ xkb-data/rules/base 2007-07-21 20:04:12.000000000 +0200 -@@ -141,116 +141,116 @@ - * = pc(pc104) - - ! model layout variant = symbols -- * ben basic = pc+in(ben) -- * ben probhat = pc+in(ben_probhat) -- * dev basic = pc+in(deva) -- * dvorak $dvoraklayouts = pc+%l(dvorak) -- * dvorak basic = pc+us(dvorak) -- * dvorak pl_basic = pc+pl(dvorak) -- * dvorak pl = pc+pl(dvorak_quotes) -- * dvorak pl_altquotes = pc+pl(dvorak_altquotes) -- * dzdwi basic = pc+bt(basic) -- * guj basic = pc+in(guj) -- * gur basic = pc+in(guru) -- * ie laptop = pc+ie(basic) -- * ie CloGaelachLaptop = pc+ie(CloGaelach) -- * il si1452 = pc+ie(basic) -- * iu basic = pc+ca(ike) -- * lo basic = pc+la(basic) -- * kan basic = pc+in(kan) -- * mal basic = pc+in(mal) -- * mal mlplusnum = pc+in(mal) -- * ogham basic = pc+ie(ogam) -- * ogham laptop = pc+ie(ogam) -- * ogham is434 = pc+ie(ogam_is434) -- * ogham is434laptop = pc+ie(ogam_is434) -- * ori basic = pc+in(ori) -- * ro de = pc+ro(winkeys) -- * ro us = pc+ro(std) -- * sapmi basic = pc+no(smi) -- * sapmi nodeadkeys = pc+no(smi_nodeadkeys) -- * sapmi sefi = pc+fi(smi) -- * sin phonetic-static = pc+in(sin_phonetic) -- * syr basic = pc+sy(syc) -- * syr phonetic = pc+sy(syc_phonetic) -- * tam INSCRIPT = pc+in(tam) -- * tam UNI = pc+in(tam_unicode) -- * tam TAB = pc+in(tam_TAB) -- * tam TSCII = pc+in(tam_TSCII) -- * tel basic = pc+in(tel) -- * yu basic = pc+srp(latin) -- * yu unicode = pc+srp(latinunicode) -- * yu yz = pc+srp(latinyz) -- * yu unicodeyz = pc+srp(latinunicodeyz) -+ * ben basic = pc(pc105)+in(ben) -+ * ben probhat = pc(pc105)+in(ben_probhat) -+ * dev basic = pc(pc105)+in(deva) -+ * dvorak $dvoraklayouts = pc(pc105)+%l(dvorak) -+ * dvorak basic = pc(pc105)+us(dvorak) -+ * dvorak pl_basic = pc(pc105)+pl(dvorak) -+ * dvorak pl = pc(pc105)+pl(dvorak_quotes) -+ * dvorak pl_altquotes = pc(pc105)+pl(dvorak_altquotes) -+ * dzdwi basic = pc(pc105)+bt(basic) -+ * guj basic = pc(pc105)+in(guj) -+ * gur basic = pc(pc105)+in(guru) -+ * ie laptop = pc(pc105)+ie(basic) -+ * ie CloGaelachLaptop = pc(pc105)+ie(CloGaelach) -+ * il si1452 = pc(pc105)+ie(basic) -+ * iu basic = pc(pc105)+ca(ike) -+ * lo basic = pc(pc105)+la(basic) -+ * kan basic = pc(pc105)+in(kan) -+ * mal basic = pc(pc105)+in(mal) -+ * mal mlplusnum = pc(pc105)+in(mal) -+ * ogham basic = pc(pc105)+ie(ogam) -+ * ogham laptop = pc(pc105)+ie(ogam) -+ * ogham is434 = pc(pc105)+ie(ogam_is434) -+ * ogham is434laptop = pc(pc105)+ie(ogam_is434) -+ * ori basic = pc(pc105)+in(ori) -+ * ro de = pc(pc105)+ro(winkeys) -+ * ro us = pc(pc105)+ro(std) -+ * sapmi basic = pc(pc105)+no(smi) -+ * sapmi nodeadkeys = pc(pc105)+no(smi_nodeadkeys) -+ * sapmi sefi = pc(pc105)+fi(smi) -+ * sin phonetic-static = pc(pc105)+in(sin_phonetic) -+ * syr basic = pc(pc105)+sy(syc) -+ * syr phonetic = pc(pc105)+sy(syc_phonetic) -+ * tam INSCRIPT = pc(pc105)+in(tam) -+ * tam UNI = pc(pc105)+in(tam_unicode) -+ * tam TAB = pc(pc105)+in(tam_TAB) -+ * tam TSCII = pc(pc105)+in(tam_TSCII) -+ * tel basic = pc(pc105)+in(tel) -+ * yu basic = pc(pc105)+srp(latin) -+ * yu unicode = pc(pc105)+srp(latinunicode) -+ * yu yz = pc(pc105)+srp(latinyz) -+ * yu unicodeyz = pc(pc105)+srp(latinunicodeyz) - - ! model layout = symbols -- * ar = pc+ara -- * ben = pc+in(ben) -- * bs = pc+ba -- * cz_qwerty = pc+cz(qwerty) -- * dev = pc+in(deva) -- * dvorak = pc+us(dvorak) -- * dzdwi = pc+bt -- * el = pc+gr -- * en_US = pc+latin -- * guj = pc+in(guj) -- * gur = pc+in(guru) -- * iu = pc+ca(ike) -- * lo = pc+la -- * kan = pc+in(kan) -- * mi = pc+mao -- * ml = pc+in(mal) -- * ogham = pc+ie(ogam) -- * ori = pc+ie(ori) -- * sapmi = pc+no(smi) -- * sr = pc+srp -- * syr = pc+sy(syc) -- * tel = pc+in(tel) -- * tml = pc+in(tam) -- * yu = pc+srp -- * fr-latin9 = pc+fr(latin9) -- * us_intl = pc+us(alt-intl) -- * ben(basic) = pc+in(ben) -- * ben(probhat) = pc+in(ben_probhat) -- * dev(basic) = pc+in(deva) -- * dvorak($dvoraklayouts) = pc+%l(dvorak) -- * dvorak(basic) = pc+us(dvorak) -- * dvorak(pl_basic) = pc+pl(dvorak) -- * dvorak(pl) = pc+pl(dvorak_quotes) -- * dvorak(pl_altquotes) = pc+pl(dvorak_altquotes) -- * dzdwi(basic) = pc+bt(basic) -- * guj(basic) = pc+in(guj) -- * gur(basic) = pc+in(guru) -- * ie(laptop) = pc+ie(basic) -- * ie(CloGaelachLaptop) = pc+ie(CloGaelach) -- * il(si1452) = pc+ie(basic) -- * iu(basic) = pc+ca(ike) -- * lo(basic) = pc+la(basic) -- * kan(basic) = pc+in(kan) -- * mal(basic) = pc+in(mal) -- * mal(mlplusnum) = pc+in(mal) -- * ogham(basic) = pc+ie(ogam) -- * ogham(laptop) = pc+ie(ogam) -- * ogham(is434) = pc+ie(ogam_is434) -- * ogham(is434laptop) = pc+ie(ogam_is434) -- * ori(basic) = pc+in(ori) -- * ro(de) = pc+ro(winkeys) -- * ro(us) = pc+ro(std) -- * sapmi(basic) = pc+no(smi) -- * sapmi(nodeadkeys) = pc+no(smi_nodeadkeys) -- * sapmi(sefi) = pc+fi(smi) -- * sin(phonetic-static) = pc+in(sin_phonetic) -- * syr(basic) = pc+sy(syc) -- * syr(phonetic) = pc+sy(syc_phonetic) -- * tam(INSCRIPT) = pc+in(tam) -- * tam(UNI) = pc+in(tam_unicode) -- * tam(TAB) = pc+in(tam_TAB) -- * tam(TSCII) = pc+in(tam_TSCII) -- * tel(basic) = pc+in(tel) -- * yu(basic) = pc+srp(latin) -- * yu(unicode) = pc+srp(latinunicode) -- * yu(yz) = pc+srp(latinyz) -- * yu(unicodeyz) = pc+srp(latinunicodeyz) -+ * ar = pc(pc105)+ara -+ * ben = pc(pc105)+in(ben) -+ * bs = pc(pc105)+ba -+ * cz_qwerty = pc(pc105)+cz(qwerty) -+ * dev = pc(pc105)+in(deva) -+ * dvorak = pc(pc105)+us(dvorak) -+ * dzdwi = pc(pc105)+bt -+ * el = pc(pc105)+gr -+ * en_US = pc(pc105)+latin -+ * guj = pc(pc105)+in(guj) -+ * gur = pc(pc105)+in(guru) -+ * iu = pc(pc105)+ca(ike) -+ * lo = pc(pc105)+la -+ * kan = pc(pc105)+in(kan) -+ * mi = pc(pc105)+mao -+ * ml = pc(pc105)+in(mal) -+ * ogham = pc(pc105)+ie(ogam) -+ * ori = pc(pc105)+ie(ori) -+ * sapmi = pc(pc105)+no(smi) -+ * sr = pc(pc105)+srp -+ * syr = pc(pc105)+sy(syc) -+ * tel = pc(pc105)+in(tel) -+ * tml = pc(pc105)+in(tam) -+ * yu = pc(pc105)+srp -+ * fr-latin9 = pc(pc105)+fr(latin9) -+ * us_intl = pc(pc105)+us(alt-intl) -+ * ben(basic) = pc(pc105)+in(ben) -+ * ben(probhat) = pc(pc105)+in(ben_probhat) -+ * dev(basic) = pc(pc105)+in(deva) -+ * dvorak($dvoraklayouts) = pc(pc105)+%l(dvorak) -+ * dvorak(basic) = pc(pc105)+us(dvorak) -+ * dvorak(pl_basic) = pc(pc105)+pl(dvorak) -+ * dvorak(pl) = pc(pc105)+pl(dvorak_quotes) -+ * dvorak(pl_altquotes) = pc(pc105)+pl(dvorak_altquotes) -+ * dzdwi(basic) = pc(pc105)+bt(basic) -+ * guj(basic) = pc(pc105)+in(guj) -+ * gur(basic) = pc(pc105)+in(guru) -+ * ie(laptop) = pc(pc105)+ie(basic) -+ * ie(CloGaelachLaptop) = pc(pc105)+ie(CloGaelach) -+ * il(si1452) = pc(pc105)+ie(basic) -+ * iu(basic) = pc(pc105)+ca(ike) -+ * lo(basic) = pc(pc105)+la(basic) -+ * kan(basic) = pc(pc105)+in(kan) -+ * mal(basic) = pc(pc105)+in(mal) -+ * mal(mlplusnum) = pc(pc105)+in(mal) -+ * ogham(basic) = pc(pc105)+ie(ogam) -+ * ogham(laptop) = pc(pc105)+ie(ogam) -+ * ogham(is434) = pc(pc105)+ie(ogam_is434) -+ * ogham(is434laptop) = pc(pc105)+ie(ogam_is434) -+ * ori(basic) = pc(pc105)+in(ori) -+ * ro(de) = pc(pc105)+ro(winkeys) -+ * ro(us) = pc(pc105)+ro(std) -+ * sapmi(basic) = pc(pc105)+no(smi) -+ * sapmi(nodeadkeys) = pc(pc105)+no(smi_nodeadkeys) -+ * sapmi(sefi) = pc(pc105)+fi(smi) -+ * sin(phonetic-static) = pc(pc105)+in(sin_phonetic) -+ * syr(basic) = pc(pc105)+sy(syc) -+ * syr(phonetic) = pc(pc105)+sy(syc_phonetic) -+ * tam(INSCRIPT) = pc(pc105)+in(tam) -+ * tam(UNI) = pc(pc105)+in(tam_unicode) -+ * tam(TAB) = pc(pc105)+in(tam_TAB) -+ * tam(TSCII) = pc(pc105)+in(tam_TSCII) -+ * tel(basic) = pc(pc105)+in(tel) -+ * yu(basic) = pc(pc105)+srp(latin) -+ * yu(unicode) = pc(pc105)+srp(latinunicode) -+ * yu(yz) = pc(pc105)+srp(latinyz) -+ * yu(unicodeyz) = pc(pc105)+srp(latinunicodeyz) - ataritt $nonlatin = xfree68_vndr/ataritt(us)+%l%(v):2 - ataritt * = xfree68_vndr/ataritt(us)+%l%(v) - amiga $nonlatin = xfree68_vndr/amiga(usa1)+%l%(v):2 -@@ -271,73 +271,73 @@ - * * = pc+%l%(v) - - ! model layout[1] = symbols -- * ar = pc+ara%(v[1]) -- * ben = pc+in(ben)%(v[1]) -- * bs = pc+ba%(v[1]) -- * cz_qwerty = pc+cz(qwerty)%(v[1]) -- * dev = pc+in(deva)%(v[1]) -- * dvorak = pc+us(dvorak)%(v[1]) -- * dzdwi = pc+bt%(v[1]) -- * el = pc+gr%(v[1]) -- * en_US = pc+latin%(v[1]) -- * guj = pc+in(guj)%(v[1]) -- * gur = pc+in(guru)%(v[1]) -- * iu = pc+ca(ike)%(v[1]) -- * lo = pc+la%(v[1]) -- * kan = pc+in(kan)%(v[1]) -- * mi = pc+mao%(v[1]) -- * ml = pc+in(mal)%(v[1]) -- * ogham = pc+ie(ogam)%(v[1]) -- * ori = pc+ie(ori)%(v[1]) -- * sapmi = pc+no(smi)%(v[1]) -- * sr = pc+srp%(v[1]) -- * syr = pc+sy(syc)%(v[1]) -- * tel = pc+in(tel)%(v[1]) -- * tml = pc+in(tam)%(v[1]) -- * yu = pc+srp%(v[1]) -- * fr-latin9 = pc+fr(latin9)%(v[1]) -- * us_intl = pc+us(alt-intl)%(v[1]) -- * ben(basic) = pc+in(ben) -- * ben(probhat) = pc+in(ben_probhat) -- * dev(basic) = pc+in(deva) -- * dvorak($dvoraklayouts) = pc+%l(dvorak) -- * dvorak(basic) = pc+us(dvorak) -- * dvorak(pl_basic) = pc+pl(dvorak) -- * dvorak(pl) = pc+pl(dvorak_quotes) -- * dvorak(pl_altquotes) = pc+pl(dvorak_altquotes) -- * dzdwi(basic) = pc+bt(basic) -- * guj(basic) = pc+in(guj) -- * gur(basic) = pc+in(guru) -- * ie(laptop) = pc+ie(basic) -- * ie(CloGaelachLaptop) = pc+ie(CloGaelach) -- * il(si1452) = pc+ie(basic) -- * iu(basic) = pc+ca(ike) -- * lo(basic) = pc+la(basic) -- * kan(basic) = pc+in(kan) -- * mal(basic) = pc+in(mal) -- * mal(mlplusnum) = pc+in(mal) -- * ogham(basic) = pc+ie(ogam) -- * ogham(laptop) = pc+ie(ogam) -- * ogham(is434) = pc+ie(ogam_is434) -- * ogham(is434laptop) = pc+ie(ogam_is434) -- * ori(basic) = pc+in(ori) -- * ro(de) = pc+ro(winkeys) -- * ro(us) = pc+ro(std) -- * sapmi(basic) = pc+no(smi) -- * sapmi(nodeadkeys) = pc+no(smi_nodeadkeys) -- * sapmi(sefi) = pc+fi(smi) -- * sin(phonetic-static) = pc+in(sin_phonetic) -- * syr(basic) = pc+sy(syc) -- * syr(phonetic) = pc+sy(syc_phonetic) -- * tam(INSCRIPT) = pc+in(tam) -- * tam(UNI) = pc+in(tam_unicode) -- * tam(TAB) = pc+in(tam_TAB) -- * tam(TSCII) = pc+in(tam_TSCII) -- * tel(basic) = pc+in(tel) -- * yu(basic) = pc+srp(latin) -- * yu(unicode) = pc+srp(latinunicode) -- * yu(yz) = pc+srp(latinyz) -- * yu(unicodeyz) = pc+srp(latinunicodeyz) -+ * ar = pc(pc105)+ara%(v[1]) -+ * ben = pc(pc105)+in(ben)%(v[1]) -+ * bs = pc(pc105)+ba%(v[1]) -+ * cz_qwerty = pc(pc105)+cz(qwerty)%(v[1]) -+ * dev = pc(pc105)+in(deva)%(v[1]) -+ * dvorak = pc(pc105)+us(dvorak)%(v[1]) -+ * dzdwi = pc(pc105)+bt%(v[1]) -+ * el = pc(pc105)+gr%(v[1]) -+ * en_US = pc(pc105)+latin%(v[1]) -+ * guj = pc(pc105)+in(guj)%(v[1]) -+ * gur = pc(pc105)+in(guru)%(v[1]) -+ * iu = pc(pc105)+ca(ike)%(v[1]) -+ * lo = pc(pc105)+la%(v[1]) -+ * kan = pc(pc105)+in(kan)%(v[1]) -+ * mi = pc(pc105)+mao%(v[1]) -+ * ml = pc(pc105)+in(mal)%(v[1]) -+ * ogham = pc(pc105)+ie(ogam)%(v[1]) -+ * ori = pc(pc105)+ie(ori)%(v[1]) -+ * sapmi = pc(pc105)+no(smi)%(v[1]) -+ * sr = pc(pc105)+srp%(v[1]) -+ * syr = pc(pc105)+sy(syc)%(v[1]) -+ * tel = pc(pc105)+in(tel)%(v[1]) -+ * tml = pc(pc105)+in(tam)%(v[1]) -+ * yu = pc(pc105)+srp%(v[1]) -+ * fr-latin9 = pc(pc105)+fr(latin9)%(v[1]) -+ * us_intl = pc(pc105)+us(alt-intl)%(v[1]) -+ * ben(basic) = pc(pc105)+in(ben) -+ * ben(probhat) = pc(pc105)+in(ben_probhat) -+ * dev(basic) = pc(pc105)+in(deva) -+ * dvorak($dvoraklayouts) = pc(pc105)+%l(dvorak) -+ * dvorak(basic) = pc(pc105)+us(dvorak) -+ * dvorak(pl_basic) = pc(pc105)+pl(dvorak) -+ * dvorak(pl) = pc(pc105)+pl(dvorak_quotes) -+ * dvorak(pl_altquotes) = pc(pc105)+pl(dvorak_altquotes) -+ * dzdwi(basic) = pc(pc105)+bt(basic) -+ * guj(basic) = pc(pc105)+in(guj) -+ * gur(basic) = pc(pc105)+in(guru) -+ * ie(laptop) = pc(pc105)+ie(basic) -+ * ie(CloGaelachLaptop) = pc(pc105)+ie(CloGaelach) -+ * il(si1452) = pc(pc105)+ie(basic) -+ * iu(basic) = pc(pc105)+ca(ike) -+ * lo(basic) = pc(pc105)+la(basic) -+ * kan(basic) = pc(pc105)+in(kan) -+ * mal(basic) = pc(pc105)+in(mal) -+ * mal(mlplusnum) = pc(pc105)+in(mal) -+ * ogham(basic) = pc(pc105)+ie(ogam) -+ * ogham(laptop) = pc(pc105)+ie(ogam) -+ * ogham(is434) = pc(pc105)+ie(ogam_is434) -+ * ogham(is434laptop) = pc(pc105)+ie(ogam_is434) -+ * ori(basic) = pc(pc105)+in(ori) -+ * ro(de) = pc(pc105)+ro(winkeys) -+ * ro(us) = pc(pc105)+ro(std) -+ * sapmi(basic) = pc(pc105)+no(smi) -+ * sapmi(nodeadkeys) = pc(pc105)+no(smi_nodeadkeys) -+ * sapmi(sefi) = pc(pc105)+fi(smi) -+ * sin(phonetic-static) = pc(pc105)+in(sin_phonetic) -+ * syr(basic) = pc(pc105)+sy(syc) -+ * syr(phonetic) = pc(pc105)+sy(syc_phonetic) -+ * tam(INSCRIPT) = pc(pc105)+in(tam) -+ * tam(UNI) = pc(pc105)+in(tam_unicode) -+ * tam(TAB) = pc(pc105)+in(tam_TAB) -+ * tam(TSCII) = pc(pc105)+in(tam_TSCII) -+ * tel(basic) = pc(pc105)+in(tel) -+ * yu(basic) = pc(pc105)+srp(latin) -+ * yu(unicode) = pc(pc105)+srp(latinunicode) -+ * yu(yz) = pc(pc105)+srp(latinyz) -+ * yu(unicodeyz) = pc(pc105)+srp(latinunicodeyz) - ataritt * = xfree68_vndr/ataritt(us)+%l[1]%(v[1]) - amiga * = xfree68_vndr/amiga(usa1)+%l[1]%(v[1]) - sun4 * = latin+sun_vndr/us(sun4)+%l[1]%(v[1]) -@@ -349,47 +349,47 @@ - * * = pc+%l[1]%(v[1]) - - ! model layout[1] variant[1] = symbols -- * ben basic = pc+in(ben) -- * ben probhat = pc+in(ben_probhat) -- * dev basic = pc+in(deva) -- * dvorak $dvoraklayouts = pc+%l(dvorak) -- * dvorak basic = pc+us(dvorak) -- * dvorak pl_basic = pc+pl(dvorak) -- * dvorak pl = pc+pl(dvorak_quotes) -- * dvorak pl_altquotes = pc+pl(dvorak_altquotes) -- * dzdwi basic = pc+bt(basic) -- * guj basic = pc+in(guj) -- * gur basic = pc+in(guru) -- * ie laptop = pc+ie(basic) -- * ie CloGaelachLaptop = pc+ie(CloGaelach) -- * il si1452 = pc+ie(basic) -- * iu basic = pc+ca(ike) -- * lo basic = pc+la(basic) -- * kan basic = pc+in(kan) -- * mal basic = pc+in(mal) -- * mal mlplusnum = pc+in(mal) -- * ogham basic = pc+ie(ogam) -- * ogham laptop = pc+ie(ogam) -- * ogham is434 = pc+ie(ogam_is434) -- * ogham is434laptop = pc+ie(ogam_is434) -- * ori basic = pc+in(ori) -- * ro de = pc+ro(winkeys) -- * ro us = pc+ro(std) -- * sapmi basic = pc+no(smi) -- * sapmi nodeadkeys = pc+no(smi_nodeadkeys) -- * sapmi sefi = pc+fi(smi) -- * sin phonetic-static = pc+in(sin_phonetic) -- * syr basic = pc+sy(syc) -- * syr phonetic = pc+sy(syc_phonetic) -- * tam INSCRIPT = pc+in(tam) -- * tam UNI = pc+in(tam_unicode) -- * tam TAB = pc+in(tam_TAB) -- * tam TSCII = pc+in(tam_TSCII) -- * tel basic = pc+in(tel) -- * yu basic = pc+srp(latin) -- * yu unicode = pc+srp(latinunicode) -- * yu yz = pc+srp(latinyz) -- * yu unicodeyz = pc+srp(latinunicodeyz) -+ * ben basic = pc(pc105)+in(ben) -+ * ben probhat = pc(pc105)+in(ben_probhat) -+ * dev basic = pc(pc105)+in(deva) -+ * dvorak $dvoraklayouts = pc(pc105)+%l(dvorak) -+ * dvorak basic = pc(pc105)+us(dvorak) -+ * dvorak pl_basic = pc(pc105)+pl(dvorak) -+ * dvorak pl = pc(pc105)+pl(dvorak_quotes) -+ * dvorak pl_altquotes = pc(pc105)+pl(dvorak_altquotes) -+ * dzdwi basic = pc(pc105)+bt(basic) -+ * guj basic = pc(pc105)+in(guj) -+ * gur basic = pc(pc105)+in(guru) -+ * ie laptop = pc(pc105)+ie(basic) -+ * ie CloGaelachLaptop = pc(pc105)+ie(CloGaelach) -+ * il si1452 = pc(pc105)+ie(basic) -+ * iu basic = pc(pc105)+ca(ike) -+ * lo basic = pc(pc105)+la(basic) -+ * kan basic = pc(pc105)+in(kan) -+ * mal basic = pc(pc105)+in(mal) -+ * mal mlplusnum = pc(pc105)+in(mal) -+ * ogham basic = pc(pc105)+ie(ogam) -+ * ogham laptop = pc(pc105)+ie(ogam) -+ * ogham is434 = pc(pc105)+ie(ogam_is434) -+ * ogham is434laptop = pc(pc105)+ie(ogam_is434) -+ * ori basic = pc(pc105)+in(ori) -+ * ro de = pc(pc105)+ro(winkeys) -+ * ro us = pc(pc105)+ro(std) -+ * sapmi basic = pc(pc105)+no(smi) -+ * sapmi nodeadkeys = pc(pc105)+no(smi_nodeadkeys) -+ * sapmi sefi = pc(pc105)+fi(smi) -+ * sin phonetic-static = pc(pc105)+in(sin_phonetic) -+ * syr basic = pc(pc105)+sy(syc) -+ * syr phonetic = pc(pc105)+sy(syc_phonetic) -+ * tam INSCRIPT = pc(pc105)+in(tam) -+ * tam UNI = pc(pc105)+in(tam_unicode) -+ * tam TAB = pc(pc105)+in(tam_TAB) -+ * tam TSCII = pc(pc105)+in(tam_TSCII) -+ * tel basic = pc(pc105)+in(tel) -+ * yu basic = pc(pc105)+srp(latin) -+ * yu unicode = pc(pc105)+srp(latinunicode) -+ * yu yz = pc(pc105)+srp(latinyz) -+ * yu unicodeyz = pc(pc105)+srp(latinunicodeyz) - - ! layout[2] = symbols - ar = +ara%(v[2]):2 +--- 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 -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]