diff -pruN 2.5-1/debian/changelog 2.5-1ubuntu1/debian/changelog --- 2.5-1/debian/changelog 2012-01-24 00:19:21.000000000 +0000 +++ 2.5-1ubuntu1/debian/changelog 2012-01-24 00:19:22.000000000 +0000 @@ -1,3 +1,20 @@ +xkeyboard-config (2.5-1ubuntu1) precise; urgency=low + + * Merge from Debian experimental. Remaining Ubuntu changes: + + rules, xkb-data-i18n.install, xkb-data.install: Split out + xkb-data-i18n to be used by console-setup. + + 105_intelligent_keyboard.patch: Add support for the Intelligent + Keyboard K04 + + 108_fix_intltool_make_check.diff: Fix make check in the presence + of the quilt patch system. + + xkb-data.postinst.in: Migrate console-setup/keyboard-configuration + settings from dvorak-intl to dvorak-alt-intl to match rename in + xkeyboard-config 1.9. (LP: 742683) + * xkb-data.install: Add missing directories (man, pkgconfig). + * xkb-data.postinst: Remove the xkb cache to make sure it gets regenerated. + + -- Timo Aaltonen Tue, 24 Jan 2012 00:35:43 +0200 + xkeyboard-config (2.5-1) unstable; urgency=low * New upstream release, including: @@ -21,6 +38,39 @@ xkeyboard-config (2.3-2) unstable; urgen -- Cyril Brulebois Wed, 21 Dec 2011 10:52:00 +0100 +xkeyboard-config (2.3-1ubuntu3) precise; urgency=low + + * debian/patches/101_disable_ungrab_keys_by_default.diff: + - Cherry pick from upstream. Don't bind the ClearGrab/CloseGrab keys by + default - these allow bypassing of screensavers' screenlocks. + + -- Christopher James Halse Rogers Fri, 20 Jan 2012 12:57:14 +1100 + +xkeyboard-config (2.3-1ubuntu2) oneiric; urgency=low + + * rules: Bring back the pot file build, very much needed still. + This time move the original file away during build, and restore + on clean. (LP: #868554) + + -- Timo Aaltonen Wed, 05 Oct 2011 23:34:45 +0300 + +xkeyboard-config (2.3-1ubuntu1) oneiric; urgency=low + + * Merge from Debian experimental. Remaining Ubuntu changes: + + xkb-data-i18n.install, xkb-data.install, rules: Split out + xkb-data-i18n to be used by console-setup. + + 105_intelligent_keyboard.patch: Add support for the Intelligent + Keyboard K04 + + 108_fix_intltool_make_check.diff: Fix make check in the presence + of the quilt patch system. + + xkb-data.postinst.in: Migrate console-setup/keyboard-configuration + settings from dvorak-intl to dvorak-alt-intl to match rename in + xkeyboard-config 1.9. (LP: 742683) + * No need to build the pot file anymore, upstream version is used. + * Fix dh_autoreconf override in rules (FTBFS). + + -- Timo Aaltonen Thu, 11 Aug 2011 22:01:46 +0300 + xkeyboard-config (2.3-1) experimental; urgency=low * New upstream release: @@ -31,6 +81,26 @@ xkeyboard-config (2.3-1) experimental; u -- Cyril Brulebois Sat, 04 Jun 2011 00:35:16 +0200 +xkeyboard-config (2.2.1-1ubuntu1) oneiric; urgency=low + + * Merge from Debian experimental. Remaining Ubuntu changes: + + xkb-data-i18n.install, xkb-data.install, rules: Split out + xkb-data-i18n to be used by console-setup. + + rules: Generate pot file for translations during build + + 105_intelligent_keyboard.patch: Add support for the Intelligent + Keyboard K04 + * debian/patches/108_taiwan.patch: + * debian/patches/104_macbook_expose_and_dashboard.patch: + * debian/patches/107_lao.patch: + - Drop, included upstream + * debian/xkb-data.postinst.in: + - Migrate console-setup/keyboard-configuration settings from dvorak-intl + to dvorak-alt-intl to match rename in xkeyboard-config 1.9. (LP: #742683) + * debian/patches/108_fix_intltool_make_check.diff: + - Fix make check in the presence of the quilt patch system. + + -- Christopher James Halse Rogers Tue, 24 May 2011 12:13:34 +1000 + xkeyboard-config (2.2.1-1) experimental; urgency=low * New upstream release: @@ -62,6 +132,68 @@ xkeyboard-config (2.1-2) unstable; urgen -- Cyril Brulebois Wed, 06 Apr 2011 01:01:12 +0200 +xkeyboard-config (2.1-1ubuntu3) natty; urgency=low + + * Fix broken HTC Dream stanza. + + -- Evan Dandrea Tue, 08 Feb 2011 12:22:12 +0000 + +xkeyboard-config (2.1-1ubuntu2) natty; urgency=low + + * Refresh patches 104, 105, 108 to apply + + -- Bryce Harrington Thu, 03 Feb 2011 15:57:08 -0800 + +xkeyboard-config (2.1-1ubuntu1) natty; urgency=low + + * Merge from debian of 2.1 release. + - Fixes Ubuntu bugs: + + Sindhi keyboard layout (locale: sd_PK, sd_IN) (LP: #588918) + + Fix conflict between Mali and Malayalam layouts (LP: #575660) + + Support for Philippines "National Keyboard Layout" (LP: #672881) + + Support for Kinesis keyboard geometry (LP: #393887) + + Support for Apple Aluminium keyboards (LP: #696232) + + Support for abnt2 keyboard, thinkpad variant for Lenovo 3000 v100 + laptops (LP: #359719) + + Fix CapsLock misspelling (LP: #592448) + - Remaining Ubuntu changes: + + xkb-data-i18n.install, xkb-data.install, rules: Split out + xkb-data-i18n to be used by console-setup. + + rules: Generate pot file for translations during build + + 104_macbook_expose_and_dashboard.patch: Add keycode definitions + required for Apples Expose & Dashboard keys (F3/F4). + + 105_intelligent_keyboard.patch: Add support for the Intelligent + Keyboard K04 + + 107_lao.patch: New keyboard layout for Lao, implemented as + an alternative to the default one. + + 108_taiwan.patch: New keyboard layouts for Taiwan. + * Drop 102_mac_aliases.patch: This appears to have some side effects, + and the patch was not taken by upstream because it was an incomplete + fix. Reopens bug 327963 + * Drop patches included in the new upstream release: + - 106_fixspell3d.patch: upstream + - 109_mali.patch: upstream + - 110_variants-cleanup.patch + - 111_il-missing-symbol.patch + - 112_zero-with-spacing.patch + - 113_cz-dvorak-ucw.patch + - 114_ejn_4_level.patch + - 115_aluminium_geometries.patch + - 116_aluminium_keycodes.patch + - 117_aluminium_symbols.patch + - 118_aluminium_aliases.patch + - 119_aluminium_pc_compat.patch + - 120_aluminium_rules.patch + - 121_tamil_chars.patch + - 122_olpc-azerty.patch + - 123_fix_i18n.patch + - 124_serbian_ru_level3.patch + - 125_mapping_tools_launch5_menukb.patch + - 126_swahili_arabic.patch + - 127_restore_gb_colemak.patch + + -- Bryce Harrington Tue, 01 Feb 2011 11:57:39 -0800 + xkeyboard-config (2.1-1) experimental; urgency=low * New upstream release: @@ -104,6 +236,105 @@ xkeyboard-config (1.8-2) unstable; urgen -- Cyril Brulebois Tue, 23 Nov 2010 21:48:24 +0100 +xkeyboard-config (1.8-1ubuntu8) lucid; urgency=low + + * rules: Make pot file as part of build process. + (LP: #562872) + * Renumber patch 130 to 128 so is consecutive + + -- Bryce Harrington Wed, 14 Apr 2010 16:20:56 -0700 + +xkeyboard-config (1.8-1ubuntu7) lucid; urgency=low + + * add debian/patches/130_fix_oss_ctrl_space_accelerator.patch: + - don't include level4nl but only level4n for french oss layout. + both space and Ctrl + space returned the same XLookupString, which + prevents space using in some application using + gtk_action_group_add_toggle_actions to setup Ctrl + space accelerator. + We lose rctrl accelator but that's better than not having space in + those applications. Setup it manually will reintroduce + https://bugs.launchpad.net/bugs/198759 + (LP: #221112) + + -- Didier Roche Wed, 14 Apr 2010 18:15:30 +0200 + +xkeyboard-config (1.8-1ubuntu6) lucid; urgency=low + + * Removed unwanted semicolons in 112_zero-with-spacing.patch + to quell error messages when using certain keyboard layouts. + (LP: #553401) + + -- Bryce Harrington Tue, 13 Apr 2010 13:36:32 -0700 + +xkeyboard-config (1.8-1ubuntu5) lucid; urgency=low + + * Add 127_restore_gb_colemak.patch: Fixes bottom row offset on the + Colemak UK keyboard. Cherrypick from upstream to revert an earlier + patch. Thanks for chasing the patch down, Ben. + (LP: #542237) + + -- Bryce Harrington Tue, 13 Apr 2010 13:14:35 -0700 + +xkeyboard-config (1.8-1ubuntu4) lucid; urgency=low + + * Add tw to Makefile so it will install + * Earlier upload fixed win key as 3rd level chooser (LP: #408397) + + -- Bryce Harrington Mon, 29 Mar 2010 20:49:47 -0700 + +xkeyboard-config (1.8-1ubuntu3) lucid; urgency=low + + * Cherrypicks from upstream to enable support for Apple Aluminum + keyboards: + + 115_aluminium_geometries.patch + + 116_aluminium_keycodes.patch + + 117_aluminium_symbols.patch + + 118_aluminium_aliases.patch + + 119_aluminium_pc_compat.patch + + 120_aluminium_rules.patch + * Cherrypicks from upstream to fix keys on various layouts: + + 107_lao.patch + + 108_taiwan.patch + + 109_mali.patch + + 110_variants-cleanup.patch + + 111_il-missing-symbol.patch + + 112_zero-with-spacing.patch + + 113_cz-dvorak-ucw.patch + + 114_ejn_4_level.patch + + 121_tamil_chars.patch + + 122_olpc-azerty.patch + + 123_fix_i18n.patch + + 124_serbian_ru_level3.patch + + 125_mapping_tools_launch5_menukb.patch + + 126_swahili_arabic.patch + + -- Bryce Harrington Mon, 29 Mar 2010 20:31:26 -0700 + +xkeyboard-config (1.8-1ubuntu2) lucid; urgency=low + + [Arne Goetje] + * Add 108_taiwan.patch: New keyboard layouts for Taiwan. + * Add 107_lao.patch: New keyboard layout for Lao, implemented as + an alternative to the default one. (LP: #341741) + + -- Bryce Harrington Mon, 29 Mar 2010 19:11:44 -0700 + +xkeyboard-config (1.8-1ubuntu1) lucid; urgency=low + + * Merge from debian testing. Remaining changes: + - Split out xkb-data-i18n to be used by console-setup. + - debian/xkeyboard-config.pot: Add pot file for translations (updated) + - Add 102_mac_aliases.patch: Fix error activating XKB config on MacBook + due to lack of mac w/ deadkeys layout aliases. + - Add 104_macbook_expose_and_dashboard.patch: Add keycode definitions + required for Apples Expose & Dashboard keys (F3/F4). + - Add 105_intelligent_keyboard.patch: Add support for the Intelligent + Keyboard K04 + - Add 106_fixspell3d.patch: Fix spelling error from 3d to 3rd + * Drop 101_rus.patch and 103_swiss_legacy.patch: Included upstream now + + -- Bryce Harrington Mon, 29 Mar 2010 16:42:48 -0700 + xkeyboard-config (1.8-1) unstable; urgency=low [ Julien Cristau ] @@ -119,6 +350,33 @@ xkeyboard-config (1.8-1) unstable; urgen -- Cyril Brulebois Mon, 15 Mar 2010 14:24:43 +0100 +xkeyboard-config (1.7-2ubuntu2) lucid; urgency=low + + * Correct spelling error from 3d to 3rd (LP: #398873) + + -- Nigel Babu Tue, 16 Feb 2010 10:07:01 +0530 + +xkeyboard-config (1.7-2ubuntu1) lucid; urgency=low + + * Merge from debian testing. Remaining changes: + - Split out xkb-data-i18n to be used by console-setup. + - debian/xkeyboard-config.pot: Add pot file for translations (updated) + - Add 101_rus.patch: Tag USA Russian Phonetic keyboard layout with + Russian language tag. + - Add 102_mac_aliases.patch: Fix error activating XKB config on MacBook + due to lack of mac w/ deadkeys layout aliases. + - Add 103_swiss_legacy.patch: Newer swiss keyboards have swapped bar and + brokenbar as a workaround to a Microsoft mistake in the Windows + keyboard layout. + * Add 104_macbook_expose_and_dashboard.patch: Add keycode definitions + required for Apples Expose & Dashboard keys (F3/F4). + (LP: #520519) + * Add 105_intelligent_keyboard.patch: Add support for the Intelligent + Keyboard K04 + (LP: #458206) + + -- Bryce Harrington Thu, 11 Feb 2010 13:11:49 -0800 + xkeyboard-config (1.7-2) unstable; urgency=low * Apparently some people have /etc/X11/xkb as a symlink, which makes rmdir @@ -127,6 +385,36 @@ xkeyboard-config (1.7-2) unstable; urgen -- Julien Cristau Sat, 16 Jan 2010 20:39:49 +0000 +xkeyboard-config (1.7-1ubuntu3) lucid; urgency=low + + * No-change rebuild to stop translation stripping. + + -- Evan Dandrea Mon, 11 Jan 2010 17:48:19 +0000 + +xkeyboard-config (1.7-1ubuntu2) lucid; urgency=low + + * Split out xkb-data-i18n to be used by console-setup. + + -- Evan Dandrea Tue, 05 Jan 2010 17:45:50 +0000 + +xkeyboard-config (1.7-1ubuntu1) lucid; urgency=low + + * Merge from Debian testing, remaining changes: + - debian/xkeyboard-config.pot: Add pot file for translations (updated) + - Add 101_rus.patch: Tag USA Russian Phonetic keyboard layout with + Russian language tag. + - Add 102_mac_aliases.patch: Fix error activating XKB config on MacBook + due to lack of mac w/ deadkeys layout aliases. + - Add 103_swiss_legacy.patch: Newer swiss keyboards have swapped bar and + brokenbar as a workaround to a Microsoft mistake in the Windows + keyboard layout. + * Dropped changes, superseded upstream: + - Add 100_abnt2-mapping-of-dot-key.patch, to fix ABNT2 numpad keyboards + to print period/dot instead of comma. Cherrypick from upstream. + - README.Debian: Don't advertise hacking on base.xml + + -- Steve Langasek Wed, 23 Dec 2009 00:14:57 -0800 + xkeyboard-config (1.7-1) unstable; urgency=low [ David Nusinow ] @@ -148,6 +436,51 @@ xkeyboard-config (1.7-1) unstable; urgen -- Julien Cristau Sun, 29 Nov 2009 11:47:09 +0100 +xkeyboard-config (1.6-1ubuntu5) karmic; urgency=low + + * Fix 103_swiss_legacy.patch to not patch the Changelog, so that it applies + cleanly. + + -- Steve Langasek Thu, 15 Oct 2009 09:24:53 +0000 + +xkeyboard-config (1.6-1ubuntu4) karmic; urgency=low + + * Add 103_swiss_legacy.patch: Newer swiss keyboards have swapped bar and + brokenbar as a workaround to a Microsoft mistake in the Windows + keyboard layout. + (LP: #222430) + + -- Bryce Harrington Tue, 13 Oct 2009 11:06:15 -0700 + +xkeyboard-config (1.6-1ubuntu3) karmic; urgency=low + + * Add 101_rus.patch: Tag USA Russian Phonetic keyboard layout with + Russian language tag. + (LP: #429034) + * Add 102_mac_aliases.patch: Fix error activating XKB config on MacBook + due to lack of mac w/ deadkeys layout aliases. + (LP: #327963) + + -- Bryce Harrington Mon, 12 Oct 2009 15:27:33 -0700 + +xkeyboard-config (1.6-1ubuntu2) karmic; urgency=low + + * Add 100_abnt2-mapping-of-dot-key.patch, to fix ABNT2 numpad keyboards to + print period/dot instead of comma. Cherrypick from upstream. + (LP: #272606) + + -- Bryce Harrington Thu, 20 Aug 2009 10:42:47 -0700 + +xkeyboard-config (1.6-1ubuntu1) karmic; urgency=low + + * Merge from debian unstable (LP: #386445), remaining changes: + - debian/xkeyboard-config.pot: Add pot file for translations (updated) + - README.Debian: Don't advertise hacking on base.xml + * All Ubuntu patches dropped, applied in source. Except for one small + part of 110_fi_brokenbar.patch which upstream rejected. + + -- Michael Terry Fri, 12 Jun 2009 13:51:29 -0400 + xkeyboard-config (1.6-1) unstable; urgency=low * Add Breaks on old libx11-6. It seems some people are keeping very, very @@ -162,6 +495,102 @@ xkeyboard-config (1.6-1) unstable; urgen -- Julien Cristau Sat, 30 May 2009 16:39:19 +0200 +xkeyboard-config (1.5-2ubuntu11) jaunty; urgency=low + + * debian/xkeyboard-config.pot: Add pot file for translations + (LP: #349341) + + -- Bryce Harrington Mon, 30 Mar 2009 21:32:36 -0700 + +xkeyboard-config (1.5-2ubuntu10) jaunty; urgency=low + + * README.Debian: Don't advertise customization of keyboard layouts by + hacking on base.xml, since that file gets overwritten on upgrade, and + since upstream does not consider this an end-user customizable thing. + (LP: #297428) + + -- Bryce Harrington Thu, 19 Mar 2009 12:12:34 -0700 + +xkeyboard-config (1.5-2ubuntu9) jaunty; urgency=low + + * Update 109_de_low_quotemarks.patch, + 111_si_rm_unnecessary_diagraph_layouts.patch, and + 113_kg_fix_kyrgyz_layouts.patch to apply (FTBS). + + -- Bryce Harrington Thu, 19 Mar 2009 00:34:40 -0700 + +xkeyboard-config (1.5-2ubuntu8) jaunty; urgency=low + + * Update 106_ru_fix_shift.patch: Remove extraneous parts to only + change the minus/underscore issue. Upstream. + (LP: #309844) + * Add 109_de_low_quotemarks.patch: Add keys for typing low quotation + marks. Upstream. + (LP: #59572) + * Add 110_fi_brokenbar.patch: Add keys for bar and broken bar symbols in + the finnish keymap. Upstream. + (LP: #181595) + * Add 111_si_rm_unnecessary_diagraph_layouts.patch + and 112_si_rm_unnecessary_diagraph_layouts_basexmlin.patch: + Remove unnecessary diagraph layouts. Upstream. + (LP: #162462) + * Add 113_kg_fix_kyrgyz_layouts.patch: Update to official Kyrgyz + Republic layouts. Upstream. + (LP: #198655) + + -- Bryce Harrington Wed, 18 Mar 2009 22:02:42 -0700 + +xkeyboard-config (1.5-2ubuntu7) jaunty; urgency=low + + * 108_bg_standards_update.patch: Update base.xml.in as well. + + -- Bryce Harrington Tue, 24 Feb 2009 15:03:51 -0800 + +xkeyboard-config (1.5-2ubuntu6) jaunty; urgency=low + + * Add 108_bg_standards_update.patch: New phonetic layout for Bulgarian. + (LP: #197414) + + -- Bryce Harrington Tue, 24 Feb 2009 14:51:25 -0800 + +xkeyboard-config (1.5-2ubuntu5) jaunty; urgency=low + + * Add 107_crh_layouts.patch: Add Crimean Tatar layouts for several + countries. (LP: #323041) + + -- Bryce Harrington Mon, 23 Feb 2009 18:36:29 -0800 + +xkeyboard-config (1.5-2ubuntu4) jaunty; urgency=low + + * Add 106_ru_fix_shift.patch: Shift doesn't work on Russian letters, and + -/_ is missing from Phonetic layout. + (LP: #309844) + + -- Bryce Harrington Thu, 12 Feb 2009 21:36:22 -0800 + +xkeyboard-config (1.5-2ubuntu3) jaunty; urgency=low + + * Add 105_lt_kpdl_and_balticplus.patch: KPDL should produce , not . on + lt keyboard. Also add balticplus symbols. + (LP: #307670) + + -- Bryce Harrington Thu, 12 Feb 2009 21:20:31 -0800 + +xkeyboard-config (1.5-2ubuntu2) jaunty; urgency=low + + * Add 104_hin_wx.patch: Cherrypick patch from upstream. + (LP: #274024) + + -- Bryce Harrington Thu, 12 Feb 2009 19:43:58 -0800 + +xkeyboard-config (1.5-2ubuntu1) jaunty; urgency=low + + * Merge with Debian. Remaining Ubuntu changes: + + 003_missing_inet_keys.diff: Add missing KeySyms to enable missing + XF86Battery, XF86Bluetooth, and XF86WLAN hotkeys. (LP: 281134) + + -- Bryce Harrington Wed, 11 Feb 2009 18:02:07 -0800 + xkeyboard-config (1.5-2) unstable; urgency=low * Cherry-picked from upstream git: @@ -192,6 +621,30 @@ xkeyboard-config (1.5-1) unstable; urgen -- Julien Cristau Wed, 28 Jan 2009 06:40:24 +0100 +xkeyboard-config (1.4-1ubuntu3) jaunty; urgency=low + + * Add 101_be_ad09.patch: Adds missing character on belgian keyboard + (LP: #213346) + + -- Bryce Harrington Mon, 26 Jan 2009 15:01:54 -0800 + +xkeyboard-config (1.4-1ubuntu2) jaunty; urgency=low + + * README.Debian: Correct documentation about location for keyboard + customizations + (LP: #297428) + + -- Bryce Harrington Mon, 26 Jan 2009 14:48:05 -0800 + +xkeyboard-config (1.4-1ubuntu1) jaunty; urgency=low + + * Merge from Debian experimental, remaining changes: + - 100_abnt2_jp106.diff: Fix ABNT2 keys. Patch modified to apply. + - send-upstream/003_missing_inet_keys.diff: Add missing KeySyms to + enable missing XF86Battery hotkey. (LP: 281134) + + -- Timo Aaltonen Thu, 22 Jan 2009 18:33:01 +0200 + xkeyboard-config (1.4-1) unstable; urgency=low * New upstream release. @@ -204,6 +657,73 @@ xkeyboard-config (1.4-1) unstable; urgen -- Julien Cristau Wed, 12 Nov 2008 19:45:45 +0100 +xkeyboard-config (1.3-2ubuntu5) jaunty; urgency=low + + * 003_missing_inet_keys.diff: Add missing KeySyms to enable + missing XF86Battery hotkey. (LP: #281134) + + -- Mario Limonciello Tue, 02 Dec 2008 14:47:56 -0600 + +xkeyboard-config (1.3-2ubuntu4.3) jaunty; urgency=low + + * No-change upload to jaunty to cause xkb-data to exist again on armel. + + -- Colin Watson Wed, 26 Nov 2008 23:54:16 +0000 + +xkeyboard-config (1.3-2ubuntu4.2) intrepid-proposed; urgency=low + + * 100_abnt2_jp106.diff: The previous fix was wrong. ABNT2 has KPPT + which should produce keycode 129. Thanks Leonardo Couto! + (LP: #272606) + + -- Timo Aaltonen Tue, 18 Nov 2008 07:17:59 +0200 + +xkeyboard-config (1.3-2ubuntu4.1) intrepid-proposed; urgency=low + + * 100_abnt2_jp106.diff: Fix keycode 129 to produce a dot instead of + a comma. (LP: #272606) + * Remove patches/ directory which should not be included in the diff. + + -- Timo Aaltonen Wed, 12 Nov 2008 11:46:03 +0200 + +xkeyboard-config (1.3-2ubuntu4) intrepid; urgency=low + + * Update 100_abnt2_jp106.diff, s/AB11/I211/ from symbols/inet. + + -- Timo Aaltonen Wed, 17 Sep 2008 12:27:15 +0300 + +xkeyboard-config (1.3-2ubuntu3) intrepid; urgency=low + + * 100_abnt2_jp106.diff: Fix keycodes/evdev to better support ABNT2 and + JP106. (LP: #255372, #258595) + + -- Timo Aaltonen Tue, 16 Sep 2008 16:47:08 +0300 + +xkeyboard-config (1.3-2ubuntu2) intrepid; urgency=low + + * control: Add libglib2.0-dev, intltool to build-deps (FTBFS). + * rules: remove an extra "rm -f". + + -- Timo Aaltonen Tue, 09 Sep 2008 20:03:54 +0300 + +xkeyboard-config (1.3-2ubuntu1) intrepid; urgency=low + + * Pull from upstream/master, last commit 667a880a4f656fe3. + - needed for "implement special ruleset for evdev driver" + * Drop us-mac.diff, fixed-compat-rules-for-Romania-b.fd.o-16872.patch, + applied upstream. + * Modify send-upstream/001_keypad_comma.diff to apply. + * debian/rules: + - Modified to act more like the other pkg-xorg packages. + - Run autoreconf on configure. + - Clean po/*.gmo. + - Since building in a separate directory doesn't work without + violence, clean Makefile's too to make the diff smaller. + * debian/control: Build-depend on automake, libtool, xutils-dev. + * Drop clean.diff, not needed anymore. + + -- Timo Aaltonen Tue, 09 Sep 2008 19:29:10 +0300 + xkeyboard-config (1.3-2) unstable; urgency=high * Fix compat rules for Romanian layout (closes: #485702). @@ -211,6 +731,26 @@ xkeyboard-config (1.3-2) unstable; urgen -- Julien Cristau Thu, 14 Aug 2008 19:51:55 +0200 +xkeyboard-config (1.3-1ubuntu2) intrepid; urgency=low + + [ Daniel Gimpelevich ] + * debian/patches/us-mac.diff: + + Fix for the USA - Macintosh layout. (Closes: #246834) + + -- Артём Попов Wed, 09 Jul 2008 14:25:18 +0700 + +xkeyboard-config (1.3-1ubuntu1) intrepid; urgency=low + + [ Артём Попов ] + * debian/rules: make update-po in the build target (LP: #213192) + + [ Loic Minier ] + * Rebase above change on top of 1.3-1 and target intrepid. + * Use "$(MAKE) -C po update-po" instead of "(cd po; make update-po; cd ..)". + * Update upload date. + + -- Артём Попов Tue, 17 Jun 2008 23:40:34 +0200 + xkeyboard-config (1.3-1) unstable; urgency=low * New upstream release: diff -pruN 2.5-1/debian/control 2.5-1ubuntu1/debian/control --- 2.5-1/debian/control 2012-01-24 00:19:21.000000000 +0000 +++ 2.5-1ubuntu1/debian/control 2012-01-24 00:19:22.000000000 +0000 @@ -1,7 +1,8 @@ Source: xkeyboard-config Section: x11 Priority: extra -Maintainer: Debian X Strike Force +Maintainer: Ubuntu X-SWAT +XSBC-Original-Maintainer: Debian X Strike Force Uploaders: Cyril Brulebois Build-Depends: debhelper (>= 8), @@ -33,6 +34,12 @@ Description: X Keyboard Extension (XKB) xkeyboard-config project has been launched at FreeDesktop in order to provide a central repository that could be used by all vendors. +Package: xkb-data-i18n +Architecture: all +Description: X Keyboard Extension (XKB) configuration data translations + This package contains translations used by xkb-data. Users should + not install this package. + Package: xkb-data-udeb XC-Package-Type: udeb Section: debian-installer diff -pruN 2.5-1/debian/patches/105_intelligent_keyboard.patch 2.5-1ubuntu1/debian/patches/105_intelligent_keyboard.patch --- 2.5-1/debian/patches/105_intelligent_keyboard.patch 1970-01-01 00:00:00.000000000 +0000 +++ 2.5-1ubuntu1/debian/patches/105_intelligent_keyboard.patch 2012-01-24 00:19:22.000000000 +0000 @@ -0,0 +1,68 @@ +diff --git a/rules/base.lists.part b/rules/base.lists.part +index 50d1980..d92c1a9 100644 +--- a/rules/base.lists.part ++++ b/rules/base.lists.part +@@ -71,7 +71,8 @@ + sk1300 sk2500 sk6200 sk7100 \ + sven sven303 symplon \ + toshiba_s3000 trust trustda \ +- unitekkb1925 yahoo ++ unitekkb1925 yahoo \ ++ intelligent_keyboard_k04 + + // all layouts with 3rd and 4th groups + ! $threelevellayouts = al az \ +diff --git a/rules/base.xml.in b/rules/base.xml.in +index 15581b7..350947c 100644 +--- a/rules/base.xml.in ++++ b/rules/base.xml.in +@@ -1226,6 +1226,13 @@ + + + ++ intelligent_keyboard_k04 ++ Intelligent Keyboard K04 ++ Generic ++ ++ ++ ++ + htcdream + <_description>Htc Dream phone + htc +diff --git a/symbols/inet b/symbols/inet +index 5d83ebf..f3fc8fa 100644 +--- a/symbols/inet ++++ b/symbols/inet +@@ -1828,6 +1828,31 @@ xkb_symbols "pc105" { + include "inet(media_nav_acpi_common)" + }; + ++//Intelligent Keyboard K04 ++partial alphanumeric_keys ++xkb_symbols "intelligent_keyboard_k04" { ++ key { [ XF86AudioPlay, XF86AudioPause ] }; ++ key { [ XF86AudioPrev ] }; ++ key { [ XF86AudioStop ] }; ++ key { [ XF86AudioNext ] }; ++ key { [ XF86AudioMedia ] }; ++ key { [ XF86AudioRaiseVolume ] }; ++ key { [ XF86AudioMute ] }; ++ key { [ XF86AudioLowerVolume ] }; ++ key { [ XF86Back ] }; ++ key { [ XF86Forward ] }; ++ key { [ XF86Stop ] }; ++ key { [ XF86Refresh ] }; ++ key { [ XF86Search ] }; ++ key { [ XF86Favorites ] }; ++ key { [ XF86HomePage ] }; ++ key { [ XF86Mail ] }; ++ key { [ XF86WakeUp ] }; ++ key { [ XF86MyComputer ] }; ++ key { [ XF86Calculator ] }; ++ key { [ XF86Sleep ] }; ++}; ++ + // HTC Dream + partial alphanumeric_keys + xkb_symbols "htcdream" { diff -pruN 2.5-1/debian/patches/108_fix_intltool_make_check.diff 2.5-1ubuntu1/debian/patches/108_fix_intltool_make_check.diff --- 2.5-1/debian/patches/108_fix_intltool_make_check.diff 1970-01-01 00:00:00.000000000 +0000 +++ 2.5-1ubuntu1/debian/patches/108_fix_intltool_make_check.diff 2012-01-24 00:19:22.000000000 +0000 @@ -0,0 +1,19 @@ +Author: Christopher Halse Rogers +Description: Make ‘make check’ pass in the presence of patches. + +make check in po/ will check for files with translatable strings that are not +listed in POTFILES.in, which is broadly useful to ensure any patches that we +add are translatable. + +However, it picks up quilt's temporary files in .pc, which obviously aren't +listed as translatable. Add this directory to POTFILES.skip so that +make check doesn't get grumpy. +Index: xkb-data/po/POTFILES.skip +=================================================================== +--- xkb-data.orig/po/POTFILES.skip 2011-05-24 13:03:26.986079531 +1000 ++++ xkb-data/po/POTFILES.skip 2011-05-24 13:03:38.846553179 +1000 +@@ -1,2 +1,3 @@ + rules/evdev.xml.in + rules/evdev.extras.xml.in ++.pc + diff -pruN 2.5-1/debian/patches/series 2.5-1ubuntu1/debian/patches/series --- 2.5-1/debian/patches/series 2012-01-24 00:19:21.000000000 +0000 +++ 2.5-1ubuntu1/debian/patches/series 2012-01-24 00:19:22.000000000 +0000 @@ -1,2 +1,4 @@ docs.diff revert-goodmap-badmap-for-apple.diff +105_intelligent_keyboard.patch +108_fix_intltool_make_check.diff diff -pruN 2.5-1/debian/rules 2.5-1ubuntu1/debian/rules --- 2.5-1/debian/rules 2012-01-24 00:19:21.000000000 +0000 +++ 2.5-1ubuntu1/debian/rules 2012-01-24 00:19:22.000000000 +0000 @@ -5,18 +5,30 @@ xkb_base := /usr/share/X11/xkb override_dh_autoreconf: dh_autoreconf -- sh -c 'intltoolize -c -f && autoreconf -vfi' +override_dh_auto_clean: + dh_auto_clean + if [ -e $(CURDIR)/po/xkeyboard-config.pot-orig ]; then \ + mv $(CURDIR)/po/xkeyboard-config.pot-orig \ + $(CURDIR)/po/xkeyboard-config.pot; \ + fi + override_dh_auto_configure: dh_auto_configure -- \ --with-xkb-rules-symlink=xfree86,xorg \ --with-xkb-base=$(xkb_base) \ --disable-runtime-deps +override_dh_auto_build: + dh_auto_build + mv $(CURDIR)/po/xkeyboard-config.pot $(CURDIR)/po/xkeyboard-config.pot-orig + cd $(CURDIR)/po && intltool-update -p + override_dh_auto_install: # Regular deb: - $(MAKE) -C build install DESTDIR=$(CURDIR)/debian/xkb-data + $(MAKE) -C build install DESTDIR=$(CURDIR)/debian/tmp # Treat the udeb as an exact copy, but remove messages/pkg-config/man-pages: - cp -r $(CURDIR)/debian/xkb-data/* $(CURDIR)/debian/xkb-data-udeb + cp -r $(CURDIR)/debian/tmp/* $(CURDIR)/debian/xkb-data-udeb rm -rf $(CURDIR)/debian/xkb-data-udeb/usr/share/locale rm -rf $(CURDIR)/debian/xkb-data-udeb/usr/share/man rm -rf $(CURDIR)/debian/xkb-data-udeb/usr/share/pkgconfig diff -pruN 2.5-1/debian/xkb-data-i18n.install 2.5-1ubuntu1/debian/xkb-data-i18n.install --- 2.5-1/debian/xkb-data-i18n.install 1970-01-01 00:00:00.000000000 +0000 +++ 2.5-1ubuntu1/debian/xkb-data-i18n.install 2012-01-24 00:19:22.000000000 +0000 @@ -0,0 +1 @@ +usr/share/locale diff -pruN 2.5-1/debian/xkb-data.install 2.5-1ubuntu1/debian/xkb-data.install --- 2.5-1/debian/xkb-data.install 1970-01-01 00:00:00.000000000 +0000 +++ 2.5-1ubuntu1/debian/xkb-data.install 2012-01-24 00:19:22.000000000 +0000 @@ -0,0 +1,3 @@ +usr/share/man +usr/share/pkgconfig +usr/share/X11 diff -pruN 2.5-1/debian/xkb-data.postinst 2.5-1ubuntu1/debian/xkb-data.postinst --- 2.5-1/debian/xkb-data.postinst 1970-01-01 00:00:00.000000000 +0000 +++ 2.5-1ubuntu1/debian/xkb-data.postinst 2012-01-24 00:19:22.000000000 +0000 @@ -0,0 +1,45 @@ +#!/bin/sh + +set -e + +# Source debconf library. +. /usr/share/debconf/confmodule + +THIS_PACKAGE=xkb-data +THIS_SCRIPT=postinst + +# Remove the xkb cache to make sure it gets regenerated +if [ -d /var/lib/xkb/ ]; then + rm -f /var/lib/xkb/*.xkm 2>/dev/null +fi + +case $1 in + configure) + if dpkg --compare-versions "$2" lt-nl 1.9; then + # dvorak-intl was renamed to dvorak-alt-intl in 1.9 + # Transition users to the new layout name. + # + # We cannot guarantee that console-setup/keyboard-configuration's + # config script has either run or not run. Thus, we need to update + # both the configuration files and debconf. + for CONFIGFILE in /etc/default/keyboard /etc/default/console-setup ; do + if [ -f $CONFIGFILE ]; then + sed -i -e "s|^ *XKBVARIANT=.*dvorak-intl.*|XKBVARIANT=\"dvorak-alt-intl\"|" \ + $CONFIGFILE + fi + done + db_get keyboard_configuration/variantcode || true + if [ "$RET" = "dvorak-intl" ]; then + db_set keyboard-configuration/variantcode "dvorak-alt-intl" + fi + db_get console-setup/variantcode || true + if [ "$RET" = "dvorak-intl" ]; then + db_set console-setup/variantcode "dvorak-alt-intl" + fi + fi + ;; +esac + +#DEBHELPER# + +# vim:set ai et sw=2 ts=2 tw=80: diff -pruN 2.5-1/po/POTFILES 2.5-1ubuntu1/po/POTFILES --- 2.5-1/po/POTFILES 1970-01-01 00:00:00.000000000 +0000 +++ 2.5-1ubuntu1/po/POTFILES 2012-01-24 00:19:22.000000000 +0000 @@ -0,0 +1,2 @@ + ../rules/base.xml.in \ + ../rules/evdev.xml.in diff -pruN 2.5-1/rules/base.lst 2.5-1ubuntu1/rules/base.lst --- 2.5-1/rules/base.lst 1970-01-01 00:00:00.000000000 +0000 +++ 2.5-1ubuntu1/rules/base.lst 2012-01-24 00:19:22.000000000 +0000 @@ -0,0 +1,682 @@ +! 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 + btc6301urf BTC 6301URF + btc9000 BTC 9000 + btc9000a BTC 9000A + btc9001ah BTC 9001AH + btc5090 BTC 5090 + btc9019u BTC 9019U + cherryblue Cherry Blue Line CyBo@rd + cherryblueb Cherry CyMotion Master XPress + cherrybluea Cherry Blue Line CyBo@rd (alternate option) + cherrycyboard Cherry CyBo@rd USB-Hub + chicony Chicony Internet Keyboard + chicony0108 Chicony KU-0108 + 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 + dellsk8125 Dell SK-8125 + dellsk8135 Dell SK-8135 + dellusbmm Dell USB Multimedia Keyboard + 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 + fscaa1667g Fujitsu-Siemens Computers AMILO A1667G laptop + 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_base Logitech Generic Keyboard + 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 + hp5181 Hewlett-Packard Internet Keyboard 5181 + hp5185 Hewlett-Packard Internet Keyboard 5185 + hpnx9020 Hewlett-Packard nx9020 + 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 + thinkpad60 IBM ThinkPad R60/T60/R61/T61 + thinkpadz60 IBM ThinkPad Z60m/Z60t/Z61m/Z61t + ibm_spacesaver IBM Space Saver + logiaccess Logitech Access Keyboard + logiclx300 Logitech Cordless Desktop LX-300 + logii350 Logitech Internet 350 Keyboard + logimel Logitech Media Elite Keyboard + logicd Logitech Cordless Desktop + logicd_it Logitech Cordless Desktop iTouch + logicd_nav Logitech Cordless Desktop Navigator + logicd_opt Logitech Cordless Desktop Optical + 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 + logiultraxc Logitech Ultra-X Cordless Media Desktop Keyboard + logidinovo Logitech diNovo Keyboard + logidinovoedge Logitech diNovo Edge Keyboard + mx1998 Memorex MX1998 + mx2500 Memorex MX2500 EZ-Access Keyboard + mx2750 Memorex MX2750 + microsoft7000 Microsoft Natural Wireless Ergonomic Keyboard 7000 + 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 + vsonku306 ViewSonic KU-306 Internet Keyboard + microsoftprose Microsoft Internet Keyboard Pro, Swedish + microsoftoffice Microsoft Office Keyboard + microsoftmult Microsoft Wireless Multimedia Keyboard 1.0A + microsoftelite Microsoft Natural Keyboard Elite + 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 + benqx730 BenQ X-Touch 730 + benqx800 BenQ X-Touch 800 + hhk Happy Hacking Keyboard + classmate Classmate PC + olpc OLPC + sun6 Sun Type 5/6 + +! layout + us USA + 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 + me Montenegro + mk Macedonia + mt Malta + mn Mongolia + no Norway + pl Poland + pt Portugal + ro Romania + ru Russia + rs Serbia + 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 + chr us: Cherokee + 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-intl us: Dvorak international + dvorak-l us: Left handed Dvorak + dvorak-r us: Right handed Dvorak + dvorak-classic us: Classic Dvorak + dvp us: Programmer Dvorak + rus us: Russian phonetic + mac us: Macintosh + altgr-intl us: International (AltGr dead keys) + olpc2 us: Group toggle on multiply/divide key + ps af: Pashto + uz af: Southern Uzbek + olpc-ps af: OLPC Pashto + olpc-fa af: OLPC Dari + olpc-uz af: OLPC 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 + jhelum in: Gurmukhi Jhelum + kan in: Kannada + mal in: Malayalam + mal_lalitha in: Malayalam Lalitha + 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 + dvorak br: Dvorak + nativo br: Nativo + nativo-us br: Nativo for USA keyboards + nativo-epo br: Nativo for Esperanto + 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 + shs ca: Secwepemctsin + kut ca: Ktunaxa + 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 + dvorak dk: Dvorak + sundeadkeys nl: Sun dead keys + mac nl: Macintosh + std nl: Standard + nodeadkeys ee: Eliminate dead keys + dvorak ee: Dvorak + us ee: US keyboard with Estonian letters + 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 + classic fi: Classic + 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: Dvorak + mac fr: Macintosh + geo fr: Georgian AZERTY Tskapo + generic gh: Multilingual + akan gh: Akan + ewe gh: Ewe + fula gh: Fula + ga gh: Ga + hausa gh: Hausa + 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 + dvorak is: Dvorak + 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) + lekp lt: LEKP + lekpa lt: LEKPa + balticplus lt: Baltic+ + apostrophe lv: Apostrophe (') variant + tilde lv: Tilde (~) variant + fkey lv: F-letter (F) variant + cyrillic me: Cyrillic + cyrillicyz me: Cyrillic, Z and ZHE swapped + latinunicode me: Latin unicode + latinyz me: Latin qwerty + latinunicodeyz me: Latin unicode qwerty + cyrillicalternatequotes me: Cyrillic with guillemets + latinalternatequotes me: Latin with guillemets + 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 + ru_phonetic_dvorak pl: Russian phonetic Dvorak + 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 + nativo pt: Nativo + nativo-us pt: Nativo for USA keyboards + nativo-epo pt: Nativo for Esperanto + cedilla ro: Cedilla + std ro: Standard + std_cedilla ro: Standard (Cedilla) + winkeys ro: Winkeys + phonetic ru: Phonetic + typewriter ru: Typewriter + legacy ru: Legacy + tt ru: Tatar + os_legacy ru: Ossetian, legacy + os_winkeys ru: Ossetian, Winkeys + cv ru: Chuvash + cv_latin ru: Chuvash Latin + udm ru: Udmurt + kom ru: Komi + sah ru: Yakut + yz rs: Z and ZHE swapped + latin rs: Latin + latinunicode rs: Latin Unicode + latinyz rs: Latin qwerty + latinunicodeyz rs: Latin Unicode qwerty + alternatequotes rs: With guillemets + latinalternatequotes rs: 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 + ast es: Asturian variant with bottom-dot H and bottom-dot L + 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 + intl tr: International (with dead keys) + phonetic ua: Phonetic + typewriter ua: Typewriter + winkeys ua: Winkeys + unicode ua: Unicode + rstu ua: Standard RSTU + rstu_ru ua: Standard RSTU on Russian layout + homophonic ua: Homophonic + intl gb: International (with dead keys) + dvorak gb: Dvorak + dvorakukp gb: Dvorak (UK Punctuation) + mac gb: Macintosh + colemak gb: Colemak + latin uz: Latin + kr104 kr: 101/104 key Compatible + CloGaelach ie: CloGaelach + UnicodeExpert ie: UnicodeExpert + ogam ie: Ogham + ogam_is434 ie: Ogham IS434 + ara pk: Arabic + 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 + +! option + grp Layout switching + grp:switch R-Alt switches layout while pressed. + grp:lswitch Left Alt key switches layout while pressed. + grp:lwin_switch Left Win-key switches layout while pressed. + grp:rwin_switch Right Win-key switches layout while pressed. + grp:win_switch Both Win-keys switch layout while pressed. + grp:rctrl_switch Right Ctrl key switches layout while pressed. + grp:toggle Right Alt key changes layout. + grp:lalt_toggle Left Alt key changes layout. + grp:caps_toggle CapsLock key changes layout. + grp:shift_caps_toggle Shift+CapsLock changes layout. + grp:shift_caps_switch CapsLock switch to first layout, Shift+CapsLock switch to last layout. + grp:alt_caps_toggle Alt+CapsLock changes layout. + grp:shifts_toggle Both Shift keys together change layout. + grp:alts_toggle Both Alt keys together change layout. + grp:ctrls_toggle Both Ctrl keys together change layout. + grp:ctrl_shift_toggle Ctrl+Shift change layout. + grp:lctrl_lshift_toggle LCtrl+LShift change layout. + grp:ctrl_alt_toggle Alt+Ctrl change layout. + grp:alt_shift_toggle Alt+Shift change layout. + grp:menu_toggle Menu key changes layout. + grp:lwin_toggle Left Win-key changes layout. + grp:rwin_toggle Right Win-key changes layout. + grp:lshift_toggle Left Shift key changes layout. + grp:rshift_toggle Right Shift key changes layout. + grp:lctrl_toggle Left Ctrl key changes layout. + grp:rctrl_toggle Right Ctrl key changes layout. + grp:sclk_toggle ScrollLock key changes group. + lv3 Third level choosers + lv3:switch Press Right Ctrl to choose 3rd level. + lv3:menu_switch Press Menu key to choose 3rd level. + lv3:win_switch Press any of Win-keys to choose 3rd level. + lv3:lwin_switch Press Left Win-key to choose 3rd level. + lv3:rwin_switch Press Right Win-key to choose 3rd level. + lv3:alt_switch Press any of Alt keys to choose 3rd level. + lv3:lalt_switch Press Left Alt key to choose 3rd level. + lv3:ralt_switch Press Right Alt key to choose 3rd level. + lv3:ralt_switch_multikey Press Right Alt key to choose 3rd level, Shift+Right Alt key is Multi_Key. + lv3:ralt_alt Right Alt key never chooses 3rd level. + lv3:enter_switch Press Enter key on keypad to choose 3rd level. + ctrl Ctrl key position + ctrl:nocaps Make CapsLock an additional Ctrl. + ctrl:swapcaps Swap Ctrl and CapsLock. + ctrl:ctrl_ac Ctrl key at left of 'A' + ctrl:ctrl_aa Ctrl key at bottom left + ctrl:ctrl_ra Right Ctrl key works as Right Alt. + grp_led Use keyboard LED to show alternative layout. + grp_led:num NumLock LED shows alternative layout. + grp_led:caps CapsLock LED shows alternative layout. + grp_led:scroll ScrollLock LED shows alternative layout. + keypad Numeric keypad layout selection + keypad:legacy Legacy keypad + keypad:comma Force standard comma keypad + keypad:oss Keypad with unicode additions (arrows and math operators) + keypad:future Keypad with unicode additions (arrows and math operators). Math operators on default level. + keypad:legacy_wang Legacy Wang 724 keypad + keypad:oss_wang Wang 724 keypad with unicode additions (arrows and math operators) + keypad:future_wang Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level. + keypad:phone_hex ATM/phone-style hexadecimal keypad + kpdl Numeric keypad delete key behaviour + kpdl:dot Legacy key with dot + kpdl:comma Legacy key with comma + kpdl:dotoss Four-level key with dot + kpdl:commaoss Four-level key with comma + kpdl:momayyezoss Four-level key with momayyez + kpdl:kposs Four-level key with abstract separators + caps CapsLock key behavior + caps:internal CapsLock uses internal capitalization. Shift "pauses" CapsLock. + caps:internal_nocancel CapsLock uses internal capitalization. Shift doesn't affect CapsLock. + caps:shift CapsLock acts as Shift with locking. Shift "pauses" CapsLock. + caps:shift_nocancel CapsLock acts as Shift with locking. Shift doesn't affect CapsLock. + caps:shift_lock CapsLock just locks the Shift modifier. + caps:capslock CapsLock toggles normal capitalization of alphabetic characters. + caps:swapescape Swap ESC and CapsLock. + caps:shiftlock CapsLock toggles Shift so all keys are affected. + altwin Alt/Win key behavior + altwin:menu Add the standard behavior to Menu key. + altwin:meta_alt Alt and Meta are on the Alt keys. + altwin:ctrl_win Control is mapped to the Win-keys (and the usual Ctrl keys). + altwin:meta_win Meta is mapped to the Win-keys. + altwin:left_meta_win Meta is mapped to the left Win-key. + altwin:super_win Super is mapped to the Win-keys. + altwin:hyper_win Hyper is mapped to the Win-keys. + altwin:alt_super_win Alt is mapped to the right Win-key and Super to Menu. + altwin:swap_lalt_lwin Left Alt is swapped with left Win-key. + Compose key Compose key position + compose:ralt Right Alt is Compose. + compose:lwin Left Win-key is Compose. + compose:rwin Right Win-key is Compose. + compose:menu Menu is Compose. + compose:rctrl Right Ctrl is Compose. + compose:caps Caps Lock is Compose. + compose:102 Less-than/Greater-than is Compose. + compat Miscellaneous compatibility options + numpad:pc Default numeric keypad keys. + numpad:mac Numeric keypad keys work as with Mac. + numpad:microsoft Shift with numeric keypad keys works as in MS Windows. + srvrkeys:none Special keys (Ctrl+Alt+<key>) handled in a server. + apple:badmap Swap keycodes of two keys when Mac keyboards are misdetected by kernel. + shift:breaks_caps Shift cancels CapsLock. + eurosign Adding the EuroSign to certain keys + eurosign:e Add the EuroSign to the E key. + eurosign:2 Add the EuroSign to the 2 key. + eurosign:4 Add the EuroSign to the 4 key. + eurosign:5 Add the EuroSign to the 5 key. + nbsp Using space key to input non-breakable space character + nbsp:none Space key outputs usual space at any level. + nbsp:level2 Space key outputs non-breakable space character at second level. + nbsp:level3 Space key outputs non-breakable space character at third level. + nbsp:level3s Space key outputs non-breakable space character at third level, nothing at fourth level. + nbsp:level3n Space key outputs non-breakable space character at third level, thin non-breakable space character at fourth level + nbsp:level4 Space key outputs non-breakable space character at fourth level. + nbsp:level4n Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level + nbsp:level4nl Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift + japan Japanese keyboard options + japan:kana_lock Kana Lock key is locking + japan:nicola_f_bs NICOLA-F style Backspace diff -pruN 2.5-1/rules/evdev.lst 2.5-1ubuntu1/rules/evdev.lst --- 2.5-1/rules/evdev.lst 1970-01-01 00:00:00.000000000 +0000 +++ 2.5-1ubuntu1/rules/evdev.lst 2012-01-24 00:19:22.000000000 +0000 @@ -0,0 +1,682 @@ +! 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 + btc6301urf BTC 6301URF + btc9000 BTC 9000 + btc9000a BTC 9000A + btc9001ah BTC 9001AH + btc5090 BTC 5090 + btc9019u BTC 9019U + cherryblue Cherry Blue Line CyBo@rd + cherryblueb Cherry CyMotion Master XPress + cherrybluea Cherry Blue Line CyBo@rd (alternate option) + cherrycyboard Cherry CyBo@rd USB-Hub + chicony Chicony Internet Keyboard + chicony0108 Chicony KU-0108 + 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 + dellsk8125 Dell SK-8125 + dellsk8135 Dell SK-8135 + dellusbmm Dell USB Multimedia Keyboard + 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 + fscaa1667g Fujitsu-Siemens Computers AMILO A1667G laptop + 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_base Logitech Generic Keyboard + 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 + hp5181 Hewlett-Packard Internet Keyboard 5181 + hp5185 Hewlett-Packard Internet Keyboard 5185 + hpnx9020 Hewlett-Packard nx9020 + 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 + thinkpad60 IBM ThinkPad R60/T60/R61/T61 + thinkpadz60 IBM ThinkPad Z60m/Z60t/Z61m/Z61t + ibm_spacesaver IBM Space Saver + logiaccess Logitech Access Keyboard + logiclx300 Logitech Cordless Desktop LX-300 + logii350 Logitech Internet 350 Keyboard + logimel Logitech Media Elite Keyboard + logicd Logitech Cordless Desktop + logicd_it Logitech Cordless Desktop iTouch + logicd_nav Logitech Cordless Desktop Navigator + logicd_opt Logitech Cordless Desktop Optical + 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 + logiultraxc Logitech Ultra-X Cordless Media Desktop Keyboard + logidinovo Logitech diNovo Keyboard + logidinovoedge Logitech diNovo Edge Keyboard + mx1998 Memorex MX1998 + mx2500 Memorex MX2500 EZ-Access Keyboard + mx2750 Memorex MX2750 + microsoft7000 Microsoft Natural Wireless Ergonomic Keyboard 7000 + 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 + vsonku306 ViewSonic KU-306 Internet Keyboard + microsoftprose Microsoft Internet Keyboard Pro, Swedish + microsoftoffice Microsoft Office Keyboard + microsoftmult Microsoft Wireless Multimedia Keyboard 1.0A + microsoftelite Microsoft Natural Keyboard Elite + 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 + benqx730 BenQ X-Touch 730 + benqx800 BenQ X-Touch 800 + hhk Happy Hacking Keyboard + classmate Classmate PC + olpc OLPC + sun6 Sun Type 5/6 + +! layout + us USA + 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 + me Montenegro + mk Macedonia + mt Malta + mn Mongolia + no Norway + pl Poland + pt Portugal + ro Romania + ru Russia + rs Serbia + 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 + chr us: Cherokee + 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-intl us: Dvorak international + dvorak-l us: Left handed Dvorak + dvorak-r us: Right handed Dvorak + dvorak-classic us: Classic Dvorak + dvp us: Programmer Dvorak + rus us: Russian phonetic + mac us: Macintosh + altgr-intl us: International (AltGr dead keys) + olpc2 us: Group toggle on multiply/divide key + ps af: Pashto + uz af: Southern Uzbek + olpc-ps af: OLPC Pashto + olpc-fa af: OLPC Dari + olpc-uz af: OLPC 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 + jhelum in: Gurmukhi Jhelum + kan in: Kannada + mal in: Malayalam + mal_lalitha in: Malayalam Lalitha + 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 + dvorak br: Dvorak + nativo br: Nativo + nativo-us br: Nativo for USA keyboards + nativo-epo br: Nativo for Esperanto + 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 + shs ca: Secwepemctsin + kut ca: Ktunaxa + 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 + dvorak dk: Dvorak + sundeadkeys nl: Sun dead keys + mac nl: Macintosh + std nl: Standard + nodeadkeys ee: Eliminate dead keys + dvorak ee: Dvorak + us ee: US keyboard with Estonian letters + 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 + classic fi: Classic + 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: Dvorak + mac fr: Macintosh + geo fr: Georgian AZERTY Tskapo + generic gh: Multilingual + akan gh: Akan + ewe gh: Ewe + fula gh: Fula + ga gh: Ga + hausa gh: Hausa + 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 + dvorak is: Dvorak + 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) + lekp lt: LEKP + lekpa lt: LEKPa + balticplus lt: Baltic+ + apostrophe lv: Apostrophe (') variant + tilde lv: Tilde (~) variant + fkey lv: F-letter (F) variant + cyrillic me: Cyrillic + cyrillicyz me: Cyrillic, Z and ZHE swapped + latinunicode me: Latin unicode + latinyz me: Latin qwerty + latinunicodeyz me: Latin unicode qwerty + cyrillicalternatequotes me: Cyrillic with guillemets + latinalternatequotes me: Latin with guillemets + 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 + ru_phonetic_dvorak pl: Russian phonetic Dvorak + 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 + nativo pt: Nativo + nativo-us pt: Nativo for USA keyboards + nativo-epo pt: Nativo for Esperanto + cedilla ro: Cedilla + std ro: Standard + std_cedilla ro: Standard (Cedilla) + winkeys ro: Winkeys + phonetic ru: Phonetic + typewriter ru: Typewriter + legacy ru: Legacy + tt ru: Tatar + os_legacy ru: Ossetian, legacy + os_winkeys ru: Ossetian, Winkeys + cv ru: Chuvash + cv_latin ru: Chuvash Latin + udm ru: Udmurt + kom ru: Komi + sah ru: Yakut + yz rs: Z and ZHE swapped + latin rs: Latin + latinunicode rs: Latin Unicode + latinyz rs: Latin qwerty + latinunicodeyz rs: Latin Unicode qwerty + alternatequotes rs: With guillemets + latinalternatequotes rs: 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 + ast es: Asturian variant with bottom-dot H and bottom-dot L + 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 + intl tr: International (with dead keys) + phonetic ua: Phonetic + typewriter ua: Typewriter + winkeys ua: Winkeys + unicode ua: Unicode + rstu ua: Standard RSTU + rstu_ru ua: Standard RSTU on Russian layout + homophonic ua: Homophonic + intl gb: International (with dead keys) + dvorak gb: Dvorak + dvorakukp gb: Dvorak (UK Punctuation) + mac gb: Macintosh + colemak gb: Colemak + latin uz: Latin + kr104 kr: 101/104 key Compatible + CloGaelach ie: CloGaelach + UnicodeExpert ie: UnicodeExpert + ogam ie: Ogham + ogam_is434 ie: Ogham IS434 + ara pk: Arabic + 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 + +! option + grp Layout switching + grp:switch R-Alt switches layout while pressed. + grp:lswitch Left Alt key switches layout while pressed. + grp:lwin_switch Left Win-key switches layout while pressed. + grp:rwin_switch Right Win-key switches layout while pressed. + grp:win_switch Both Win-keys switch layout while pressed. + grp:rctrl_switch Right Ctrl key switches layout while pressed. + grp:toggle Right Alt key changes layout. + grp:lalt_toggle Left Alt key changes layout. + grp:caps_toggle CapsLock key changes layout. + grp:shift_caps_toggle Shift+CapsLock changes layout. + grp:shift_caps_switch CapsLock switch to first layout, Shift+CapsLock switch to last layout. + grp:alt_caps_toggle Alt+CapsLock changes layout. + grp:shifts_toggle Both Shift keys together change layout. + grp:alts_toggle Both Alt keys together change layout. + grp:ctrls_toggle Both Ctrl keys together change layout. + grp:ctrl_shift_toggle Ctrl+Shift change layout. + grp:lctrl_lshift_toggle LCtrl+LShift change layout. + grp:ctrl_alt_toggle Alt+Ctrl change layout. + grp:alt_shift_toggle Alt+Shift change layout. + grp:menu_toggle Menu key changes layout. + grp:lwin_toggle Left Win-key changes layout. + grp:rwin_toggle Right Win-key changes layout. + grp:lshift_toggle Left Shift key changes layout. + grp:rshift_toggle Right Shift key changes layout. + grp:lctrl_toggle Left Ctrl key changes layout. + grp:rctrl_toggle Right Ctrl key changes layout. + grp:sclk_toggle ScrollLock key changes group. + lv3 Third level choosers + lv3:switch Press Right Ctrl to choose 3rd level. + lv3:menu_switch Press Menu key to choose 3rd level. + lv3:win_switch Press any of Win-keys to choose 3rd level. + lv3:lwin_switch Press Left Win-key to choose 3rd level. + lv3:rwin_switch Press Right Win-key to choose 3rd level. + lv3:alt_switch Press any of Alt keys to choose 3rd level. + lv3:lalt_switch Press Left Alt key to choose 3rd level. + lv3:ralt_switch Press Right Alt key to choose 3rd level. + lv3:ralt_switch_multikey Press Right Alt key to choose 3rd level, Shift+Right Alt key is Multi_Key. + lv3:ralt_alt Right Alt key never chooses 3rd level. + lv3:enter_switch Press Enter key on keypad to choose 3rd level. + ctrl Ctrl key position + ctrl:nocaps Make CapsLock an additional Ctrl. + ctrl:swapcaps Swap Ctrl and CapsLock. + ctrl:ctrl_ac Ctrl key at left of 'A' + ctrl:ctrl_aa Ctrl key at bottom left + ctrl:ctrl_ra Right Ctrl key works as Right Alt. + grp_led Use keyboard LED to show alternative layout. + grp_led:num NumLock LED shows alternative layout. + grp_led:caps CapsLock LED shows alternative layout. + grp_led:scroll ScrollLock LED shows alternative layout. + keypad Numeric keypad layout selection + keypad:legacy Legacy keypad + keypad:comma Force standard comma keypad + keypad:oss Keypad with unicode additions (arrows and math operators) + keypad:future Keypad with unicode additions (arrows and math operators). Math operators on default level. + keypad:legacy_wang Legacy Wang 724 keypad + keypad:oss_wang Wang 724 keypad with unicode additions (arrows and math operators) + keypad:future_wang Wang 724 keypad with unicode additions (arrows and math operators). Math operators on default level. + keypad:phone_hex ATM/phone-style hexadecimal keypad + kpdl Numeric keypad delete key behaviour + kpdl:dot Legacy key with dot + kpdl:comma Legacy key with comma + kpdl:dotoss Four-level key with dot + kpdl:commaoss Four-level key with comma + kpdl:momayyezoss Four-level key with momayyez + kpdl:kposs Four-level key with abstract separators + caps CapsLock key behavior + caps:internal CapsLock uses internal capitalization. Shift "pauses" CapsLock. + caps:internal_nocancel CapsLock uses internal capitalization. Shift doesn't affect CapsLock. + caps:shift CapsLock acts as Shift with locking. Shift "pauses" CapsLock. + caps:shift_nocancel CapsLock acts as Shift with locking. Shift doesn't affect CapsLock. + caps:shift_lock CapsLock just locks the Shift modifier. + caps:capslock CapsLock toggles normal capitalization of alphabetic characters. + caps:swapescape Swap ESC and CapsLock. + caps:shiftlock CapsLock toggles Shift so all keys are affected. + altwin Alt/Win key behavior + altwin:menu Add the standard behavior to Menu key. + altwin:meta_alt Alt and Meta are on the Alt keys. + altwin:ctrl_win Control is mapped to the Win-keys (and the usual Ctrl keys). + altwin:meta_win Meta is mapped to the Win-keys. + altwin:left_meta_win Meta is mapped to the left Win-key. + altwin:super_win Super is mapped to the Win-keys. + altwin:hyper_win Hyper is mapped to the Win-keys. + altwin:alt_super_win Alt is mapped to the right Win-key and Super to Menu. + altwin:swap_lalt_lwin Left Alt is swapped with left Win-key. + Compose key Compose key position + compose:ralt Right Alt is Compose. + compose:lwin Left Win-key is Compose. + compose:rwin Right Win-key is Compose. + compose:menu Menu is Compose. + compose:rctrl Right Ctrl is Compose. + compose:caps Caps Lock is Compose. + compose:102 Less-than/Greater-than is Compose. + compat Miscellaneous compatibility options + numpad:pc Default numeric keypad keys. + numpad:mac Numeric keypad keys work as with Mac. + numpad:microsoft Shift with numeric keypad keys works as in MS Windows. + srvrkeys:none Special keys (Ctrl+Alt+<key>) handled in a server. + apple:badmap Swap keycodes of two keys when Mac keyboards are misdetected by kernel. + shift:breaks_caps Shift cancels CapsLock. + eurosign Adding the EuroSign to certain keys + eurosign:e Add the EuroSign to the E key. + eurosign:2 Add the EuroSign to the 2 key. + eurosign:4 Add the EuroSign to the 4 key. + eurosign:5 Add the EuroSign to the 5 key. + nbsp Using space key to input non-breakable space character + nbsp:none Space key outputs usual space at any level. + nbsp:level2 Space key outputs non-breakable space character at second level. + nbsp:level3 Space key outputs non-breakable space character at third level. + nbsp:level3s Space key outputs non-breakable space character at third level, nothing at fourth level. + nbsp:level3n Space key outputs non-breakable space character at third level, thin non-breakable space character at fourth level + nbsp:level4 Space key outputs non-breakable space character at fourth level. + nbsp:level4n Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level + nbsp:level4nl Space key outputs non-breakable space character at fourth level, thin non-breakable space character at sixth level (via Ctrl+Shift + japan Japanese keyboard options + japan:kana_lock Kana Lock key is locking + japan:nicola_f_bs NICOLA-F style Backspace diff -pruN 2.5-1/rules/evdev.xml.in 2.5-1ubuntu1/rules/evdev.xml.in --- 2.5-1/rules/evdev.xml.in 2012-01-19 23:30:58.000000000 +0000 +++ 2.5-1ubuntu1/rules/evdev.xml.in 2012-01-24 00:19:22.000000000 +0000 @@ -1234,6 +1234,13 @@ + intelligent_keyboard_k04 + Intelligent Keyboard K04 + Generic + + + + htcdream <_description>Htc Dream phone htc