Re: overwrite over upgrades on unstable package
Gabriel Filion a écrit :
> Hello,
>
> I run Debian unstable and I also happen to own a "Logitech Elite
> Keyboard". The howtos that I've found on google showed me that to make
> the keys on the upper part of the keyboard to work, I have to modify
> three files in /usr/share/x11/xkb -- namely symbols.dir symbols/inet and
> rules/base . I don't get all the keys working that way but I can still
> manage to use most of them.
>
> Now, my problem is that every time the package xkb-data is upgraded, it
> overwrites those three files without verifying if they were modified.
> And it is beginning to be annoying to have to restore the files from my
> backups, manually each time so that I don't break modifications the
> maintainers could have made to them.
>
> So, first, would you know of a way to get my keyboard working for all
> users on the computer with a less drastic modification?
> And if not, then second, is it possible to make those files be config
> files so that it checks for differences when the package gets upgraded?
> This way I could be aware that the files are getting changed and I could
> check a diff to see if anything is new at all.
>
> Thanks
>
> p.s.: if you need more details on the system, package versions or the
> changes I do in the files, I will be glad to provide the information you
> need.
>
I have the exact same problem with the same keyboard.
1) If you want all keys to work, just use the attached file
keymap-logitech (has to be run at boot time, I put it in rcS.d)
This is necessary because there is no kernel support for all those keys.
2) I use diversions to cope with the other problem (changes in
xkb-data). I attached my patch and my init program that takes care of
everything. Adapt it to your needs. However, it would really be better
if base.xml and other files be built from a bunch of files kept in a
directory, it would be easier to customize (system-wide). Please insert
the *patch files in /etc/X11/xkb, and the fixkeyboard in init.d (and
some rc*.d at your convenience).
Please see this message as one of support for your requests. :)
--
JCD
#!/bin/sh
#For the messenger key
setkeycodes e011 232 #Should be 145 <I11>. Yields 228 <I64>
# For the webcam key
setkeycodes e012 233 #Should be 146 <I13>. Yields 142 <I0E>
# For the itouch key
setkeycodes e013 147 #works!
# For the shopping key
setkeycodes e014 148 #Is OK. Should be <I14>. Yields 159 <I1F>
#For the function keys not as function keys
setkeycodes e03b 187 #Is OK. Should be <I3B>. Yields 131 <I03>
setkeycodes e03c 188 #Is OK. Should be <I3C>. Yields 247 <I77>
setkeycodes e03d 118 #Is OK. Should be <FK13>.Yields 123 <KPDC>
setkeycodes e03e 189 #Should be 119 <FK14>. Yields 132 <I04>
setkeycodes e03f 120 #Is OK. Should be <FK15>. Yields 139 <I0B>
setkeycodes e040 121 #Is OK. Should be <FK16>. Yields 134 <I06>
setkeycodes e041 122 #Is OK. Should be <FK17>. Yields 121 <FK16>
setkeycodes e042 194 #Is OK. Should be <I42>. Yields 119 <FK14>
setkeycodes e043 195 #Is OK. Should be <I43>. Yields 149 <I15>
setkeycodes e044 196 #Is OK. Should be <I44>. Yields 150 <I16>
setkeycodes e057 215 #Is OK. Should be <I57>. Yields 120 <FK15>
setkeycodes e058 192 #Should be 216 <I58>. Yields 249 <I79>
loadkeys << EOF
keycode 187 = F71
keycode 188 = F72
keycode 118 = F73
keycode 189 = F74
keycode 120 = F75
keycode 121 = F76
keycode 122 = F77
keycode 194 = F78
keycode 195 = F79
keycode 196 = F80
keycode 215 = F81
keycode 192 = F82
string F71="<New>"
string F72="<Reply>"
string F73="<MailForward>"
string F74="<Send>"
string F75="<Undo>"
string F76="<Redo>"
string F77="<Print>"
string F78="<Save>"
string F79="<MyComputer>"
string F80="<Documents>"
string F81="<Pictures>"
string F82="<Music>"
EOF
#!/bin/bash
### BEGIN INIT INFO
# Provides: fixkeyboard
# Required-Start: $local_fs
# Required-Stop: $local_fs
# Should-Start:
# Should-Stop:
# Default-Start: 2 3 4 5
# Default-Stop: S 0 1 6
# Short-Description: Keyboard fixing
# Description: Adds logielite and Extended French keyboard
### END INIT INFO
KEYBOARD_PATCH=/etc/X11/xkb/keyboard.patch
XML_PATCH=/etc/X11/xkb/xml.patch
XKBDIR=/usr/share/X11/xkb
if [ ! -f "$KEYBOARD_PATCH" ]; then
exit 0
fi
echo -n "JCD keyboard: "
EXKBDIR=${XKBDIR//\//\\/}
# Delete any unwanted diversions
for i in $(dpkg-divert --list | grep ^local| grep /xkb/| cut -f4 -d' '); do rm $i;dpkg-divert --remove $i > /dev/null; echo -n .; done
# First, check wether all diversions are active
case "$1" in
start|restart|reload)
find "$XKBDIR" -name '*.rej' | xargs rm 2>/dev/null
for i in $(grep ^+++ "$KEYBOARD_PATCH"| cut -f2 -d' '|cut -f1|sed -e "s/^./$EXKBDIR/g"); do
B=$(dpkg-divert --list "$i")
if [ -z "$B" ]; then
if [ -e "$i.orig" ]; then
mv "$i.orig" "$i"
fi
dpkg-divert --add --rename --divert "$i.orig" "$i">/dev/null
echo -n "."
fi
cp "$i.orig" "$i"
done
dpkg-divert --add --rename --divert "/etc/X11/xkb/base.xml.orig" "/etc/X11/xkb/base.xml">/dev/null
cp "/etc/X11/xkb/base.xml.orig" "/etc/X11/xkb/base.xml"
cd "$XKBDIR"
patch -p0 -s < "$KEYBOARD_PATCH"
cd /etc/X11/xkb
patch -p0 -s < "$XML_PATCH"
echo "enabled."
for i in $(grep ^+++ "$KEYBOARD_PATCH"| cut -f2 -d' '|cut -f1|sed -e "s/^./$EXKBDIR/g"); do
touch -r "$i.orig" "$i"
done
;;
*)
for i in $(grep ^+++ "$KEYBOARD_PATCH"| cut -f2 -d' '|cut -f1|sed -e "s/^./$EXKBDIR/g"); do
if [ -e "$i.orig" ]; then
mv "$i.orig" "$i"
fi
done
if [ -e "/etc/X11/xkb/base.xml.orig" ]; then
mv "/etc/X11/xkb/base.xml.orig" "/etc/X11/xkb/base.xml"
fi
find "$XKBDIR" -name '*.rej' -o -name '*.orig' | xargs rm 2>/dev/null
echo "disabled."
;;
esac
diff -ur ../xkb.orig/rules/base ./rules/base
--- ../xkb.orig/rules/base 2008-01-21 11:32:26.000000000 +0100
+++ ./rules/base 2008-01-21 11:34:33.000000000 +0100
@@ -53,7 +53,7 @@
hp2501 hp2505 hp5xx hp500fa hp5181 hp5185 \
hpi6 hpxe3gc hpxe3gf hpxe4xxx hpxt1000 hpzt11xx \
ipaq inspiron intel latitude \
- logiaccess logicda logicink \
+ logiaccess logicda logicink logielite \
logiex110 logiclx300 \
logiinkse logiinkseusb logiitc logiik itouch logiultrax \
logitech_g15 \
@@ -226,6 +226,7 @@
* tml = pc+in(tam)
* yu = pc+srp
* fr-latin9 = pc+fr(latin9)
+ * fr-complete = pc+fr(complete)
* us_intl = pc+us(alt-intl)
* ben(basic) = pc+in(ben)
* ben(probhat) = pc+in(ben_probhat)
@@ -326,6 +327,7 @@
* tml = pc+in(tam)%(v[1])
* yu = pc+srp%(v[1])
* fr-latin9 = pc+fr(latin9)%(v[1])
+ * fr-complete = pc+fr(complete)%(v[1])
* us_intl = pc+us(alt-intl)%(v[1])
* ben(basic) = pc+in(ben)
* ben(probhat) = pc+in(ben_probhat)
@@ -457,6 +459,7 @@
tml = +in(tam)%(v[2]):2
yu = +srp%(v[2]):2
fr-latin9 = +fr(latin9)%(v[2]):2
+ fr-complete = +fr(complete)%(v[2]):2
us_intl = +us(alt-intl)%(v[2]):2
ben(basic) = +in(ben):2
ben(probhat) = +in(ben_probhat):2
@@ -532,6 +535,7 @@
tml = +in(tam)%(v[3]):3
yu = +srp%(v[3]):3
fr-latin9 = +fr(latin9)%(v[3]):3
+ fr-complete = +fr(complete)%(v[3]):3
us_intl = +us(alt-intl)%(v[3]):3
ben(basic) = +in(ben):3
ben(probhat) = +in(ben_probhat):3
@@ -607,6 +611,7 @@
tml = +in(tam)%(v[4]):4
yu = +srp%(v[4]):4
fr-latin9 = +fr(latin9)%(v[4]):4
+ fr-complete = +fr(complete)%(v[4]):4
us_intl = +us(alt-intl)%(v[4]):4
ben(basic) = +in(ben):4
ben(probhat) = +in(ben_probhat):4
diff -ur ../xkb.orig/rules/base.lst ./rules/base.lst
--- ../xkb.orig/rules/base.lst 2008-01-21 11:32:26.000000000 +0100
+++ ./rules/base.lst 2008-01-21 11:34:33.000000000 +0100
@@ -83,6 +83,7 @@
logicdpa2 Logitech Cordless Desktop Pro (alternate option2)
logicfn Logitech Cordless Freedom/Desktop Navigator
logicdn Logitech Cordless Desktop Navigator
+ logielite Logitech Elite Keyboard
logiitc Logitech iTouch Cordless Keyboard (model Y-RB6)
logiik Logitech Internet Keyboard
itouch Logitech iTouch
diff -ur ../xkb.orig/rules/base.xml ./rules/base.xml
--- ../xkb.orig/rules/base.xml 2008-01-13 17:11:04.000000000 +0100
+++ ./rules/base.xml 2008-01-21 11:37:27.000000000 +0100
@@ -590,6 +590,35 @@
</model>
<model>
<configItem>
+ <name>logielite</name>
+ <description>Logitech Elite Keyboard</description>
+ <description xml:lang="af">Logitech Elite Keyboard</description>
+ <description xml:lang="az">Logitech Elite Keyboard</description>
+ <description xml:lang="bg">Logitech Ð?лиÑ? клавиаÑ?Ñ?Ñ?а</description>
+ <description xml:lang="cs">Logitech Elite Keyboard</description>
+ <description xml:lang="da">Logitech Elite Keyboard</description>
+ <description xml:lang="en_GB">Logitech Elite Keyboard</description>
+ <description xml:lang="fi">Logitech Elite Keyboard</description>
+ <description xml:lang="fr">Logitech Elite</description>
+ <description xml:lang="hu">Logitech Elite Keyboard</description>
+ <description xml:lang="it">Logitech Elite Keyboard</description>
+ <description xml:lang="nl">Logitech Elite toetsenbord</description>
+ <description xml:lang="ru">Logitech Elite Keyboard</description>
+ <description xml:lang="sk">Logitech Elite Keyboard</description>
+ <description xml:lang="sl">Logitech Internet Tipkovnica</description>
+ <description xml:lang="sq">Tastierë për Elite Logitech</description>
+ <description xml:lang="sr">Logitech Elite Ñ?аÑ?Ñ?аÑ?Ñ?Ñ?а</description>
+ <description xml:lang="sr@Latn">Logitech Elite tastatura</description>
+ <description xml:lang="sv">Logitech Elitetangentbord</description>
+ <description xml:lang="tr">Logitech Elite Klavyesi</description>
+ <description xml:lang="uk">Logitech Elite Keyboard</description>
+ <description xml:lang="vi">BÃ n phÃm Elite Logitech</description>
+ <description xml:lang="zh_CN">ç½?æ??ELITEé?®ç??</description>
+ <description xml:lang="zh_TW">ç¾?æ??ELITEé?µç?¤</description>
+ </configItem>
+ </model>
+ <model>
+ <configItem>
<name>logiitc</name>
<description>Logitech iTouch Cordless Keyboard (model Y-RB6)</description>
<vendor>Logitech</vendor>
@@ -1918,6 +1947,14 @@
<variantList>
<variant>
<configItem>
+ <name>complete</name>
+ <description>Extended</description>
+ <description xml:lang="en_GB">Extended</description>
+ <description xml:lang="fr">Ã?tendue</description>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
<name>nodeadkeys</name>
<description>Eliminate dead keys</description>
</configItem>
diff -ur ../xkb.orig/rules/xorg.xml ./rules/xorg.xml
--- ../xkb.orig/rules/xorg.xml 2008-01-13 17:11:04.000000000 +0100
+++ ./rules/xorg.xml 2008-01-21 11:37:27.000000000 +0100
@@ -590,6 +590,35 @@
</model>
<model>
<configItem>
+ <name>logielite</name>
+ <description>Logitech Elite Keyboard</description>
+ <description xml:lang="af">Logitech Elite Keyboard</description>
+ <description xml:lang="az">Logitech Elite Keyboard</description>
+ <description xml:lang="bg">Logitech Ð?лиÑ? клавиаÑ?Ñ?Ñ?а</description>
+ <description xml:lang="cs">Logitech Elite Keyboard</description>
+ <description xml:lang="da">Logitech Elite Keyboard</description>
+ <description xml:lang="en_GB">Logitech Elite Keyboard</description>
+ <description xml:lang="fi">Logitech Elite Keyboard</description>
+ <description xml:lang="fr">Logitech Elite</description>
+ <description xml:lang="hu">Logitech Elite Keyboard</description>
+ <description xml:lang="it">Logitech Elite Keyboard</description>
+ <description xml:lang="nl">Logitech Elite toetsenbord</description>
+ <description xml:lang="ru">Logitech Elite Keyboard</description>
+ <description xml:lang="sk">Logitech Elite Keyboard</description>
+ <description xml:lang="sl">Logitech Internet Tipkovnica</description>
+ <description xml:lang="sq">Tastierë për Elite Logitech</description>
+ <description xml:lang="sr">Logitech Elite Ñ?аÑ?Ñ?аÑ?Ñ?Ñ?а</description>
+ <description xml:lang="sr@Latn">Logitech Elite tastatura</description>
+ <description xml:lang="sv">Logitech Elitetangentbord</description>
+ <description xml:lang="tr">Logitech Elite Klavyesi</description>
+ <description xml:lang="uk">Logitech Elite Keyboard</description>
+ <description xml:lang="vi">BÃ n phÃm Elite Logitech</description>
+ <description xml:lang="zh_CN">ç½?æ??ELITEé?®ç??</description>
+ <description xml:lang="zh_TW">ç¾?æ??ELITEé?µç?¤</description>
+ </configItem>
+ </model>
+ <model>
+ <configItem>
<name>logiitc</name>
<description>Logitech iTouch Cordless Keyboard (model Y-RB6)</description>
<vendor>Logitech</vendor>
@@ -1918,6 +1947,14 @@
<variantList>
<variant>
<configItem>
+ <name>complete</name>
+ <description>Extended</description>
+ <description xml:lang="en_GB">Extended</description>
+ <description xml:lang="fr">Ã?tendue</description>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
<name>nodeadkeys</name>
<description>Eliminate dead keys</description>
</configItem>
@@ -4229,4 +4266,4 @@
</option>
</group>
</optionList>
-</xkbConfigRegistry>
\ Pas de fin de ligne à la fin du fichier.
+</xkbConfigRegistry>
diff -ur ../xkb.orig/symbols/fr ./symbols/fr
--- ../xkb.orig/symbols/fr 2008-01-21 11:32:26.000000000 +0100
+++ ./symbols/fr 2008-01-21 11:42:46.000000000 +0100
@@ -755,3 +755,74 @@
};
+
+
+// Complete Linux French keyboard layout (fr-complete)
+
+partial default alphanumeric_keys
+
+xkb_symbols "complete" {
+
+ include "latin"
+
+ name[Group1]="France - Extended";
+
+ key <TLDE> { [ twosuperior, threesuperior, ordfeminine, masculine ] };
+ key <AE01> { [ ampersand, 1, onesuperior, hyphen ] };
+ key <AE02> { [ eacute, 2, asciitilde, Eacute ] };
+ key <AE03> { [ quotedbl, 3, numbersign, Zcaron ] };
+ key <AE04> { [ apostrophe, 4, braceleft, zcaron ] };
+ key <AE05> { [ parenleft, 5, bracketleft, Scaron ] };
+ key <AE06> { [ minus, 6, bar, scaron ] };
+ key <AE07> { [ egrave, 7, grave, Egrave ] };
+ key <AE08> { [ underscore, 8, backslash, macron ] };
+ key <AE09> { [ ccedilla, 9, asciicircum, Ccedilla ] };
+ key <AE10> { [ agrave, 0, at, Agrave ] };
+ key <AE11> { [ parenright, degree, bracketright, Otilde ] };
+ key <AE12> { [ equal, plus, braceright, plusminus ] };
+
+ key <AD01> { [ a, A, acircumflex, Acircumflex ] };
+ key <AD02> { [ z, Z, ae, AE ] };
+ key <AD03> { [ e, E, EuroSign, Ecircumflex ] };
+ key <AD04> { [ r, R, registered, ssharp ] };
+ key <AD05> { [ t, T, thorn, THORN ] };
+ key <AD06> { [ y, Y, ydiaeresis, Ydiaeresis ] };
+ key <AD07> { [ u, U, ucircumflex, Ucircumflex ] };
+ key <AD08> { [ i, I, icircumflex, Icircumflex ] };
+ key <AD09> { [ o, O, ocircumflex, Ocircumflex ] };
+ key <AD10> { [ p, P, odiaeresis, Odiaeresis ] };
+ key <AD11> { [ dead_circumflex, dead_diaeresis, ograve, Ograve ] };
+ key <AD12> { [ dollar, sterling, currency, yen ] };
+
+ key <AC01> { [ q, Q, oe, OE ] };
+ key <AC02> { [ s, S, aacute, Aacute ] };
+ key <AC03> { [ d, D, eth, ETH ] };
+ key <AC04> { [ f, F, ediaeresis, Ediaeresis ] };
+ key <AC05> { [ g, G, yacute, Yacute ] };
+ key <AC06> { [ h, H, uacute, Uacute ] };
+ key <AC07> { [ j, J, idiaeresis, Idiaeresis ] };
+ key <AC08> { [ k, K, iacute, Iacute ] };
+ key <AC09> { [ l, L, oacute, Oacute ] };
+ key <AC10> { [ m, M, oslash, Ooblique ] };
+ key <AC11> { [ ugrave, percent, Ograve, Ugrave ] };
+ key <BKSL> { [ asterisk, mu, notsign, multiply ] };
+
+ key <LSGT> { [ less, greater, guillemotleft, guillemotright ] };
+ key <AB01> { [ w, W, aring, Aring ] };
+ key <AB02> { [ x, X, atilde, Atilde ] };
+ key <AB03> { [ c, C, copyright, cent ] };
+ key <AB04> { [ v, V, udiaeresis, Udiaeresis ] };
+ key <AB05> { [ b, B, adiaeresis, Adiaeresis ] };
+ key <AB06> { [ n, N, ntilde, Ntilde ] };
+ key <AB07> { [ comma, question, questiondown, Igrave ] };
+ key <AB08> { [ semicolon, period, periodcentered, igrave ] };
+ key <AB09> { [ colon, slash, ecircumflex, division ] };
+ key <AB10> { [ exclam, section, paragraph, exclamdown ] };
+ key <SPCE> { [ space, space, space, nobreakspace ] };
+
+ // French uses a comma as decimal separator, but keyboards are labeled with a period
+ // Will take effect when KP_Decimal is mapped to the locale decimal separator
+ key <KPDL> { [ KP_Delete, period, KP_Delete, KP_Decimal ] };
+
+ include "level3(ralt_switch)"
+};
diff -ur ../xkb.orig/symbols/inet ./symbols/inet
--- ../xkb.orig/symbols/inet 2008-01-21 11:32:26.000000000 +0100
+++ ./symbols/inet 2008-01-21 11:34:33.000000000 +0100
@@ -1397,6 +1397,69 @@
include "inet(logitech_set3)"
};
+
+// Logitech Elite Keyboard -- requires a script (uuencoded gzipped version)
+// begin 755 /etc/init.d/keymap-logitech
+// M'XL(`#C>=40``W6436^C0`R&[_P*M]Q;Y@,8),JA:2-%4;?15GO8(X%I@YHP
+// M$0,;Y=^OAWY@"#V!'O.^]M@>_*O;;57?VIWG+TT#[4[#05NKZS?=P+L^>U:W
+// M^"A,J2WH@#'@@H/_LC/=OH2M!B9#2%>,93?PM]+[T@+G"DDD,\^'+\^3WA;Y
+// M8<Z0HZ$8&T;.4`R&3'(DP2,UK%K3%;LY0X'?Q^"?3/-NKXC"[LSQ6-5O<QJ)
+// M&@7^RL+S^@:&6K`.2>H($T>6V="KUZXNVLK4SM1";5K([1A.4HDM,!7/IA+W
+// M))5@[L@BF\H+E,]7*A9D!-B!=!7'%_(2&!OD5+]<NY9_I><"TO7F87%A@/-1
+// MR6A<+.G%M$^BGQ<NP%3]BL[!7/5H$%(#U^C@?II=!JAG/^@CJI=.'UWH&>KY
+// M#_J8Z#')A^74@`-+Y&S[)2?Z[YY,.R!Q.Y-PWF"T\?VFA1?Y<5&3:%X^6M3`
+// MR2_*#V/@;#Y[.#I^\#F1J5YA^M'MY\Q=UE#1U7.EQTGF[4U>]M<B3>'Q>>E]
+// M&O7[?P?+F!&B>L('PCZ((-\D/9'>@+!.AT)"6$\B0GA/XH'@`!U1Q`A'XE!"
+// M2.2("KZ):YPCI.JDMU;<LVWC?BQXI+OK])<^9=<#XHA^Z^/^3*%`^)17>_R-
+// MG/*FI"&)H1==CUB([$]=&LJBWG?,8F0;?&\I5,XP_Z<I2US^\\(<CEVK&Q)1
+// F`48>3-$==-U:&G!'VU1%VS5ZQ-WYGCI;%0C=E/\#RNE[2U$&````
+// `
+// end
+partial alphanumeric_keys
+xkb_symbols "logielite" {
+ include "inet(logitech_base)"
+
+ // Left side
+ key <I69> { [ XF86Go ] };
+// key <I6A> { [ XF86Back ] }; // already in base
+ key <I5F> { [ XF86Standby ] };
+ key <I6C> { [ XF86Mail ] };
+ key <I64> { [ XF86Messenger ] };
+ key <I0E> { [ XF86WebCam ] };
+
+ // Media keys // already in base, Eject added as customization
+// key <I10> { [ XF86AudioPrev ] };
+// key <I19> { [ XF86AudioNext ] };
+// key <I6D> { [ XF86AudioMedia ] };
+// key <I2E> { [ XF86AudioLowerVolume ] };
+// key <I30> { [ XF86AudioRaiseVolume ] };
+// key <I20> { [ XF86AudioMute ] };
+// key <I22> { [ XF86AudioPlay, XF86AudioPause ] };
+ key <I24> { [ XF86AudioStop, XF86Eject ] };
+
+ // Right side
+ key <I13> { [ XF86iTouch ] };
+// key <I65> { [ XF86Search ] }; // already in base
+ key <I1F> { [ XF86Shop ] };
+// key <I66> { [ XF86Favorites ] }; // already in base
+// key <I32> { [ XF86HomePage ] }; // already in base
+
+
+ key <I03> { [ XF86New ] }; // F1
+ key <I77> { [ XF86Reply ] }; // F2
+ key <KPDC> { [ XF86Send ] }; // F3
+ key <I04> { [ XF86MailForward ] }; // F4
+ key <I0B> { [ Undo ] }; // F5
+ key <I06> { [ Redo ] }; // F6
+ key <K71> { [ XF86Open ] }; // F7
+ key <K6F> { [ XF86Save ] }; // F8
+ key <I15> { [ XF86ScreenSaver ] }; // F9
+ key <I16> { [ XF86Documents ] }; // F10
+ key <FK15> { [ XF86Pictures ] }; // F11
+ key <I79> { [ XF86Music ] }; // F12
+
+};
+
// Logitech iTouch Cordless Keyboard (model Y-RB6)
partial alphanumeric_keys
xkb_symbols "logiitc" {
@@ -2202,4 +2265,3 @@
key <I2E> { [ XF86AudioLowerVolume ] };
key <I30> { [ XF86AudioRaiseVolume ] };
};
-
diff -ur ../xkb.orig/symbols.dir ./symbols.dir
--- ../xkb.orig/symbols.dir 2008-01-21 11:32:26.000000000 +0100
+++ ./symbols.dir 2008-01-21 11:34:33.000000000 +0100
@@ -165,6 +165,7 @@
--p----- a------- fo(nodeadkeys)
--p----- a------- fr(Sundeadkeys)
-dp----- a------- fr(basic)
+--p----- a------- fr(complete)
--p----- a------- fr(bepo)
--p----- a------- fr(bepo_latin9)
--p----- a------- fr(dvorak)
@@ -362,6 +363,7 @@
--p----- a------- inet(logiciink)
--p----- a------- inet(logicink)
--p----- a------- inet(logiclx300)
+--p----- a------- inet(logielite)
--p----- a------- inet(logiik)
--p----- a------- inet(logiinkse)
--p----- a------- inet(logiinkseusb)
--- base.xml.orig 2008-01-21 12:40:08.000000000 +0100
+++ base.xml 2008-01-21 12:37:51.000000000 +0100
@@ -590,6 +590,35 @@
</model>
<model>
<configItem>
+ <name>logielite</name>
+ <description>Logitech Elite Keyboard</description>
+ <description xml:lang="af">Logitech Elite Keyboard</description>
+ <description xml:lang="az">Logitech Elite Keyboard</description>
+ <description xml:lang="bg">Logitech Ð?лиÑ? клавиаÑ?Ñ?Ñ?а</description>
+ <description xml:lang="cs">Logitech Elite Keyboard</description>
+ <description xml:lang="da">Logitech Elite Keyboard</description>
+ <description xml:lang="en_GB">Logitech Elite Keyboard</description>
+ <description xml:lang="fi">Logitech Elite Keyboard</description>
+ <description xml:lang="fr">Logitech Elite</description>
+ <description xml:lang="hu">Logitech Elite Keyboard</description>
+ <description xml:lang="it">Logitech Elite Keyboard</description>
+ <description xml:lang="nl">Logitech Elite toetsenbord</description>
+ <description xml:lang="ru">Logitech Elite Keyboard</description>
+ <description xml:lang="sk">Logitech Elite Keyboard</description>
+ <description xml:lang="sl">Logitech Internet Tipkovnica</description>
+ <description xml:lang="sq">Tastierë për Elite Logitech</description>
+ <description xml:lang="sr">Logitech Elite Ñ?аÑ?Ñ?аÑ?Ñ?Ñ?а</description>
+ <description xml:lang="sr@Latn">Logitech Elite tastatura</description>
+ <description xml:lang="sv">Logitech Elitetangentbord</description>
+ <description xml:lang="tr">Logitech Elite Klavyesi</description>
+ <description xml:lang="uk">Logitech Elite Keyboard</description>
+ <description xml:lang="vi">BÃ n phÃm Elite Logitech</description>
+ <description xml:lang="zh_CN">ç½?æ??ELITEé?®ç??</description>
+ <description xml:lang="zh_TW">ç¾?æ??ELITEé?µç?¤</description>
+ </configItem>
+ </model>
+ <model>
+ <configItem>
<name>logiitc</name>
<description>Logitech iTouch Cordless Keyboard (model Y-RB6)</description>
<vendor>Logitech</vendor>
@@ -1918,6 +1947,14 @@
<variantList>
<variant>
<configItem>
+ <name>complete</name>
+ <description>Extended</description>
+ <description xml:lang="en_GB">Extended</description>
+ <description xml:lang="fr">Ã?tendue</description>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
<name>nodeadkeys</name>
<description>Eliminate dead keys</description>
</configItem>
Reply to: