Package: xkb-data Version: 0.8-17 Severity: wishlist Tags: patch Hi,
I'm using the mentioned keyboard here and have produced a xkb configurartion that makes more keys work than the current cymotionlinux one. I already sent this to one of the bugs upstream, but it hasn't been included yet. The patch removes the cymotionlinux Option from xkb and names the model cherrybluec in accordance with the rest of the cherry keyboards. I know this might break existing configurations, but a NEWS entry should cope that. Andreas -- System Information: Debian Release: testing/unstable APT prefers unstable APT policy: (990, 'unstable'), (500, 'experimental'), (500, 'testing'), (500, 'stable') Architecture: i386 (i686) Shell: /bin/sh linked to /bin/bash Kernel: Linux 2.6.18 Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8) -- no debconf information
diff -u -Nur xkb.org/rules/base xkb/rules/base --- xkb.org/rules/base 2006-10-07 11:59:57.000000000 +0200 +++ xkb/rules/base 2006-10-07 12:00:15.000000000 +0200 @@ -38,10 +38,9 @@ apple \ brother \ btc5113rf btc5126t btc9000 btc9000a btc9001ah btc5090 btc9019u \ - cherryblue cherrybluea cherryblueb cherrycyboard \ + cherryblue cherrybluea cherryblueb cherrybluec cherrycyboard \ chicony chicony9885 \ compaqeak8 compaqik7 compaqik13 compaqik18 \ - cymotionlinux \ dell dellusbmm dexxa diamond dinovo dtk2000 \ emachines ennyah_dkb1008 evdev \ genius geniuscomfy geniuscomfy2 geniuskb19e \ diff -u -Nur xkb.org/rules/base.xml xkb/rules/base.xml --- xkb.org/rules/base.xml 2006-10-07 11:59:57.000000000 +0200 +++ xkb/rules/base.xml 2006-10-07 12:01:33.000000000 +0200 @@ -882,6 +882,22 @@ </model> <model> <configItem> + <name>cherrybluec</name> + <description>Cherry CyMotion Master Linux</description> + <description xml:lang="fi">Cherry CyMotion Master Linux</description> + <description xml:lang="fr">Cherry CyMotion Master Linux</description> + <description xml:lang="it">Cherry CyMotion Master Linux</description> + <description xml:lang="nl">Cherry CyMotion Master Linux</description> + <description xml:lang="ru">Cherry CyMotion Master Linux</description> + <description xml:lang="sl">Cherry CyMotion Master Linux</description> + <description xml:lang="sr">Cherry CyMotion Master Linux</description> + <description xml:lang="[EMAIL PROTECTED]">Cherry CyMotion Master Linux</description> + <description xml:lang="tr">Cherry CyMotion Master Linux</description> + <description xml:lang="zh_TW">Cherry CyMotion Master Linux</description> + </configItem> + </model> + <model> + <configItem> <name>cherrycyboard</name> <description>Cherry [EMAIL PROTECTED] USB-Hub</description> <description xml:lang="es">Cherry [EMAIL PROTECTED] USB-Hub</description> @@ -1079,27 +1095,6 @@ </model> <model> <configItem> - <name>cymotionlinux</name> - <description>Cherry CyMotion Master Linux</description> - <description xml:lang="es">Cherry CyMotion Master Linux</description> - <description xml:lang="fi">Cherry CyMotion Master Linux</description> - <description xml:lang="fr">Cherry CyMotion Master Linux</description> - <description xml:lang="hu">Cherry CyMotion Master Linux</description> - <description xml:lang="it">Cherry CyMotion Master Linux</description> - <description xml:lang="ka">Cherry CyMotion Master Linux</description> - <description xml:lang="nl">Cherry CyMotion Master Linux</description> - <description xml:lang="ru">Cherry CyMotion Master Linux</description> - <description xml:lang="sl">Cherry CyMotion Master Linux</description> - <description xml:lang="sr">Cherry CyMotion Master Linux</description> - <description xml:lang="[EMAIL PROTECTED]">Cherry CyMotion Master Linux</description> - <description xml:lang="sv">Cherry CyMotion Master Linux</description> - <description xml:lang="tr">Cherry CyMotion Master Linux</description> - <description xml:lang="uk">Cherry CyMotion Master Linux</description> - <description xml:lang="zh_TW">Cherry CyMotion Master Linux</description> - </configItem> - </model> - <model> - <configItem> <name>armada</name> <description>Laptop/notebook Compaq (eg. Armada) Laptop Keyboard</description> <description xml:lang="af">Laptop/notebook Compaq (eg. Armada) Laptop Keyboard</description> diff -u -Nur xkb.org/symbols/inet xkb/symbols/inet --- xkb.org/symbols/inet 2006-10-07 11:59:57.000000000 +0200 +++ xkb/symbols/inet 2006-10-07 12:00:15.000000000 +0200 @@ -539,6 +539,40 @@ key <I6D> { [ XF86Go ] }; }; +//Cherry CyMotion Master Linux +partial alphanumeric_keys +xkb_symbols "cherrybluec" { + key <FK17> { [ XF86Search ] }; + key <XFER> { [ XF86AudioMedia ] }; + key <I02> { [ XF86HomePage ] }; + key <I07> { [ Undo ] }; + key <I0A> { [ Redo ] }; + key <I0F> { [ XF86ScrollDown ] }; + key <I10> { [ XF86AudioPrev ] }; + key <I17> { [ XF86Launch1 ] }; + key <I19> { [ XF86AudioNext ] }; + key <I1F> { [ XF86Launch0 ] }; + key <I20> { [ XF86AudioMute ] }; + key <I21> { [ XF86Calculator ] }; + key <I22> { [ XF86AudioPlay, XF86AudioPause ] }; + key <I24> { [ XF86AudioStop ] }; + key <I2B> { [ XF86Launch2 ] }; + key <I2E> { [ XF86AudioLowerVolume ] }; + key <I30> { [ XF86AudioRaiseVolume ] }; + key <I3C> { [ XF86Cut ] }; + key <I5C> { [ XF86ScrollUp ] }; + key <I63> { [ XF86PowerOff ] }; + key <167> { [ XF86Reload ] }; + key <I68> { [ XF86Stop ] }; + key <I69> { [ XF86Forward ] }; + key <I6A> { [ XF86Back ] }; + key <I6C> { [ XF86Mail ] }; + key <I78> { [ XF86Copy ] }; + key <K5D> { [ Meta_L ] }; + key <K6C> { [ XF86Eject ] }; + key <K65> { [ XF86Paste ] }; +}; + // Cherry [EMAIL PROTECTED] USB-Hub partial alphanumeric_keys xkb_symbols "cherrycyboard" { @@ -2200,41 +2234,6 @@ key <KPEQ> { [ KP_Equal ] }; }; -partial alphanumeric_keys -xkb_symbols "cymotionlinux" { - key <RWIN> { [ at ] }; - key <I68> { [ XF86Stop ] }; - key <FK17> { [ XF86Search ] }; - key <I02> { [ XF86WWW ] }; - key <I07> { [ Undo ] }; - key <I0A> { [ Redo ] }; - key <I0F> { [ XF86ScrollDown ] }; - key <I10> { [ XF86AudioPrev ] }; - key <I17> { [ XF86Launch2 ] }; - key <I19> { [ XF86AudioNext ] }; - key <I1F> { [ XF86Launch1 ] }; - key <I20> { [ XF86AudioMute ] }; - key <I21> { [ XF86Calculator ] }; - key <I22> { [ XF86AudioPlay, XF86AudioPause ] }; - key <I24> { [ XF86AudioStop ] }; - key <I28> { [ XF86MenuKB ] }; - key <I2B> { [ XF86Launch3 ] }; - key <I2E> { [ XF86AudioLowerVolume ] }; - key <I30> { [ XF86AudioRaiseVolume ] }; - key <I3C> { [ XF86Cut ] }; - key <I63> { [ XF86Standby ] }; - key <I67> { [ XF86Reload ] }; - key <I68> { [ XF86PowerOff ] }; - key <I69> { [ XF86Forward ] }; - key <I6A> { [ XF86Back ] }; - key <I6C> { [ XF86Mail ] }; - key <I78> { [ XF86Copy ] }; - key <K65> { [ XF86Paste ] }; - key <K6C> { [ XF86AudioEject ] }; - key <K75> { [ XF86ScrollUp ] }; - key <XFER> { [ XF86AudioMedia ] }; -}; - partial alphanumeric_keys xkb_symbols "silvercrest" { key <I02> { [ XF86HomePage ] };