debian/changelog | 6 debian/patches/104_macbook_expose_and_dashboard.patch | 3 debian/patches/105_intelligent_keyboard.patch | 37 ++--- debian/patches/108_taiwan.patch | 132 ++++++++---------- 4 files changed, 91 insertions(+), 87 deletions(-)
New commits: commit bc2906dad0e21a34f13f2877088c1c1a1c72ee90 Author: Bryce Harrington <[email protected]> Date: Thu Feb 3 15:58:45 2011 -0800 Bump changelog diff --git a/debian/changelog b/debian/changelog index 8e9579b..5b375ed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xkeyboard-config (2.1-1ubuntu2) natty; urgency=low + + * Refresh patches 104, 105, 108 to apply + + -- Bryce Harrington <[email protected]> Thu, 03 Feb 2011 15:57:08 -0800 + xkeyboard-config (2.1-1ubuntu1) natty; urgency=low * Merge from debian of 2.1 release. commit 31b374b3761c3557d8d63dac768171e5ea23fe97 Author: Bryce Harrington <[email protected]> Date: Thu Feb 3 15:56:44 2011 -0800 Refresh diff --git a/debian/patches/108_taiwan.patch b/debian/patches/108_taiwan.patch index f242e9d..d140bc6 100644 --- a/debian/patches/108_taiwan.patch +++ b/debian/patches/108_taiwan.patch @@ -1,7 +1,68 @@ -Index: xkeyboard-config/symbols/tw -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ xkeyboard-config/symbols/tw 2010-03-28 23:23:52.000000000 +0800 +diff -Nurp a/rules/base.xml.in b/rules/base.xml.in +--- a/rules/base.xml.in 2011-02-03 15:51:13.421086910 -0800 ++++ b/rules/base.xml.in 2011-02-03 15:50:56.761185595 -0800 +@@ -4102,6 +4102,46 @@ + </layout> + <layout> + <configItem> ++ <name>tw</name> ++ <_shortDescription>Twn</_shortDescription> ++ <_description>Taiwan</_description> ++ <languageList> ++ <iso639Id>trv</iso639Id> ++ </languageList> ++ </configItem> ++ <variantList> ++ <variant> ++ <configItem> ++ <name>indigenous</name> ++ <_description>Indigenous</_description> ++ <languageList> ++ <iso639Id>ami</iso639Id> ++ <iso639Id>tay</iso639Id> ++ <iso639Id>bnn</iso639Id> ++ <iso639Id>ckv</iso639Id> ++ <iso639Id>pwn</iso639Id> ++ <iso639Id>pyu</iso639Id> ++ <iso639Id>dru</iso639Id> ++ <iso639Id>ais</iso639Id> ++ <iso639Id>ssf</iso639Id> ++ <iso639Id>tao</iso639Id> ++ <iso639Id>tsu</iso639Id> ++ </languageList> ++ </configItem> ++ </variant> ++ <variant> ++ <configItem> ++ <name>saisiyat</name> ++ <_description>Saisiyat</_description> ++ <languageList> ++ <iso639Id>xsf</iso639Id> ++ </languageList> ++ </configItem> ++ </variant> ++ </variantList> ++ </layout> ++ <layout> ++ <configItem> + <name>ua</name> + <_shortDescription>Ukr</_shortDescription> + <_description>Ukraine</_description> +diff -Nurp a/symbols/Makefile.am b/symbols/Makefile.am +--- a/symbols/Makefile.am 2011-02-03 15:51:13.421086910 -0800 ++++ b/symbols/Makefile.am 2011-02-03 15:50:56.649186258 -0800 +@@ -29,7 +29,7 @@ ro rs ru \ + se si sk sn \ + sy th \ + terminate \ +-tj tm tr tz \ ++tj tm tr tw tz \ + ua us uz vn \ + za \ + altwin capslock compose ctrl empty eurosign rupeesign group inet \ +diff -Nurp a/symbols/tw b/symbols/tw +--- a/symbols/tw 1969-12-31 16:00:00.000000000 -0800 ++++ b/symbols/tw 2011-02-03 15:50:56.653186234 -0800 @@ -0,0 +1,73 @@ +// $XKeyboardConfig$ + @@ -76,66 +137,3 @@ Index: xkeyboard-config/symbols/tw + + include "level3(ralt_switch)" +}; -Index: xkeyboard-config/rules/base.xml.in -=================================================================== ---- xkeyboard-config.orig/rules/base.xml.in 2010-03-28 23:24:07.000000000 +0800 -+++ xkeyboard-config/rules/base.xml.in 2010-03-28 23:24:46.000000000 +0800 -@@ -3958,6 +3958,46 @@ - </layout> - <layout> - <configItem> -+ <name>tw</name> -+ <_shortDescription>Twn</_shortDescription> -+ <_description>Taiwan</_description> -+ <languageList> -+ <iso639Id>trv</iso639Id> -+ </languageList> -+ </configItem> -+ <variantList> -+ <variant> -+ <configItem> -+ <name>indigenous</name> -+ <_description>Indigenous</_description> -+ <languageList> -+ <iso639Id>ami</iso639Id> -+ <iso639Id>tay</iso639Id> -+ <iso639Id>bnn</iso639Id> -+ <iso639Id>ckv</iso639Id> -+ <iso639Id>pwn</iso639Id> -+ <iso639Id>pyu</iso639Id> -+ <iso639Id>dru</iso639Id> -+ <iso639Id>ais</iso639Id> -+ <iso639Id>ssf</iso639Id> -+ <iso639Id>tao</iso639Id> -+ <iso639Id>tsu</iso639Id> -+ </languageList> -+ </configItem> -+ </variant> -+ <variant> -+ <configItem> -+ <name>saisiyat</name> -+ <_description>Saisiyat</_description> -+ <languageList> -+ <iso639Id>xsf</iso639Id> -+ </languageList> -+ </configItem> -+ </variant> -+ </variantList> -+ </layout> -+ <layout> -+ <configItem> - <name>ua</name> - <_shortDescription>Ukr</_shortDescription> - <_description>Ukraine</_description> -diff -Nurp xkeyboard-config-merge/symbols/Makefile.am working/symbols/Makefile.am ---- xkeyboard-config-merge/symbols/Makefile.am 2010-03-29 18:38:01.000000000 -0700 -+++ working/symbols/Makefile.am 2010-03-29 23:29:53.000000000 -0700 -@@ -27,7 +27,7 @@ ro rs ru \ - se si sk sn \ - sy th \ - terminate \ --tj tm tr \ -+tj tm tr tw \ - ua us uz vn \ - za \ - altwin capslock compose ctrl eurosign group inet \ commit 6f6cf206099e7fc7e58afb9b2cd5a6fa6a535661 Author: Bryce Harrington <[email protected]> Date: Thu Feb 3 15:40:51 2011 -0800 Refresh diff --git a/debian/patches/104_macbook_expose_and_dashboard.patch b/debian/patches/104_macbook_expose_and_dashboard.patch index 36f843c..b168413 100644 --- a/debian/patches/104_macbook_expose_and_dashboard.patch +++ b/debian/patches/104_macbook_expose_and_dashboard.patch @@ -20,12 +20,11 @@ diff -Nrup xkeyboard-config-1.7-patched/keycodes/evdev xkeyboard-config-working/ diff -Nrup xkeyboard-config-1.7-patched/symbols/inet xkeyboard-config-working/symbols/inet --- xkeyboard-config-1.7-patched/symbols/inet 2010-02-11 12:27:43.000000000 -0800 +++ xkeyboard-config-working/symbols/inet 2010-02-11 12:30:16.000000000 -0800 -@@ -123,6 +123,7 @@ xkb_symbols "evdev" { +@@ -123,5 +123,6 @@ xkb_symbols "evdev" { // key <I120> { [ ] }; // KEY_MACRO key <I126> { [ plusminus ] }; + key <I128> { [ XF86LaunchA ] }; - key <I129> { [ KP_Decimal ] }; key <I147> { [ XF86MenuKB ] }; key <I148> { [ XF86Calculator ] }; @@ -172,6 +173,7 @@ xkb_symbols "evdev" { commit 35ec7540883e6538a161a8173f85a1b8ccba2f7b Author: Bryce Harrington <[email protected]> Date: Thu Feb 3 15:30:39 2011 -0800 Refresh patch 105 diff --git a/debian/patches/105_intelligent_keyboard.patch b/debian/patches/105_intelligent_keyboard.patch index 6781906..4b90902 100644 --- a/debian/patches/105_intelligent_keyboard.patch +++ b/debian/patches/105_intelligent_keyboard.patch @@ -1,11 +1,11 @@ diff --git a/rules/base.lists.part b/rules/base.lists.part -index d1927c5..69de1f6 100644 +index 50d1980..d92c1a9 100644 --- a/rules/base.lists.part +++ b/rules/base.lists.part -@@ -67,7 +67,8 @@ +@@ -71,7 +71,8 @@ sk1300 sk2500 sk6200 sk7100 \ sven sven303 symplon \ - tm2030USB toshiba_s3000 trust trustda \ + toshiba_s3000 trust trustda \ - unitekkb1925 yahoo + unitekkb1925 yahoo \ + intelligent_keyboard_k04 @@ -13,34 +13,31 @@ index d1927c5..69de1f6 100644 // all layouts with 3rd and 4th groups ! $threelevellayouts = al az \ diff --git a/rules/base.xml.in b/rules/base.xml.in -index f43e651..4038bcd 100644 +index 15581b7..350947c 100644 --- a/rules/base.xml.in +++ b/rules/base.xml.in -@@ -1196,6 +1196,13 @@ - <vendor>Creative</vendor> - </configItem> +@@ -1226,6 +1226,13 @@ </model> -+ <model> -+ <configItem> + <model> + <configItem> + <name>intelligent_keyboard_k04</name> + <description>Intelligent Keyboard K04</description> + <vendor>Generic</vendor> + </configItem> + </model> - </modelList> - <layoutList> - <layout> ++ <model> ++ <configItem> + <name>htcdream</name> + <_description>Htc Dream phone</_description> + <vendor>htc</vendor> diff --git a/symbols/inet b/symbols/inet -index f6cd6ac..e9b5a59 100644 +index 5d83ebf..f3fc8fa 100644 --- a/symbols/inet +++ b/symbols/inet -@@ -1821,3 +1821,30 @@ partial alphanumeric_keys - xkb_symbols "pc105" { +@@ -1828,6 +1828,31 @@ xkb_symbols "pc105" { include "inet(media_nav_acpi_common)" }; -+ -+//Intelligent Keyboard -+ + +//Intelligent Keyboard K04 +partial alphanumeric_keys +xkb_symbols "intelligent_keyboard_k04" { @@ -65,3 +62,7 @@ index f6cd6ac..e9b5a59 100644 + key <I21> { [ XF86Calculator ] }; + key <I5F> { [ XF86Sleep ] }; +}; ++ + // HTC Dream + partial alphanumeric_keys + xkb_symbols "htcdream" { -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
