--- Begin Message ---
- To: Debian Bug Tracking System <submit@bugs.debian.org>
- Subject: xkb-data: More Multimedia keys working on Cherry CyMotion Master Linux
- From: Andreas Pakulat <apaku@gmx.de>
- Date: Sat, 07 Oct 2006 12:04:24 +0200
- Message-id: <20061007100424.11105.62496.reportbug@localhost>
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="sr@Latn">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 CyBo@rd USB-Hub</description>
<description xml:lang="es">Cherry CyBo@rd 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="sr@Latn">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 CyBo@rd 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 ] };
--- End Message ---
--- Begin Message ---
- To: 343929-close@bugs.debian.org
- Subject: Bug#343929: fixed in xkeyboard-config 1.1~cvs.20080104.1-1
- From: Mohammed Adnène Trojette <adn+deb@diwi.org>
- Date: Sun, 13 Jan 2008 16:32:06 +0000
- Message-id: <E1JE5kk-0004M8-Az@ries.debian.org>
Source: xkeyboard-config
Source-Version: 1.1~cvs.20080104.1-1
We believe that the bug you reported is fixed in the latest version of
xkeyboard-config, which is due to be installed in the Debian FTP archive:
xkb-data_1.1~cvs.20080104.1-1_all.deb
to pool/main/x/xkeyboard-config/xkb-data_1.1~cvs.20080104.1-1_all.deb
xkeyboard-config_1.1~cvs.20080104.1-1.diff.gz
to pool/main/x/xkeyboard-config/xkeyboard-config_1.1~cvs.20080104.1-1.diff.gz
xkeyboard-config_1.1~cvs.20080104.1-1.dsc
to pool/main/x/xkeyboard-config/xkeyboard-config_1.1~cvs.20080104.1-1.dsc
xkeyboard-config_1.1~cvs.20080104.1.orig.tar.gz
to pool/main/x/xkeyboard-config/xkeyboard-config_1.1~cvs.20080104.1.orig.tar.gz
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 343929@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Mohammed Adnène Trojette <adn+deb@diwi.org> (supplier of updated xkeyboard-config package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.7
Date: Sun, 13 Jan 2008 15:33:54 +0100
Source: xkeyboard-config
Binary: xkb-data
Architecture: source all
Version: 1.1~cvs.20080104.1-1
Distribution: unstable
Urgency: low
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Changed-By: Mohammed Adnène Trojette <adn+deb@diwi.org>
Description:
xkb-data - X Keyboard Extension (XKB) configuration data
Closes: 324647 343929 366180 395883 410628 410903 438940 442942 444035 451622 453675 456942 457927
Changes:
xkeyboard-config (1.1~cvs.20080104.1-1) unstable; urgency=low
.
* New upstream CVS snapshot from January 4th 2008:
+ fixed Latin American layout. (Closes: #444035)
+ fixed Cherry CyMotion Master Linux layout. (Closes: #343929)
+ fixed HP Compaq nx9020 layout. (Closes: #395883)
+ split Serbia and Montenegro. (Closes: #451622)
+ added fr(nodeadkeys) to mac. (Closes: #456942)
+ fixed mapping for shift+backslash in "il" keyboard. (Closes: #457927)
+ added English quotation marks to intl keymaps. (Closes: #453675)
* debian/control:
+ bumped Standards-Version to 3.7.3.
+ used Vcs-Git and Vcs-Browser fields.
+ use a Homepage field.
* Refreshed resync_rules_base.diff. (Closes: #442942)
* Documented the creation of a custom layout in README.Debian and
made /usr/share/X11/xkb/rules/base.xml a symlink to
/etc/X11/xkb/base.xml.
(Closes: #410628, #410903, #438940)
* Documented how to remove conffiles left in /etc/X11/xkb/ in
README.Debian. (Closes: #366180)
* New patch: add_void_definition_pl-324647.diff
+ don't use rules/latin's definitions for alt+{w,q,f}.
(Closes: #324647)
Files:
10d02c59169d3756e088c4c500942783 932 x11 extra xkeyboard-config_1.1~cvs.20080104.1-1.dsc
d415dd467119dd768d8fcf05d72b2a1a 825009 x11 extra xkeyboard-config_1.1~cvs.20080104.1.orig.tar.gz
06e801fa141901736cd647c0498e676c 93745 x11 extra xkeyboard-config_1.1~cvs.20080104.1-1.diff.gz
a85855c70c6e71c7071d438efff3079a 617730 x11 extra xkb-data_1.1~cvs.20080104.1-1_all.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
iD8DBQFHijhROU3FkQ7XBOoRAtJRAJ9zhzPS414Da/kTTg4+oXQjkOKekgCeKgus
6Ovqj5t3K+FjkIEChkPnWyw=
=PLPL
-----END PGP SIGNATURE-----
--- End Message ---