debian/changelog | 11 +++ debian/patches/backports/001_fix_us_layout.diff | 18 +++++ debian/patches/send-upstream/001_keypad_comma.diff | 2 debian/patches/send-upstream/002_add_asus6000.diff | 69 +++++++++++++++++++++ debian/patches/series | 2 5 files changed, 100 insertions(+), 2 deletions(-)
New commits: commit a89c54aa311859687e618b7ab2de1c45b1ea736c Author: Mohammed Adnene Trojette <[EMAIL PROTECTED]> Date: Mon Apr 30 00:20:08 2007 +0200 Fix US layout (001_fix_us_layout.diff) + Debian bug #421532 + X.org bugs #8789 and #10811 Add keypad:comma (001_keypad_comma.diff) + Debian bug #409117 to forward Add Asus 6000 series laptop layout + Debian bug #383953 to forward diff --git a/debian/changelog b/debian/changelog index 32b5e83..0617d7e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +xkeyboard-config (0.9+cvs.20070428-2) UNRELEASED; urgency=low + + * Patches to send upstream. + + 002_add_asus6000.diff: add Asus A6000 series Keyboard + support. (Closes: #383953) + * Patches backported from upstream: + + 001_fix_us.diff: fix us layout. (Closes: #421532) + + -- Mohammed Adnène Trojette <[EMAIL PROTECTED]> Mon, 30 Apr 2007 00:12:26 +0200 + xkeyboard-config (0.9+cvs.20070428-1) experimental; urgency=low * Add myself to Uploaders. (Closes: #401777) @@ -8,7 +18,6 @@ xkeyboard-config (0.9+cvs.20070428-1) experimental; urgency=low + fix keymap on iBook G4 Japanese keyboard. (Closes: #374070) + fix <K6C> key in symbols/inet. (Closes: #409982) + update Finnish layout. (Closes: #405207) - + add Logitech Media Elite keyboard support. (Closes: #384801) + add Logitech Cordless Desktop Optical support. (Closes: #391192) + fix a jp106 backslash/yen issue. (Closes: #280579) * Patches refreshed: diff --git a/debian/patches/backports/001_fix_us_layout.diff b/debian/patches/backports/001_fix_us_layout.diff new file mode 100644 index 0000000..debcb66 --- /dev/null +++ b/debian/patches/backports/001_fix_us_layout.diff @@ -0,0 +1,18 @@ +Index: xkb-data-experimental/symbols/us +=================================================================== +--- xkb-data-experimental.orig/symbols/us ++++ xkb-data-experimental/symbols/us +@@ -61,6 +61,8 @@ + key <AB09> { [ period, greater ] }; + key <AB10> { [ slash, question ] }; + ++ key <BKSL> { [ backslash, bar ] }; ++ key <CAPS> { [ Caps_Lock ] }; + // End alphanumeric section + }; + +@@ -507,4 +509,3 @@ + include "us" + name[Group1]= "U.S. English - Macintosh"; + }; +- diff --git a/debian/patches/send-upstream/001_keypad_comma.diff b/debian/patches/send-upstream/001_keypad_comma.diff index 90b610f..9393376 100644 --- a/debian/patches/send-upstream/001_keypad_comma.diff +++ b/debian/patches/send-upstream/001_keypad_comma.diff @@ -2,7 +2,7 @@ Index: xkb-data-experimental/rules/base =================================================================== --- xkb-data-experimental.orig/rules/base +++ xkb-data-experimental/rules/base -@@ -828,6 +828,7 @@ +@@ -826,6 +826,7 @@ eurosign:2 = +eurosign(2) keypad:oss = +keypad(oss) keypad:legacy = +keypad(legacy) diff --git a/debian/patches/send-upstream/002_add_asus6000.diff b/debian/patches/send-upstream/002_add_asus6000.diff new file mode 100644 index 0000000..a7bfd04 --- /dev/null +++ b/debian/patches/send-upstream/002_add_asus6000.diff @@ -0,0 +1,69 @@ +Index: xkb-data-experimental/rules/base +=================================================================== +--- xkb-data-experimental.orig/rules/base ++++ xkb-data-experimental/rules/base +@@ -34,7 +34,7 @@ + + ! $inetkbds = a4techKB21 a4techKBS8 a4_rfkb23 \ + acer_c300 acer_ferrari4k acer_tm_800 \ +- acpi airkey armada azonaRF2300 \ ++ acpi airkey armada azonaRF2300 asus_6000 \ + apple \ + benqx730 benqx800 brother \ + btc5113rf btc5126t btc9000 btc9000a btc9001ah btc5090 btc9019u \ +Index: xkb-data-experimental/rules/base.xml.in +=================================================================== +--- xkb-data-experimental.orig/rules/base.xml.in ++++ xkb-data-experimental/rules/base.xml.in +@@ -119,6 +119,12 @@ + <model> + <configItem> + <name>azonaRF2300</name> ++ <_description>Asus A6000 series Keyboard</_description> ++ </configItem> ++ </model> ++ <model> ++ <configItem> ++ <name>asus_6000</name> + <_description>Azona RF2300 wireless Internet Keyboard</_description> + </configItem> + </model> +Index: xkb-data-experimental/symbols/inet +=================================================================== +--- xkb-data-experimental.orig/symbols/inet ++++ xkb-data-experimental/symbols/inet +@@ -229,6 +229,22 @@ + key <I74> { [ XF86Launch4 ] }; + }; + ++// Asus ++ ++// Asus A6000 series Keyboard ++partial alphanumeric_keys ++xkb_symbols "asus_6000" { ++ key <I20> { [ XF86AudioMute ] }; ++ key <I2E> { [ XF86AudioLowerVolume ] }; ++ key <I30> { [ XF86AudioRaiseVolume ] }; ++ key <I6C> { [ XF86Mail ] }; ++ key <I32> { [ XF86WWW ] }; ++ key <I10> { [ XF86AudioPrev ] }; ++ key <I19> { [ XF86AudioNext ] }; ++ key <I24> { [ XF86AudioStop ] }; ++ key <I22> { [ XF86AudioPlay ] }; ++}; ++ + // Azona + + // Azona RF2300 wireless Internet Keyboard +Index: xkb-data-experimental/symbols/symbols.dir +=================================================================== +--- xkb-data-experimental.orig/symbols/symbols.dir ++++ xkb-data-experimental/symbols/symbols.dir +@@ -282,6 +282,7 @@ + --p----- a------- inet(airkey) + --p----- -------- inet(apple) + --p----- a------- inet(armada) ++--p----- a------- inet(asus_6000) + --p----- a------- inet(azonaRF2300) + --p----- a------- inet(brother) + --p----- a------- inet(btc5090) diff --git a/debian/patches/series b/debian/patches/series index c331b3b..9ca176b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -14,3 +14,5 @@ greek.diff #japan.diff resync_rules_base.diff send-upstream/001_keypad_comma.diff +send-upstream/002_add_asus6000.diff +backports/001_fix_us_layout.diff -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]