.gitignore | 2
COPYING | 40
ChangeLog | 9777 +++++++++++-----
Makefile.am | 15
NEWS | 6
README | 3
compat/Makefile.am | 2
compat/caps | 12
compat/complete | 1
compat/default | 1
compat/level5 | 12
compat/misc | 12
configure.in | 17
debian/README.Debian | 6
debian/README.source | 2
debian/changelog | 268
debian/control | 18
debian/patches/101_rus.patch | 12
debian/patches/102_mac_aliases.patch | 227
debian/patches/103_swiss_legacy.patch | 53
debian/patches/104_macbook_expose_and_dashboard.patch | 38
debian/patches/105_intelligent_keyboard.patch | 67
debian/patches/107_lao.patch | 115
debian/patches/108_taiwan.patch | 141
debian/patches/revert-goodmap-badmap-for-apple.diff | 63
debian/patches/send-upstream/003_missing_inet_keys.diff | 15
debian/patches/series | 8
debian/rules | 38
debian/watch | 3
debian/xkb-data-i18n.install | 1
debian/xkb-data.install | 1
debian/xkb-data.postinst.in | 6
debian/xsfbs/xsfbs.mk | 35
docs/HOWTO.transition | 2
docs/iso3166-3.csv | 246
geometry/Makefile.am | 4
geometry/hp | 246
geometry/macintosh | 877 +
geometry/nokia | 53
geometry/pc | 28
geometry/sanwa | 151
geometry/sun | 40
keycodes/Makefile.am | 1
keycodes/empty | 4
keycodes/macintosh | 24
keycodes/sun | 40
keymap/README | 2
keymap/xfree86 | 94
po/bg.po | 1949 +--
po/ca.po | 2015 +--
po/crh.po | 1265 +-
po/cs.po | 1923 +--
po/da.po | 1974 +--
po/de.po | 1960 +--
po/el.po | 2627 +++-
po/eo.po | 2016 +--
po/es.po | 2735 +++-
po/fi.po | 1913 +--
po/fr.po | 881 -
po/gl.po | 3023 ++++
po/hu.po | 1931 +--
po/id.po | 2027 +--
po/it.po | 2259 +--
po/ko.po | 2325 +--
po/ky.po | 1447 +-
po/lt.po | 1963 +--
po/pl.po | 3096 +++++
po/ro.po | 3079 +++++
po/ru.po | 2185 ++-
po/sv.po | 868 -
po/uk.po | 2044 +--
po/vi.po | 1806 +-
po/zh_CN.po | 2
rules/HDR | 17
rules/Makefile.am | 74
rules/base.extras.xml.in | 33
rules/base.l2_s.part | 1
rules/base.l3_s.part | 1
rules/base.l4_s.part | 1
rules/base.lists.part | 17
rules/base.m_g.part | 5
rules/base.m_k.part | 4
rules/base.m_s.part | 4
rules/base.m_t.part | 2
rules/base.ml1_s.part | 5
rules/base.ml2_s.part | 3
rules/base.ml3_s.part | 3
rules/base.ml4_s.part | 3
rules/base.ml_s.part | 26
rules/base.mlv_s.part | 1
rules/base.o_c.part | 1
rules/base.o_s.part | 34
rules/base.xml.in | 820 +
rules/bin/Makefile.am | 4
rules/bin/ln_s.sh | 20
rules/bin/lnv_s.sh | 12
rules/bin/mln_s.sh | 20
rules/bin/mlnvn_s.sh | 12
rules/compat/.gitignore | 6
rules/compat/Makefile.am | 31
rules/compat/base.l1v1_c.part | 1
rules/compat/base.l2v2_c.part | 1
rules/compat/base.l3v3_c.part | 1
rules/compat/base.l4v4_c.part | 1
rules/compat/base.lv_c.part | 1
rules/evdev.m_k.part | 1
rules/evdev.m_s.part | 1
rules/extras/.gitignore | 6
rules/extras/Makefile.am | 24
rules/extras/variantsMapping.lst | 2
rules/xfree98 | 1
symbols/Makefile.am | 24
symbols/af | 15
symbols/altwin | 5
symbols/ara | 14
symbols/at | 38
symbols/be | 20
symbols/br | 8
symbols/bw | 19
symbols/ch | 22
symbols/cn | 68
symbols/compose | 23
symbols/ctrl | 12
symbols/cz | 32
symbols/de | 345
symbols/empty | 6
symbols/es | 4
symbols/eurosign | 8
symbols/extras/Makefile.am | 3
symbols/extras/ir | 63
symbols/extras/ru | 59
symbols/fi | 333
symbols/fr | 34
symbols/gb | 37
symbols/gh | 59
symbols/gr | 3
symbols/group | 29
symbols/hu | 13
symbols/il | 9
symbols/in | 22
symbols/inet | 48
symbols/ir | 56
symbols/is | 23
symbols/it | 44
symbols/jp | 37
symbols/ke | 44
symbols/keypad | 56
symbols/latam | 4
symbols/latin | 6
symbols/level3 | 54
symbols/level5 | 133
symbols/lk | 2
symbols/lt | 489
symbols/ma | 10
symbols/macintosh_vndr/Makefile.am | 4
symbols/macintosh_vndr/apple | 88
symbols/macintosh_vndr/es | 6
symbols/macintosh_vndr/jp | 35
symbols/ml | 85
symbols/nbsp | 132
symbols/nokia_vndr/Makefile.am | 6
symbols/nokia_vndr/rx-44 | 303
symbols/nokia_vndr/rx-51 | 491
symbols/nokia_vndr/su-8w | 484
symbols/pc | 5
symbols/ph | 999 +
symbols/pk | 61
symbols/pl | 75
symbols/pt | 12
symbols/rs | 27
symbols/ru | 68
symbols/rupeesign | 7
symbols/se | 2
symbols/shift | 67
symbols/sun_vndr/Makefile.am | 13
symbols/sun_vndr/ara | 117
symbols/sun_vndr/be | 99
symbols/sun_vndr/br | 102
symbols/sun_vndr/ca | 98
symbols/sun_vndr/ch | 134
symbols/sun_vndr/cs | 59
symbols/sun_vndr/cz | 105
symbols/sun_vndr/de | 142
symbols/sun_vndr/dk | 151
symbols/sun_vndr/ee | 118
symbols/sun_vndr/es | 157
symbols/sun_vndr/fi | 74
symbols/sun_vndr/fr | 107
symbols/sun_vndr/gb | 84
symbols/sun_vndr/gr | 97
symbols/sun_vndr/hu | 94
symbols/sun_vndr/it | 142
symbols/sun_vndr/jp | 27
symbols/sun_vndr/ko | 63
symbols/sun_vndr/kr | 98
symbols/sun_vndr/lt | 132
symbols/sun_vndr/lv | 125
symbols/sun_vndr/nl | 157
symbols/sun_vndr/no | 144
symbols/sun_vndr/pl | 99
symbols/sun_vndr/pt | 153
symbols/sun_vndr/ro | 118
symbols/sun_vndr/ru | 98
symbols/sun_vndr/se | 291
symbols/sun_vndr/sk | 110
symbols/sun_vndr/solaris | 62
symbols/sun_vndr/sw | 173
symbols/sun_vndr/tr | 132
symbols/sun_vndr/tuv | 33
symbols/sun_vndr/tw | 50
symbols/sun_vndr/ua | 118
symbols/sun_vndr/us | 301
symbols/sun_vndr/usb | 26
symbols/sy | 3
symbols/tm | 1
symbols/tz | 63
symbols/us | 153
tests/testShortDescriptions | 6
tests/xkbTestFunc.pm | 15
types/Makefile.am | 2
types/level5 | 122
types/nokia | 14
xkbrules.am | 2
xkeyboard-config.pc.in | 8
224 files changed, 51169 insertions(+), 22255 deletions(-)
New commits:
commit 03f924569ed3cfb85b887ba2d7ca2ea7866b8626
Author: Bryce Harrington <br...@canonical.com>
Date: Tue Feb 1 14:50:07 2011 -0800
Drop obsolete patches
diff --git a/debian/patches/101_rus.patch b/debian/patches/101_rus.patch
deleted file mode 100644
index f178ce3..0000000
--- a/debian/patches/101_rus.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: xkb-data/rules/base.xml.in
-===================================================================
---- xkb-data.orig/rules/base.xml.in 2009-12-14 17:25:21.000000000 +0200
-+++ xkb-data/rules/base.xml.in 2009-12-14 17:42:36.000000000 +0200
-@@ -1277,6 +1277,7 @@
- <configItem>
- <name>rus</name>
- <_description>Russian phonetic</_description>
-+ <languageList><iso639Id>rus</iso639Id></languageList>
- </configItem>
- </variant>
- <variant>
diff --git a/debian/patches/102_mac_aliases.patch
b/debian/patches/102_mac_aliases.patch
deleted file mode 100644
index b78c003..0000000
--- a/debian/patches/102_mac_aliases.patch
+++ /dev/null
@@ -1,227 +0,0 @@
-Index: xkb-data/symbols/macintosh_vndr/de
-===================================================================
---- xkb-data.orig/symbols/macintosh_vndr/de 2008-09-05 11:12:12.000000000
+0300
-+++ xkb-data/symbols/macintosh_vndr/de 2009-12-14 17:42:07.000000000 +0200
-@@ -95,3 +95,17 @@
-
- key <BKSL> { [ numbersign, apostrophe, grave
] };
- };
-+
-+partial alphanumeric_keys
-+xkb_symbols "mac" {
-+ // Alias to keep Gnome UI happy.
-+ // see https://bugs.launchpad.net/bugs/327963
-+ include "macintosh_vndr/de(basic)"
-+};
-+
-+partial alphanumeric_keys
-+xkb_symbols "mac_nodeadkeys" {
-+ // Alias to keep Gnome UI happy.
-+ // see https://bugs.launchpad.net/bugs/327963
-+ include "macintosh_vndr/de(nodeadkeys)"
-+};
-Index: xkb-data/symbols/macintosh_vndr/dk
-===================================================================
---- xkb-data.orig/symbols/macintosh_vndr/dk 2008-09-05 11:12:12.000000000
+0300
-+++ xkb-data/symbols/macintosh_vndr/dk 2009-12-14 17:42:07.000000000 +0200
-@@ -77,3 +77,16 @@
- key <TLDE> { [ dollar, section, dollar, dollar ] };
- };
-
-+partial alphanumeric_keys
-+xkb_symbols "mac" {
-+ // Alias to keep Gnome UI happy.
-+ // see https://bugs.launchpad.net/bugs/327963
-+ include "macintosh_vndr/dk(basic)"
-+};
-+
-+partial alphanumeric_keys
-+xkb_symbols "mac_nodeadkeys" {
-+ // Alias to keep Gnome UI happy.
-+ // see https://bugs.launchpad.net/bugs/327963
-+ include "macintosh_vndr/dk(nodeadkeys)"
-+};
-Index: xkb-data/symbols/macintosh_vndr/es
-===================================================================
---- xkb-data.orig/symbols/macintosh_vndr/es 2008-09-05 11:12:12.000000000
+0300
-+++ xkb-data/symbols/macintosh_vndr/es 2009-12-14 17:42:07.000000000 +0200
-@@ -4,3 +4,10 @@
- include "es"
- name[Group1]= "Spain - Mac";
- };
-+
-+partial alphanumeric_keys
-+xkb_symbols "mac" {
-+ // Alias to keep Gnome UI happy.
-+ // see https://bugs.launchpad.net/bugs/327963
-+ include "macintosh_vndr/es(basic)"
-+};
-Index: xkb-data/symbols/macintosh_vndr/fi
-===================================================================
---- xkb-data.orig/symbols/macintosh_vndr/fi 2008-09-05 11:12:12.000000000
+0300
-+++ xkb-data/symbols/macintosh_vndr/fi 2009-12-14 17:42:07.000000000 +0200
-@@ -16,3 +16,10 @@
- include "macintosh_vndr/se(basic)" // for consistent naming
- name[Group1]= "Finland - Mac, eliminate dead keys";
- };
-+
-+partial alphanumeric_keys
-+xkb_symbols "mac" {
-+ // Alias to keep Gnome UI happy.
-+ // see https://bugs.launchpad.net/bugs/327963
-+ include "macintosh_vndr/fi(basic)"
-+};
-Index: xkb-data/symbols/macintosh_vndr/fr
-===================================================================
---- xkb-data.orig/symbols/macintosh_vndr/fr 2008-09-05 11:12:12.000000000
+0300
-+++ xkb-data/symbols/macintosh_vndr/fr 2009-12-14 17:42:07.000000000 +0200
-@@ -108,3 +108,10 @@
-
- key <AB06> { [ n, N, asciitilde,
dead_tilde ] };
- };
-+
-+partial alphanumeric_keys
-+xkb_symbols "mac" {
-+ // Alias to keep Gnome UI happy.
-+ // see https://bugs.launchpad.net/bugs/327963
-+ include "macintosh_vndr/fr(basic)"
-+};
-Index: xkb-data/symbols/macintosh_vndr/gb
-===================================================================
---- xkb-data.orig/symbols/macintosh_vndr/gb 2008-09-05 11:12:12.000000000
+0300
-+++ xkb-data/symbols/macintosh_vndr/gb 2009-12-14 17:42:07.000000000 +0200
-@@ -18,4 +18,9 @@
- include "level3(ralt_switch)"
- };
-
--
-+partial alphanumeric_keys
-+xkb_symbols "mac" {
-+ // Alias to keep Gnome UI happy.
-+ // see https://bugs.launchpad.net/bugs/327963
-+ include "macintosh_vndr/gb(basic)"
-+};
-Index: xkb-data/symbols/macintosh_vndr/is
-===================================================================
---- xkb-data.orig/symbols/macintosh_vndr/is 2009-03-30 23:04:17.000000000
+0300
-+++ xkb-data/symbols/macintosh_vndr/is 2009-12-14 17:42:07.000000000 +0200
-@@ -126,3 +126,10 @@
- include "macintosh_vndr/is(basic)" // for consistent naming
- name[Group1]= "Iceland - Mac, eliminate dead keys";
- };
-+
-+partial alphanumeric_keys
-+xkb_symbols "mac" {
-+ // Alias to keep Gnome UI happy.
-+ // see https://bugs.launchpad.net/bugs/327963
-+ include "macintosh_vndr/is(basic)"
-+};
-Index: xkb-data/symbols/macintosh_vndr/it
-===================================================================
---- xkb-data.orig/symbols/macintosh_vndr/it 2008-09-05 11:12:12.000000000
+0300
-+++ xkb-data/symbols/macintosh_vndr/it 2009-12-14 17:42:07.000000000 +0200
-@@ -62,3 +62,9 @@
- include "level3(ralt_switch)"
- };
-
-+partial alphanumeric_keys
-+xkb_symbols "mac" {
-+ // Alias to keep Gnome UI happy.
-+ // see https://bugs.launchpad.net/bugs/327963
-+ include "macintosh_vndr/it(basic)"
-+};
-Index: xkb-data/symbols/macintosh_vndr/nl
-===================================================================
---- xkb-data.orig/symbols/macintosh_vndr/nl 2008-09-05 11:12:12.000000000
+0300
-+++ xkb-data/symbols/macintosh_vndr/nl 2009-12-14 17:42:07.000000000 +0200
-@@ -15,3 +15,9 @@
-
- };
-
-+partial alphanumeric_keys
-+xkb_symbols "mac" {
-+ // Alias to keep Gnome UI happy.
-+ // see https://bugs.launchpad.net/bugs/327963
-+ include "macintosh_vndr/nl(basic)"
-+};
-Index: xkb-data/symbols/macintosh_vndr/no
-===================================================================
---- xkb-data.orig/symbols/macintosh_vndr/no 2008-09-05 11:12:12.000000000
+0300
-+++ xkb-data/symbols/macintosh_vndr/no 2009-12-14 17:42:07.000000000 +0200
-@@ -50,3 +50,17 @@
- key <AD12> { [ diaeresis, asciicircum, asciitilde,
macron ] };
-
- };
-+
-+partial alphanumeric_keys
-+xkb_symbols "mac" {
-+ // Alias to keep Gnome UI happy.
-+ // see https://bugs.launchpad.net/bugs/327963
-+ include "macintosh_vndr/no(basic)"
-+};
-+
-+partial alphanumeric_keys
-+xkb_symbols "mac_nodeadkeys" {
-+ // Alias to keep Gnome UI happy.
-+ // see https://bugs.launchpad.net/bugs/327963
-+ include "macintosh_vndr/no(nodeadkeys)"
-+};
-Index: xkb-data/symbols/macintosh_vndr/pt
-===================================================================
---- xkb-data.orig/symbols/macintosh_vndr/pt 2008-09-05 11:12:12.000000000
+0300
-+++ xkb-data/symbols/macintosh_vndr/pt 2009-12-14 17:42:07.000000000 +0200
-@@ -61,3 +61,24 @@
- key <AC11> { [ asciitilde, asciicircum ] };
- key <AD12> { [ acute, grave ] };
- };
-+
-+partial alphanumeric_keys
-+xkb_symbols "mac" {
-+ // Alias to keep Gnome UI happy.
-+ // see https://bugs.launchpad.net/bugs/327963
-+ include "macintosh_vndr/pt(basic)"
-+};
-+
-+partial alphanumeric_keys
-+xkb_symbols "mac_nodeadkeys" {
-+ // Alias to keep Gnome UI happy.
-+ // see https://bugs.launchpad.net/bugs/327963
-+ include "macintosh_vndr/pt(nodeadkeys)"
-+};
-+
-+partial alphanumeric_keys
-+xkb_symbols "mac_sundeadkeys" {
-+ // Alias to keep Gnome UI happy.
-+ // see https://bugs.launchpad.net/bugs/327963
-+ include "macintosh_vndr/pt(sundeadkeys)"
-+};
-Index: xkb-data/symbols/macintosh_vndr/se
-===================================================================
---- xkb-data.orig/symbols/macintosh_vndr/se 2008-09-05 11:12:12.000000000
+0300
-+++ xkb-data/symbols/macintosh_vndr/se 2009-12-14 17:42:07.000000000 +0200
-@@ -44,3 +44,10 @@
- include "macintosh_vndr/se(basic)" // for consistent naming
- name[Group1]= "Sweden - Mac, eliminate dead keys";
- };
-+
-+partial alphanumeric_keys
-+xkb_symbols "mac" {
-+ // Alias to keep Gnome UI happy.
-+ // see https://bugs.launchpad.net/bugs/327963
-+ include "macintosh_vndr/se(basic)"
-+};
-Index: xkb-data/symbols/macintosh_vndr/us
-===================================================================
---- xkb-data.orig/symbols/macintosh_vndr/us 2008-09-05 11:12:12.000000000
+0300
-+++ xkb-data/symbols/macintosh_vndr/us 2009-12-14 17:42:07.000000000 +0200
-@@ -149,3 +149,10 @@
- // end modifier mappings
-
- };
-+
-+partial alphanumeric_keys
-+xkb_symbols "mac" {
-+ // Alias to keep Gnome UI happy.
-+ // see https://bugs.launchpad.net/bugs/327963
-+ include "macintosh_vndr/us(basic)"
-+};
diff --git a/debian/patches/103_swiss_legacy.patch
b/debian/patches/103_swiss_legacy.patch
deleted file mode 100644
index c6386c0..0000000
--- a/debian/patches/103_swiss_legacy.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-commit c3367736c4399443662815303f4d45bdd20a1302
-Author: Sergey V. Udaltsov <s...@gnome.org>
-Date: Tue Oct 13 10:00:12 2009 +0100
-
- Fixed default swiss variant, added legacy variant
-
- http://bugs.freedesktop.org/show_bug.cgi?id=24490
-
-Index: xkb-data/rules/base.xml.in
-===================================================================
---- xkb-data.orig/rules/base.xml.in 2009-12-14 17:42:07.000000000 +0200
-+++ xkb-data/rules/base.xml.in 2009-12-14 17:42:07.000000000 +0200
-@@ -3706,6 +3706,12 @@
- <variantList>
- <variant>
- <configItem>
-+ <name>legacy</name>
-+ <_description>Legacy</_description>
-+ </configItem>
-+ </variant>
-+ <variant>
-+ <configItem>
- <name>de_nodeadkeys</name>
- <_description>German, eliminate dead keys</_description>
- </configItem>
-Index: xkb-data/symbols/ch
-===================================================================
---- xkb-data.orig/symbols/ch 2009-03-30 23:04:17.000000000 +0300
-+++ xkb-data/symbols/ch 2009-12-14 17:42:07.000000000 +0200
-@@ -16,7 +16,7 @@
- key <AE04> { [ 4, ccedilla ] };
- key <AE05> { [ 5, percent ] };
- key <AE06> { [ 6, ampersand, notsign ] };
-- key <AE07> { [ 7, slash, brokenbar ] };
-+ key <AE07> { [ 7, slash, bar ] };
- key <AE08> { [ 8, parenleft, cent ] };
- key <AE09> { [ 9, parenright ] };
- key <AE10> { [ 0, equal ] };
-@@ -42,6 +42,14 @@
- };
-
- partial alphanumeric_keys
-+xkb_symbols "legacy" {
-+ include "ch(basic)"
-+
-+ name[Group1]= "Switzerland - Legacy";
-+ key <AE07> { [ 7, slash, brokenbar ] };
-+};
-+
-+partial alphanumeric_keys
- xkb_symbols "de" {
- include "ch(basic)"
- };
diff --git a/debian/patches/send-upstream/003_missing_inet_keys.diff
b/debian/patches/send-upstream/003_missing_inet_keys.diff
deleted file mode 100644
index 457e6cb..0000000
--- a/debian/patches/send-upstream/003_missing_inet_keys.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- xkeyboard-config-1.3/symbols/inet 2008-12-02 11:30:26.000000000 -0600
-+++ xkeyboard-config-1.3/symbols/inet.new 2008-12-02 14:43:19.000000000
-0600
-@@ -158,9 +158,9 @@
- key <I241> { [ XF86MailForward ] };
- key <I242> { [ XF86Save ] };
- key <I243> { [ XF86Documents ] };
--// key <I244> { [ ] }; // KEY_BATTERY
--// key <I245> { [ ] }; // KEY_BLUETOOTH
--// key <I246> { [ ] }; // KEY_WLAN
-+ key <I244> { [ XF86Battery ] };
-+ key <I245> { [ XF86Bluetooth ] };
-+ key <I246> { [ XF86WLAN ] };
- // key <I249> { [ ] }; // KEY_VIDEO_NEXT -- drive next video
source
- // key <I250> { [ ] }; // KEY_VIDEO_PREV -- drive previous
video source
- // key <I251> { [ ] }; // KEY_BRIGHTNESS_CYCLE -- bright up,
max++ == min
commit a51e801e2faf78046b75b4a19dbd3618b0879d17
Author: Bryce Harrington <br...@canonical.com>
Date: Tue Feb 1 14:40:38 2011 -0800
Patches from the ubuntu package.
These have sat in the ubuntu packaging for a long time, but look to me
like they should all rather go upstream instead.
diff --git a/debian/patches/104_macbook_expose_and_dashboard.patch
b/debian/patches/104_macbook_expose_and_dashboard.patch
new file mode 100644
index 0000000..36f843c
--- /dev/null
+++ b/debian/patches/104_macbook_expose_and_dashboard.patch
@@ -0,0 +1,38 @@
+diff -Nrup xkeyboard-config-1.7-patched/keycodes/evdev
xkeyboard-config-working/keycodes/evdev
+--- xkeyboard-config-1.7-patched/keycodes/evdev 2010-02-11
12:27:43.000000000 -0800
++++ xkeyboard-config-working/keycodes/evdev 2010-02-11 12:30:04.000000000
-0800
+@@ -189,6 +189,7 @@ default xkb_keycodes "evdev" {
+ <LNFD> = 109; // #define KEY_LINEFEED 101
+ <I120> = 120; // #define KEY_MACRO 112
+ <I126> = 126; // #define KEY_KPPLUSMINUS 118
++ <I128> = 128; // #define KEY_SCALE 120
+ <I129> = 129; // #define KEY_KPCOMMA 121
+ <I147> = 147; // #define KEY_MENU 139
+ <I148> = 148; // #define KEY_CALC 140
+@@ -238,6 +239,7 @@ default xkb_keycodes "evdev" {
+ <I209> = 209; // #define KEY_PAUSECD 201
+ <I210> = 210; // #define KEY_PROG3 202
+ <I211> = 211; // #define KEY_PROG4 203 conflicts with
AB11
++ <I212> = 212; // #define KEY_DASHBOARD 204
+ <I213> = 213; // #define KEY_SUSPEND 205
+ <I214> = 214; // #define KEY_CLOSE 206
+ <I215> = 215; // #define KEY_PLAY 207
+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" {
+
+ // 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" {
+ key <I209> { [ XF86AudioPause ] };
+ key <I210> { [ XF86Launch3 ] };
+ key <I211> { [ XF86Launch4 ] };
++ key <I212> { [ XF86LaunchB ] };
+ key <I213> { [ XF86Suspend ] };
+ key <I214> { [ XF86Close ] };
+ key <I215> { [ XF86AudioPlay ] };
diff --git a/debian/patches/105_intelligent_keyboard.patch
b/debian/patches/105_intelligent_keyboard.patch
new file mode 100644
index 0000000..6781906
--- /dev/null
+++ b/debian/patches/105_intelligent_keyboard.patch
@@ -0,0 +1,67 @@
+diff --git a/rules/base.lists.part b/rules/base.lists.part
+index d1927c5..69de1f6 100644
+--- a/rules/base.lists.part
++++ b/rules/base.lists.part
+@@ -67,7 +67,8 @@
+ sk1300 sk2500 sk6200 sk7100 \
+ sven sven303 symplon \
+ tm2030USB 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 f43e651..4038bcd 100644
+--- a/rules/base.xml.in
++++ b/rules/base.xml.in
+@@ -1196,6 +1196,13 @@
+ <vendor>Creative</vendor>
+ </configItem>
+ </model>
++ <model>
++ <configItem>
++ <name>intelligent_keyboard_k04</name>
++ <description>Intelligent Keyboard K04</description>
++ <vendor>Generic</vendor>
++ </configItem>
++ </model>
+ </modelList>
+ <layoutList>
+ <layout>
+diff --git a/symbols/inet b/symbols/inet
+index f6cd6ac..e9b5a59 100644
+--- a/symbols/inet
++++ b/symbols/inet
+@@ -1821,3 +1821,30 @@ partial alphanumeric_keys
+ xkb_symbols "pc105" {
+ include "inet(media_nav_acpi_common)"
+ };
++
++//Intelligent Keyboard
++
++//Intelligent Keyboard K04
++partial alphanumeric_keys
++xkb_symbols "intelligent_keyboard_k04" {
++ key <I22> { [ XF86AudioPlay, XF86AudioPause ] };
++ key <I10> { [ XF86AudioPrev ] };
++ key <I24> { [ XF86AudioStop ] };
++ key <I19> { [ XF86AudioNext ] };
++ key <I6D> { [ XF86AudioMedia ] };
++ key <I30> { [ XF86AudioRaiseVolume ] };
++ key <I20> { [ XF86AudioMute ] };
++ key <I2E> { [ XF86AudioLowerVolume ] };
++ key <I6A> { [ XF86Back ] };
++ key <I69> { [ XF86Forward ] };
++ key <I68> { [ XF86Stop ] };
++ key <I67> { [ XF86Refresh ] };
++ key <I65> { [ XF86Search ] };
++ key <I66> { [ XF86Favorites ] };
++ key <I32> { [ XF86HomePage ] };
++ key <I6C> { [ XF86Mail ] };
++ key <I63> { [ XF86WakeUp ] };
++ key <I6B> { [ XF86MyComputer ] };
++ key <I21> { [ XF86Calculator ] };
++ key <I5F> { [ XF86Sleep ] };
++};
diff --git a/debian/patches/107_lao.patch b/debian/patches/107_lao.patch
new file mode 100644
index 0000000..2a8159e
--- /dev/null
+++ b/debian/patches/107_lao.patch
@@ -0,0 +1,115 @@
+Index: xkeyboard-config/symbols/la
+===================================================================
+--- xkeyboard-config.orig/symbols/la 2010-03-23 23:10:19.000000000 +0800
++++ xkeyboard-config/symbols/la 2010-03-25 16:15:03.000000000 +0800
+@@ -75,3 +75,80 @@
+ [ Shift_R, ISO_Last_Group ]
+ };
+ };
++
++partial
++xkb_symbols "stea" {
++
++ // Describes the differences between a very simple US/ASCII
++ // keyboard and a Lao keyboard
++ // This keymap uses the proposed Lao keyboard standard by the
++ // PAN Localization Project
++ // Science Technology and Environment Agency of Lao PDR
++ // National University Computer and Emergency Science of Pakistan
++ // International Development Research Center
++ // Caveat: assigning multiple codepoints to a single key doesn't
++ // work in XKB. Therefor the combining codepoint assignments
++ // have been omitted.
++
++
++ name[Group1]= "Laos - STEA (proposed standard layout)";
++
++ // Alphanumeric section
++ key <TLDE> { [ quotedbl, apostrophe ]};
++ key <AE01> { [ 0x1000ea2, 1, 0x1000ed1 ]};
++ key <AE02> { [ 0x1000e9f, 2, 0x1000ed2 ]};
++ key <AE03> { [ 0x1000ec2, 3, 0x1000ed3 ]};
++ key <AE04> { [ 0x1000e96, 4, 0x1000ed4 ]};
++ key <AE05> { [ 0x1000eb8, 0x1000ecc, 0x1000ed5 ]};
++ key <AE06> { [ 0x1000eb9, 0x1000ebc, 0x1000ed6 ]};
++ key <AE07> { [ 0x1000e84, 5, 0x1000ed7 ]};
++ key <AE08> { [ 0x1000e95, 6, 0x1000ed8 ]};
++ key <AE09> { [ 0x1000e88, 7, 0x1000ed9 ]};
++ key <AE10> { [ 0x1000e82, 8, 0x1000ed0 ]};
++ key <AE11> { [ 0x1000e8a, 9 ]};
++ key <AE12> { [ 0x1000ecd ]};
++
++ key <AD01> { [ 0x1000ebb ]};
++ key <AD02> { [ 0x1000ec4, 0 ]};
++ key <AD03> { [ 0x1000eb3, asterisk ]};
++ key <AD04> { [ 0x1000e9e, underscore ]};
++ key <AD05> { [ 0x1000eb0, plus ]};
++ key <AD06> { [ 0x1000eb4 ]};
++ key <AD07> { [ 0x1000eb5 ]};
++ key <AD08> { [ 0x1000eae, 0x1000ea3 ]};
++ key <AD09> { [ 0x1000e99, 0x1000edc ]};
++ key <AD10> { [ 0x1000e8d, 0x1000ebd ]};
++ key <AD11> { [ 0x1000e9a, minus ]};
++ key <AD12> { [ 0x1000ea5 ]};
++ key <BKSL> { [ slash, backslash ]};
++
++ key <AC01> { [ 0x1000eb1 ]};
++ key <AC02> { [ 0x1000eab, semicolon ]};
++ key <AC03> { [ 0x1000e81, period ]};
++ key <AC04> { [ 0x1000e94, comma ]};
++ key <AC05> { [ 0x1000ec0, colon ]};
++ key <AC06> { [ 0x1000ec9, 0x1000eca ]};
++ key <AC07> { [ 0x1000ec8, 0x1000ecb ]};
++ key <AC08> { [ 0x1000eb2, exclam ]};
++ key <AC09> { [ 0x1000eaa, question ]};
++ key <AC10> { [ 0x1000ea7, percent ]};
++ key <AC11> { [ 0x1000e87, equal ]};
++
++ key <AB01> { [ 0x1000e9c, 0x10020ad ]};
++ key <AB02> { [ 0x1000e9b, parenleft ]};
++ key <AB03> { [ 0x1000ec1, 0x1000eaf ]};
++ key <AB04> { [ 0x1000ead, x ]};
++ key <AB05> { [ 0x1000eb6 ]};
++ key <AB06> { [ 0x1000eb7 ]};
++ key <AB07> { [ 0x1000e97, 0x1000ec6 ]};
++ key <AB08> { [ 0x1000ea1, 0x1000edd ]};
++ key <AB09> { [ 0x1000ec3, dollar ]};
++ key <AB10> { [ 0x1000e9d, parenright ]};
++
++ key <SPCE> { [ space, nobreakspace, nobreakspace ]};
++
++ key <KPDL> { [ comma, period ]};
++
++ include "level3(ralt_switch)"
++
++};
+Index: xkeyboard-config/rules/base.xml.in
+===================================================================
+--- xkeyboard-config.orig/rules/base.xml.in 2010-03-23 23:11:48.000000000
+0800
++++ xkeyboard-config/rules/base.xml.in 2010-03-23 23:11:48.000000000 +0800
+@@ -2928,7 +2928,24 @@
+ <_description>Laos</_description>
+ <languageList><iso639Id>lao</iso639Id></languageList>
+ </configItem>
+- <variantList/>
++ <variantList>
++ <variant>
++ <configItem>
++ <name>basic</name>
++ <_description>Laos</_description>
++ <languageList><iso639Id>lao</iso639Id>
++ </languageList>
++ </configItem>
++ </variant>
++ <variant>
++ <configItem>
++ <name>stea</name>
++ <_description>Laos - STEA (proposed standard layout)</_description>
++ <languageList><iso639Id>lao</iso639Id>
++ </languageList>
++ </configItem>
++ </variant>
++ </variantList>
+ </layout>
+ <layout>
+ <configItem>
diff --git a/debian/patches/108_taiwan.patch b/debian/patches/108_taiwan.patch
new file mode 100644
index 0000000..f242e9d
--- /dev/null
+++ b/debian/patches/108_taiwan.patch
@@ -0,0 +1,141 @@
+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
+@@ -0,0 +1,73 @@
++// $XKeyboardConfig$
++
++partial default alphanumeric_keys
++xkb_symbols "tw" {
++
++ name[Group1]= "Taiwan";
++
++ include "us(basic)"
++
++ // Alphanumeric section
++ key <TLDE> { [ grave, asciitilde, dead_grave, dead_tilde ] };
++ key <AE01> { [ 1, exclam, U030D, exclamdown ] };
++ key <AE02> { [ 2, at, U0358, twosuperior ] };
++ key <AE03> { [ 3, numbersign, section, threesuperior ] };
++ key <AE04> { [ 4, dollar, yen, sterling ] };
++ key <AE05> { [ 5, percent, EuroSign, cent ] };
++ key <AE06> { [ 6,asciicircum, dead_circumflex, dead_caron ] };
++ key <AE07> { [ 7, ampersand, dead_acute, NoSymbol ] };
++ key <AE08> { [ 8, asterisk, dead_cedilla, dead_horn ] };
++ key <AE09> { [ 9, parenleft, dead_ogonek, dead_breve ] };
++ key <AE10> { [ 0, parenright, dead_abovedot, dead_abovering ] };
++ key <AE11> { [ minus, underscore, dead_macron, plusminus ] };
++ key <AE12> { [ equal, plus, multiply, division ] };
++
++ key <AD01> { [ q, Q, paragraph, degree ] };
++ key <AD03> { [ e, E, eacute, Eacute ] };
++ key <AD04> { [ r, R, U1E5F, U1E5E ] };
++ key <AD05> { [ t, T, U1E6F, U1E6E ] };
++ key <AD06> { [ y, Y, U1E73, U1E72 ] };
++ key <AD07> { [ u, U, U0289, U0244 ] };
++ key <AD08> { [ i, I, U0268, U0197 ] };
++ key <AD09> { [ o, O, oslash, Ooblique ] };
++
++ key <AC02> { [ s, S, ssharp, NoSymbol ] };
++ key <AC03> { [ d, D, U1E0F, U1E0E ] };
++ key <AC05> { [ g, G, eng, ENG ] };
++ key <AC10> { [ semicolon, colon, U02D0, dead_diaeresis ] };
++ key <AC11> { [apostrophe, quotedbl, U02BC, dead_doubleacute ] };
++
++ key <AB03> { [ c, C, ccedilla, Ccedilla ] };
++ key <AB06> { [ n, N, ntilde, Ntilde ] };
++ key <AB07> { [ m, M, mu, mu ] };
++ key <AB08> { [ comma, less, dead_belowcomma, guillemotleft ] };
++ key <AB09> { [ period, greater, dead_belowdot, guillemotright ] };
++ key <AB10> { [ slash, question, questiondown, dead_hook ] };
++ key <BKSL> { [ backslash, bar, notsign, brokenbar ] };
++
++ include "level3(ralt_switch)"
++};
++
++partial alphanumeric_keys
++xkb_symbols "indigenous" {
++
++ name[Group1]= "Taiwan - Indigenous";
++
++ include "tw(tw)"
++
++ key <AC11> { [ U02BC, quotedbl, apostrophe, dead_doubleacute ]
};
++
++ include "level3(ralt_switch)"
++};
++
++partial alphanumeric_keys
++xkb_symbols "saisiyat" {
++
++ name[Group1]= "Taiwan - Saisiyat";
++
++ include "tw(indigenous)"
++
++ key <AC10> { [ U02D0, colon, semicolon, dead_diaeresis ] };
++
++ 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 43772bd20ea81ddc8444f9a7a16b612335a0d2cf
Author: Bryce Harrington <br...@canonical.com>
Date: Tue Feb 1 14:09:28 2011 -0800
Merge from debian of 2.1 release.
* Merge from debian of 2.1 release. 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
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1pkp3n-0002ed...@alioth.debian.org
