From 5623ef98619466fbd371331247dc90bf0bea2cd0 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 16 Jan 2023 10:43:34 +0100 Subject: xkeyboard-config: update to 2.37 --- package/xkeyboard-config/Makefile | 12 +- package/xkeyboard-config/patches/patch-Makefile_am | 10 - .../xkeyboard-config/patches/patch-configure_ac | 13 - .../patches/patch-rules_Makefile_am | 10 - .../patches/patch-rules_base_extras_xml_in | 855 --- .../patches/patch-rules_base_xml_in | 7654 -------------------- .../patches/patch-rules_evdev_extras_xml_in | 855 --- .../patches/patch-rules_evdev_xml_in | 7654 -------------------- 8 files changed, 7 insertions(+), 17056 deletions(-) delete mode 100644 package/xkeyboard-config/patches/patch-Makefile_am delete mode 100644 package/xkeyboard-config/patches/patch-configure_ac delete mode 100644 package/xkeyboard-config/patches/patch-rules_Makefile_am delete mode 100644 package/xkeyboard-config/patches/patch-rules_base_extras_xml_in delete mode 100644 package/xkeyboard-config/patches/patch-rules_base_xml_in delete mode 100644 package/xkeyboard-config/patches/patch-rules_evdev_extras_xml_in delete mode 100644 package/xkeyboard-config/patches/patch-rules_evdev_xml_in diff --git a/package/xkeyboard-config/Makefile b/package/xkeyboard-config/Makefile index b6ba0d40f..e9fe7babf 100644 --- a/package/xkeyboard-config/Makefile +++ b/package/xkeyboard-config/Makefile @@ -4,21 +4,23 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= xkeyboard-config -PKG_VERSION:= 2.11 +PKG_VERSION:= 2.37 PKG_RELEASE:= 1 -PKG_HASH:= e7125460892c2b5c3a8d843cb18c24b60c46051e925c2888a61fa672a2f76d76 +PKG_HASH:= eb1383a5ac4b6210d7c7302b9d6fab052abdf51c5d2c9b55f1f779997ba68c6c PKG_DESCR:= keyboard config PKG_SECTION:= x11/misc PKG_BUILDDEP:= util-macros-host xkbcomp PKG_SITES:= http://www.x.org/releases/individual/data/xkeyboard-config/ -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 - include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,XKEYBOARD_CONFIG,xkeyboard-config,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -AUTOTOOL_STYLE:= autoreconf +WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj + +CONFIG_STYLE:= meson +BUILD_STYLE:= meson +INSTALL_STYLE:= meson xkeyboard-config-install: ${INSTALL_DIR} ${IDIR_XKEYBOARD_CONFIG}/usr/share/X11/xkb diff --git a/package/xkeyboard-config/patches/patch-Makefile_am b/package/xkeyboard-config/patches/patch-Makefile_am deleted file mode 100644 index 91f90f91b..000000000 --- a/package/xkeyboard-config/patches/patch-Makefile_am +++ /dev/null @@ -1,10 +0,0 @@ ---- xkeyboard-config-2.11.orig/Makefile.am 2013-10-19 18:02:53.000000000 +0200 -+++ xkeyboard-config-2.11/Makefile.am 2014-03-04 14:43:40.000000000 +0100 -@@ -1,6 +1,6 @@ - AUTOMAKE_OPTIONS = foreign - --SUBDIRS = compat geometry keycodes po rules symbols types docs man -+SUBDIRS = compat geometry keycodes rules symbols types - - pkgconfigdir = $(datadir)/pkgconfig - pkgconfig_DATA = xkeyboard-config.pc diff --git a/package/xkeyboard-config/patches/patch-configure_ac b/package/xkeyboard-config/patches/patch-configure_ac deleted file mode 100644 index 2cb7cc7db..000000000 --- a/package/xkeyboard-config/patches/patch-configure_ac +++ /dev/null @@ -1,13 +0,0 @@ ---- xkeyboard-config-2.11.orig/configure.ac 2014-01-29 21:08:27.000000000 +0100 -+++ xkeyboard-config-2.11/configure.ac 2014-03-04 14:43:26.000000000 +0100 -@@ -63,10 +63,6 @@ AM_CONDITIONAL(USE_COMPAT_RULES, test "x - # **** - # i18n - # **** --AC_PROG_INTLTOOL(0.30) -- --AM_GNU_GETTEXT_VERSION([0.18.1]) --AM_GNU_GETTEXT([external]) - - GETTEXT_PACKAGE=xkeyboard-config - AC_SUBST(GETTEXT_PACKAGE) diff --git a/package/xkeyboard-config/patches/patch-rules_Makefile_am b/package/xkeyboard-config/patches/patch-rules_Makefile_am deleted file mode 100644 index ac07e510b..000000000 --- a/package/xkeyboard-config/patches/patch-rules_Makefile_am +++ /dev/null @@ -1,10 +0,0 @@ ---- xkeyboard-config-2.11.orig/rules/Makefile.am 2013-12-17 23:59:06.000000000 +0100 -+++ xkeyboard-config-2.11/rules/Makefile.am 2014-03-04 14:30:44.000000000 +0100 -@@ -244,4 +244,6 @@ MAINTAINERCLEANFILES = $(srcdir)/evdev.x - rulesdir = $(xkb_base)/rules - xmldir = $(rulesdir) - --@INTLTOOL_XML_NOMERGE_RULE@ -+# remove intltool-merge dependency -+%.xml: %.xml.in -+ cp $< $@ diff --git a/package/xkeyboard-config/patches/patch-rules_base_extras_xml_in b/package/xkeyboard-config/patches/patch-rules_base_extras_xml_in deleted file mode 100644 index beb2b7a9d..000000000 --- a/package/xkeyboard-config/patches/patch-rules_base_extras_xml_in +++ /dev/null @@ -1,855 +0,0 @@ ---- xkeyboard-config-2.11.orig/rules/base.extras.xml.in 2013-12-24 00:48:45.000000000 +0100 -+++ xkeyboard-config-2.11/rules/base.extras.xml.in 2014-03-04 14:31:19.000000000 +0100 -@@ -1,4 +1,4 @@ -- -+ - - - -@@ -6,8 +6,8 @@ - - - apl -- <_shortDescription>apl -- <_description>APL keyboard symbols -+ apl -+ APL keyboard symbols - eng - - -@@ -58,29 +58,29 @@ - - - ca -- <_shortDescription>fr -- <_description>French (Canada) -+ fr -+ French (Canada) - fra - - - - - kut -- <_shortDescription>kut -- <_description>Kutenai -+ kut -+ Kutenai - - - - - shs -- <_shortDescription>shs -- <_description>Secwepemctsin -+ shs -+ Secwepemctsin - - - - - sun_type6 -- <_description>Multilingual (Canada, Sun Type 6/7) -+ Multilingual (Canada, Sun Type 6/7) - - - -@@ -88,8 +88,8 @@ - - - de -- <_shortDescription>de -- <_description>German -+ de -+ German - - ger - -@@ -98,7 +98,7 @@ - - - us -- <_description>German (US keyboard with German letters) -+ German (US keyboard with German letters) - - eng - -@@ -107,7 +107,7 @@ - - - hu -- <_description>German (with Hungarian letters and no dead keys) -+ German (with Hungarian letters and no dead keys) - - ger - hun -@@ -117,7 +117,7 @@ - - - sun_type6 -- <_description>German (Sun Type 6/7) -+ German (Sun Type 6/7) - - - -@@ -125,15 +125,15 @@ - - - ir -- <_shortDescription>fa -- <_description>Persian -+ fa -+ Persian - per - - - - - ave -- <_description>Avestan -+ Avestan - ave - - -@@ -142,21 +142,21 @@ - - - lt -- <_shortDescription>lt -- <_description>Lithuanian -+ lt -+ Lithuanian - lit - - - - - us_dvorak -- <_description>Lithuanian (US Dvorak with Lithuanian letters) -+ Lithuanian (US Dvorak with Lithuanian letters) - - - - - sun_type6 -- <_description>Lithuanian (Sun Type 6/7) -+ Lithuanian (Sun Type 6/7) - - - -@@ -164,8 +164,8 @@ - - - lv -- <_shortDescription>lv -- <_description>Latvian -+ lv -+ Latvian - - lav - -@@ -174,55 +174,55 @@ - - - dvorak -- <_description>Latvian (US Dvorak) -+ Latvian (US Dvorak) - - - - - ykeydvorak -- <_description>Latvian (US Dvorak, Y variant) -+ Latvian (US Dvorak, Y variant) - - - - - minuskeydvorak -- <_description>Latvian (US Dvorak, minus variant) -+ Latvian (US Dvorak, minus variant) - - - - - dvorakprogr -- <_description>Latvian (programmer US Dvorak) -+ Latvian (programmer US Dvorak) - - - - - ykeydvorakprogr -- <_description>Latvian (programmer US Dvorak, Y variant) -+ Latvian (programmer US Dvorak, Y variant) - - - - - minuskeydvorakprogr -- <_description>Latvian (programmer US Dvorak, minus variant) -+ Latvian (programmer US Dvorak, minus variant) - - - - - colemak -- <_description>Latvian (US Colemak) -+ Latvian (US Colemak) - - - - - apostrophecolemak -- <_description>Latvian (US Colemak, apostrophe variant) -+ Latvian (US Colemak, apostrophe variant) - - - - - sun_type6 -- <_description>Latvian (Sun Type 6/7) -+ Latvian (Sun Type 6/7) - - - -@@ -230,34 +230,34 @@ - - - us -- <_shortDescription>en -- <_description>English (US) -+ en -+ English (US) - eng - - - - - intl-unicode -- <_description>English (US, international AltGr Unicode combining) -+ English (US, international AltGr Unicode combining) - - - - - alt-intl-unicode -- <_description>English (US, international AltGr Unicode combining, alternative) -+ English (US, international AltGr Unicode combining, alternative) - - - - - ats -- <_description>Atsina -- -+ Atsina -+ - - - - - crd -- <_description>Coeur d'Alene Salish -+ Coeur d'Alene Salish - crd - - -@@ -274,13 +274,13 @@ - - - sun_type6 -- <_description>English (US, Sun Type 6/7) -+ English (US, Sun Type 6/7) - - - - - norman -- <_description>English (Norman) -+ English (Norman) - - - -@@ -288,27 +288,27 @@ - - - pl -- <_shortDescription>pl -- <_description>Polish -+ pl -+ Polish - pol - - - - - intl -- <_description>Polish (international with dead keys) -+ Polish (international with dead keys) - - - - - colemak -- <_description>Polish (Colemak) -+ Polish (Colemak) - - - - - sun_type6 -- <_description>Polish (Sun Type 6/7) -+ Polish (Sun Type 6/7) - - - -@@ -316,16 +316,16 @@ - - - ro -- <_shortDescription>ro -- <_description>Romanian -+ ro -+ Romanian - rum - - - - - crh_dobruja -- <_shortDescription>crh -- <_description>Crimean Tatar (Dobruja Q) -+ crh -+ Crimean Tatar (Dobruja Q) - - crh - -@@ -334,13 +334,13 @@ - - - ergonomic -- <_description>Romanian (ergonomic Touchtype) -+ Romanian (ergonomic Touchtype) - - - - - sun_type6 -- <_description>Romanian (Sun Type 6/7) -+ Romanian (Sun Type 6/7) - - - -@@ -348,15 +348,15 @@ - - - rs -- <_shortDescription>sr -- <_description>Serbian -+ sr -+ Serbian - srp - - - - - combiningkeys -- <_description>Serbian (combining accents instead of dead keys) -+ Serbian (combining accents instead of dead keys) - - - -@@ -364,8 +364,8 @@ - - - ru -- <_shortDescription>ru -- <_description>Russian -+ ru -+ Russian - - - -@@ -378,8 +378,8 @@ - - - ruu -- <_shortDescription>ru -- <_description>Russian (with Ukrainian-Belorussian layout) -+ ru -+ Russian (with Ukrainian-Belorussian layout) - rus - ukr - bel -@@ -388,7 +388,7 @@ - - - sun_type6 -- <_description>Russian (Sun Type 6/7) -+ Russian (Sun Type 6/7) - - - -@@ -396,8 +396,8 @@ - - - am -- <_shortDescription>hy -- <_description>Armenian -+ hy -+ Armenian - - hye - -@@ -406,7 +406,7 @@ - - - olpc-phonetic -- <_description>Armenian (OLPC phonetic) -+ Armenian (OLPC phonetic) - - - -@@ -414,15 +414,15 @@ - - - il -- <_shortDescription>he -- <_description>Hebrew -+ he -+ Hebrew - heb - - - - - biblicalSIL -- <_description>Hebrew (Biblical, SIL phonetic) -+ Hebrew (Biblical, SIL phonetic) - heb - - -@@ -431,14 +431,14 @@ - - - ara -- <_shortDescription>ar -- <_description>Arabic -+ ar -+ Arabic - - - - - sun_type6 -- <_description>Arabic (Sun Type 6/7) -+ Arabic (Sun Type 6/7) - - - -@@ -446,14 +446,14 @@ - - - be -- <_shortDescription>be -- <_description>Belgian -+ be -+ Belgian - - - - - sun_type6 -- <_description>Belgian (Sun Type 6/7) -+ Belgian (Sun Type 6/7) - - - -@@ -461,14 +461,14 @@ - - - br -- <_shortDescription>pt -- <_description>Portuguese (Brazil) -+ pt -+ Portuguese (Brazil) - - - - - sun_type6 -- <_description>Portuguese (Brazil, Sun Type 6/7) -+ Portuguese (Brazil, Sun Type 6/7) - - - -@@ -476,14 +476,14 @@ - - - cz -- <_shortDescription>cs -- <_description>Czech -+ cs -+ Czech - - - - - sun_type6 -- <_description>Czech (Sun Type 6/7) -+ Czech (Sun Type 6/7) - - - -@@ -491,14 +491,14 @@ - - - dk -- <_shortDescription>da -- <_description>Danish -+ da -+ Danish - - - - - sun_type6 -- <_description>Danish (Sun Type 6/7) -+ Danish (Sun Type 6/7) - - - -@@ -506,14 +506,14 @@ - - - nl -- <_shortDescription>nl -- <_description>Dutch -+ nl -+ Dutch - - - - - sun_type6 -- <_description>Dutch (Sun Type 6/7) -+ Dutch (Sun Type 6/7) - - - -@@ -521,14 +521,14 @@ - - - ee -- <_shortDescription>et -- <_description>Estonian -+ et -+ Estonian - - - - - sun_type6 -- <_description>Estonian (Sun Type 6/7) -+ Estonian (Sun Type 6/7) - - - -@@ -536,14 +536,14 @@ - - - fi -- <_shortDescription>fi -- <_description>Finnish -+ fi -+ Finnish - - - - - sun_type6 -- <_description>Finnish (Sun Type 6/7) -+ Finnish (Sun Type 6/7) - - - -@@ -551,14 +551,14 @@ - - - fr -- <_shortDescription>fr -- <_description>French -+ fr -+ French - - - - - sun_type6 -- <_description>French (Sun Type 6/7) -+ French (Sun Type 6/7) - - - -@@ -566,14 +566,14 @@ - - - gr -- <_shortDescription>gr -- <_description>Greek -+ gr -+ Greek - - - - - sun_type6 -- <_description>Greek (Sun Type 6/7) -+ Greek (Sun Type 6/7) - - - -@@ -581,14 +581,14 @@ - - - it -- <_shortDescription>it -- <_description>Italian -+ it -+ Italian - - - - - sun_type6 -- <_description>Italian (Sun Type 6/7) -+ Italian (Sun Type 6/7) - - - -@@ -596,26 +596,26 @@ - - - jp -- <_shortDescription>ja -- <_description>Japanese -+ ja -+ Japanese - - - - - sun_type6 -- <_description>Japanese (Sun Type 6) -+ Japanese (Sun Type 6) - - - - - sun_type7 -- <_description>Japanese (Sun Type 7 - pc compatible) -+ Japanese (Sun Type 7 - pc compatible) - - - - - sun_type7_suncompat -- <_description>Japanese (Sun Type 7 - sun compatible) -+ Japanese (Sun Type 7 - sun compatible) - - - -@@ -623,14 +623,14 @@ - - - no -- <_shortDescription>no -- <_description>Norwegian -+ no -+ Norwegian - - - - - sun_type6 -- <_description>Norwegian (Sun Type 6/7) -+ Norwegian (Sun Type 6/7) - - - -@@ -638,14 +638,14 @@ - - - pt -- <_shortDescription>pt -- <_description>Portuguese -+ pt -+ Portuguese - - - - - sun_type6 -- <_description>Portuguese (Sun Type 6/7) -+ Portuguese (Sun Type 6/7) - - - -@@ -653,14 +653,14 @@ - - - sk -- <_shortDescription>sk -- <_description>Slovak -+ sk -+ Slovak - - - - - sun_type6 -- <_description>Slovak (Sun Type 6/7) -+ Slovak (Sun Type 6/7) - - - -@@ -668,14 +668,14 @@ - - - es -- <_shortDescription>es -- <_description>Spanish -+ es -+ Spanish - - - - - sun_type6 -- <_description>Spanish (Sun Type 6/7) -+ Spanish (Sun Type 6/7) - - - -@@ -683,14 +683,14 @@ - - - se -- <_shortDescription>sv -- <_description>Swedish -+ sv -+ Swedish - - - - - sun_type6 -- <_description>Swedish (Sun Type 6/7) -+ Swedish (Sun Type 6/7) - - - -@@ -698,20 +698,20 @@ - - - ch -- <_shortDescription>de -- <_description>German (Switzerland) -+ de -+ German (Switzerland) - - - - - sun_type6_de -- <_description>German (Switzerland, Sun Type 6/7) -+ German (Switzerland, Sun Type 6/7) - - - - - sun_type6_fr -- <_description>French (Switzerland, Sun Type 6/7) -+ French (Switzerland, Sun Type 6/7) - - - -@@ -719,14 +719,14 @@ - - - tr -- <_shortDescription>tr -- <_description>Turkish -+ tr -+ Turkish - - - - - sun_type6 -- <_description>Turkish (Sun Type 6/7) -+ Turkish (Sun Type 6/7) - - - -@@ -734,14 +734,14 @@ - - - ua -- <_shortDescription>uk -- <_description>Ukrainian -+ uk -+ Ukrainian - - - - - sun_type6 -- <_description>Ukrainian (Sun Type 6/7) -+ Ukrainian (Sun Type 6/7) - - - -@@ -749,14 +749,14 @@ - - - gb -- <_shortDescription>en -- <_description>English (UK) -+ en -+ English (UK) - - - - - sun_type6 -- <_description>English (UK, Sun Type 6/7) -+ English (UK, Sun Type 6/7) - - - -@@ -764,18 +764,18 @@ - - - kr -- <_shortDescription>ko -- <_description>Korean -+ ko -+ Korean - - - - - sun_type6 -- <_description>Korean (Sun Type 6/7) -+ Korean (Sun Type 6/7) - - - - - - -- -+ -\ No newline at end of file diff --git a/package/xkeyboard-config/patches/patch-rules_base_xml_in b/package/xkeyboard-config/patches/patch-rules_base_xml_in deleted file mode 100644 index 5249ade99..000000000 --- a/package/xkeyboard-config/patches/patch-rules_base_xml_in +++ /dev/null @@ -1,7654 +0,0 @@ ---- xkeyboard-config-2.11.orig/rules/base.xml.in 2014-01-15 02:02:39.000000000 +0100 -+++ xkeyboard-config-2.11/rules/base.xml.in 2014-03-04 14:31:12.000000000 +0100 -@@ -5,627 +5,627 @@ - - - pc101 -- <_description>Generic 101-key PC -+ Generic 101-key PC - Generic - - - - - pc102 -- <_description>Generic 102-key (Intl) PC -+ Generic 102-key (Intl) PC - Generic - - - - - pc104 -- <_description>Generic 104-key PC -+ Generic 104-key PC - Generic - - - - - pc105 -- <_description>Generic 105-key (Intl) PC -+ Generic 105-key (Intl) PC - Generic - - - - - dell101 -- <_description>Dell 101-key PC -+ Dell 101-key PC - Dell - - - - - latitude -- <_description>Dell Latitude series laptop -+ Dell Latitude series laptop - Dell - - - - - dellm65 -- <_description>Dell Precision M65 -+ Dell Precision M65 - Dell - - - - - everex -- <_description>Everex STEPnote -+ Everex STEPnote - Everex - - - - - flexpro -- <_description>Keytronic FlexPro -+ Keytronic FlexPro - Keytronic - - - - - microsoft -- <_description>Microsoft Natural -+ Microsoft Natural - Microsoft Inc. - - - - - omnikey101 -- <_description>Northgate OmniKey 101 -+ Northgate OmniKey 101 - Northgate - - - - - winbook -- <_description>Winbook Model XP5 -+ Winbook Model XP5 - Generic - - - - - pc98 -- <_description>PC-98xx Series -+ PC-98xx Series - Generic - - - - - a4techKB21 -- <_description>A4Tech KB-21 -+ A4Tech KB-21 - A4Tech - - - - - a4techKBS8 -- <_description>A4Tech KBS-8 -+ A4Tech KBS-8 - A4Tech - - - - - a4_rfkb23 -- <_description>A4Tech Wireless Desktop RFKB-23 -+ A4Tech Wireless Desktop RFKB-23 - A4Tech - - - - - airkey -- <_description>Acer AirKey V -+ Acer AirKey V - Acer - - - - - azonaRF2300 -- <_description>Azona RF2300 wireless Internet Keyboard -+ Azona RF2300 wireless Internet Keyboard - Azona - - - - - scorpius -- <_description>Advance Scorpius KI -+ Advance Scorpius KI - Scorpius - - - - - brother -- <_description>Brother Internet Keyboard -+ Brother Internet Keyboard - Brother - - - - - btc5113rf -- <_description>BTC 5113RF Multimedia -+ BTC 5113RF Multimedia - BTC - - - - - btc5126t -- <_description>BTC 5126T -+ BTC 5126T - BTC - - - - - btc6301urf -- <_description>BTC 6301URF -+ BTC 6301URF - BTC - - - - - btc9000 -- <_description>BTC 9000 -+ BTC 9000 - BTC - - - - - btc9000a -- <_description>BTC 9000A -+ BTC 9000A - BTC - - - - - btc9001ah -- <_description>BTC 9001AH -+ BTC 9001AH - BTC - - - - - btc5090 -- <_description>BTC 5090 -+ BTC 5090 - BTC - - - - - btc9019u -- <_description>BTC 9019U -+ BTC 9019U - BTC - - - - - btc9116u -- <_description>BTC 9116U Mini Wireless Internet and Gaming -+ BTC 9116U Mini Wireless Internet and Gaming - - - - - cherryblue -- <_description>Cherry Blue Line CyBo@rd -+ Cherry Blue Line CyBo@rd - - - - - cherryblueb -- <_description>Cherry CyMotion Master XPress -+ Cherry CyMotion Master XPress - Cherry - - - - - cherrybluea -- <_description>Cherry Blue Line CyBo@rd (alternate option) -+ Cherry Blue Line CyBo@rd (alternate option) - Cherry - - - - - cherrycyboard -- <_description>Cherry CyBo@rd USB-Hub -+ Cherry CyBo@rd USB-Hub - Cherry - - - - - cherrycmexpert -- <_description>Cherry CyMotion Expert -+ Cherry CyMotion Expert - Cherry - - - - - cherrybunlim -- <_description>Cherry B.UNLIMITED -+ Cherry B.UNLIMITED - Cherry - - - - - chicony -- <_description>Chicony Internet Keyboard -+ Chicony Internet Keyboard - Chicony - - - - - chicony0108 -- <_description>Chicony KU-0108 -+ Chicony KU-0108 - Chicony - - - - - chicony0420 -- <_description>Chicony KU-0420 -+ Chicony KU-0420 - Chicony - - - - - chicony9885 -- <_description>Chicony KB-9885 -+ Chicony KB-9885 - Chicony - - - - - compaqeak8 -- <_description>Compaq Easy Access Keyboard -+ Compaq Easy Access Keyboard - Compaq - - - - - compaqik7 -- <_description>Compaq Internet Keyboard (7 keys) -+ Compaq Internet Keyboard (7 keys) - Compaq - - - - - compaqik13 -- <_description>Compaq Internet Keyboard (13 keys) -+ Compaq Internet Keyboard (13 keys) - Compaq - - - - - compaqik18 -- <_description>Compaq Internet Keyboard (18 keys) -+ Compaq Internet Keyboard (18 keys) - Compaq - - - - - cymotionlinux -- <_description>Cherry CyMotion Master Linux -+ Cherry CyMotion Master Linux - Cherry - - - - - armada -- <_description>Laptop/notebook Compaq (eg. Armada) Laptop Keyboard -+ Laptop/notebook Compaq (eg. Armada) Laptop Keyboard - Compaq - - - - - presario -- <_description>Laptop/notebook Compaq (eg. Presario) Internet Keyboard -+ Laptop/notebook Compaq (eg. Presario) Internet Keyboard - Compaq - - - - - ipaq -- <_description>Compaq iPaq Keyboard -+ Compaq iPaq Keyboard - Compaq - - - - - dell -- <_description>Dell -+ Dell - Dell - - - - - dellsk8125 -- <_description>Dell SK-8125 -+ Dell SK-8125 - Dell - - - - - dellsk8135 -- <_description>Dell SK-8135 -+ Dell SK-8135 - Dell - - - - - dellusbmm -- <_description>Dell USB Multimedia Keyboard -+ Dell USB Multimedia Keyboard - Dell - - - - - inspiron -- <_description>Dell Laptop/notebook Inspiron 6xxx/8xxx -+ Dell Laptop/notebook Inspiron 6xxx/8xxx - Dell - - - - - precision_m -- <_description>Dell Laptop/notebook Precision M series -+ Dell Laptop/notebook Precision M series - Dell - - - - - dexxa -- <_description>Dexxa Wireless Desktop Keyboard -+ Dexxa Wireless Desktop Keyboard - Dexxa - - - - - diamond -- <_description>Diamond 9801 / 9802 series -+ Diamond 9801 / 9802 series - Diamond - - - - - dtk2000 -- <_description>DTK2000 -+ DTK2000 - - - - - ennyah_dkb1008 -- <_description>Ennyah DKB-1008 -+ Ennyah DKB-1008 - Ennyah - - - - - fscaa1667g -- <_description>Fujitsu-Siemens Computers AMILO laptop -+ Fujitsu-Siemens Computers AMILO laptop - Fujitsu-Siemens - - - - - genius -- <_description>Genius Comfy KB-16M / Genius MM Keyboard KWD-910 -+ Genius Comfy KB-16M / Genius MM Keyboard KWD-910 - Genius - - - - - geniuscomfy -- <_description>Genius Comfy KB-12e -+ Genius Comfy KB-12e - Genius - - - - - geniuscomfy2 -- <_description>Genius Comfy KB-21e-Scroll -+ Genius Comfy KB-21e-Scroll - Genius - - - - - geniuskb19e -- <_description>Genius KB-19e NB -+ Genius KB-19e NB - Genius - - - - - geniuskkb2050hs -- <_description>Genius KKB-2050HS -+ Genius KKB-2050HS - Genius - - - - - gyration -- <_description>Gyration -+ Gyration - Gyration - - - - - htcdream -- <_description>HTC Dream -+ HTC Dream - HTC - - - - - kinesis -- <_description>Kinesis -+ Kinesis - Kinesis - - - - - logitech_base -- <_description>Logitech Generic Keyboard -+ Logitech Generic Keyboard - Logitech - - - - - logitech_g15 -- <_description>Logitech G15 extra keys via G15daemon -+ Logitech G15 extra keys via G15daemon - Logitech - - - - - hpi6 -- <_description>Hewlett-Packard Internet Keyboard -+ Hewlett-Packard Internet Keyboard - Hewlett-Packard - - - - - hp250x -- <_description>Hewlett-Packard SK-250x Multimedia Keyboard -+ Hewlett-Packard SK-250x Multimedia Keyboard - Hewlett-Packard - - - - - hpxe3gc -- <_description>Hewlett-Packard Omnibook XE3 GC -+ Hewlett-Packard Omnibook XE3 GC - Hewlett-Packard - - - - - hpxe3gf -- <_description>Hewlett-Packard Omnibook XE3 GF -+ Hewlett-Packard Omnibook XE3 GF - Hewlett-Packard - - - - - hpxt1000 -- <_description>Hewlett-Packard Omnibook XT1000 -+ Hewlett-Packard Omnibook XT1000 - Hewlett-Packard - - - - - hpdv5 -- <_description>Hewlett-Packard Pavilion dv5 -+ Hewlett-Packard Pavilion dv5 - Hewlett-Packard - - - - - hpzt11xx -- <_description>Hewlett-Packard Pavilion ZT11xx -+ Hewlett-Packard Pavilion ZT11xx - Hewlett-Packard - - - - - hp500fa -- <_description>Hewlett-Packard Omnibook 500 FA -+ Hewlett-Packard Omnibook 500 FA - Hewlett-Packard - - - - - hp5xx -- <_description>Hewlett-Packard Omnibook 5xx -+ Hewlett-Packard Omnibook 5xx - Hewlett-Packard - - - - - hpnx9020 -- <_description>Hewlett-Packard nx9020 -+ Hewlett-Packard nx9020 - Hewlett-Packard - - - - - hp6000 -- <_description>Hewlett-Packard Omnibook 6000/6100 -+ Hewlett-Packard Omnibook 6000/6100 - Hewlett-Packard - - - - - honeywell_euroboard -- <_description>Honeywell Euroboard -+ Honeywell Euroboard - Hewlett-Packard - - - - - hpmini110 -- <_description>Hewlett-Packard Mini 110 Notebook -+ Hewlett-Packard Mini 110 Notebook - Hewlett-Packard - - - - - rapidaccess -- <_description>IBM Rapid Access -+ IBM Rapid Access - Lenovo (previously IBM) - - - - - rapidaccess2 -- <_description>IBM Rapid Access II -+ IBM Rapid Access II - Lenovo (previously IBM) - - - - - thinkpad -- <_description>IBM ThinkPad 560Z/600/600E/A22E -+ IBM ThinkPad 560Z/600/600E/A22E - Lenovo (previously IBM) - - - - - thinkpad60 -- <_description>IBM ThinkPad R60/T60/R61/T61 -+ IBM ThinkPad R60/T60/R61/T61 - Lenovo (previously IBM) - - - - - thinkpadz60 -- <_description>IBM ThinkPad Z60m/Z60t/Z61m/Z61t -+ IBM ThinkPad Z60m/Z60t/Z61m/Z61t - Lenovo (previously IBM) - - - - - ibm_spacesaver -- <_description>IBM Space Saver -+ IBM Space Saver - Lenovo (previously IBM) - - - - - logiaccess -- <_description>Logitech Access Keyboard -+ Logitech Access Keyboard - Logitech - - - - - logiclx300 -- <_description>Logitech Cordless Desktop LX-300 -+ Logitech Cordless Desktop LX-300 - Logitech - - - - - logii350 -- <_description>Logitech Internet 350 Keyboard -+ Logitech Internet 350 Keyboard - Logitech - 046d:c313 - -@@ -633,665 +633,665 @@ - - - logimel -- <_description>Logitech Media Elite Keyboard -+ Logitech Media Elite Keyboard - Logitech - - - - - logicd -- <_description>Logitech Cordless Desktop -+ Logitech Cordless Desktop - Logitech - - - - - logicd_it -- <_description>Logitech Cordless Desktop iTouch -+ Logitech Cordless Desktop iTouch - Logitech - - - - - logicd_nav -- <_description>Logitech Cordless Desktop Navigator -+ Logitech Cordless Desktop Navigator - Logitech - - - - - logicd_opt -- <_description>Logitech Cordless Desktop Optical -+ Logitech Cordless Desktop Optical - Logitech - - - - - logicda -- <_description>Logitech Cordless Desktop (alternate option) -+ Logitech Cordless Desktop (alternate option) - Logitech - - - - - logicdpa2 -- <_description>Logitech Cordless Desktop Pro (alternate option 2) -+ Logitech Cordless Desktop Pro (alternate option 2) - Logitech - - - - - logicfn -- <_description>Logitech Cordless Freedom/Desktop Navigator -+ Logitech Cordless Freedom/Desktop Navigator - Logitech - - - - - logicdn -- <_description>Logitech Cordless Desktop Navigator -+ Logitech Cordless Desktop Navigator - Logitech - - - - - logiitc -- <_description>Logitech iTouch Cordless Keyboard (model Y-RB6) -+ Logitech iTouch Cordless Keyboard (model Y-RB6) - Logitech - - - - - logiik -- <_description>Logitech Internet Keyboard -+ Logitech Internet Keyboard - Logitech - - - - - itouch -- <_description>Logitech iTouch -+ Logitech iTouch - Logitech - - - - - logicink -- <_description>Logitech Internet Navigator Keyboard -+ Logitech Internet Navigator Keyboard - Logitech - - - - - logiex110 -- <_description>Logitech Cordless Desktop EX110 -+ Logitech Cordless Desktop EX110 - Logitech - - - - - logiinkse -- <_description>Logitech iTouch Internet Navigator Keyboard SE -+ Logitech iTouch Internet Navigator Keyboard SE - Logitech - - - - - logiinkseusb -- <_description>Logitech iTouch Internet Navigator Keyboard SE (USB) -+ Logitech iTouch Internet Navigator Keyboard SE (USB) - Logitech - - - - - logiultrax -- <_description>Logitech Ultra-X Keyboard -+ Logitech Ultra-X Keyboard - Logitech - - - - - logiultraxc -- <_description>Logitech Ultra-X Cordless Media Desktop Keyboard -+ Logitech Ultra-X Cordless Media Desktop Keyboard - Logitech - - - - - logidinovo -- <_description>Logitech diNovo Keyboard -+ Logitech diNovo Keyboard - Logitech - -