xkb-data: Changes to 'ubuntu'
ABOUT-NLS | 768 -
AUTHORS | 7
BUGS | 70
CREDITS | 3
ChangeLog | 9796 --------------------
Makefile.am | 6
NEWS | 31
README | 56
autogen.sh | 5
compat/Makefile.am | 13
compat/README | 14
compat/accessx | 10
compat/basic | 11
compat/caps | 15
compat/complete | 2
compat/default | 12
compat/iso9995 | 13
compat/japan | 24
compat/keypad | 58
compat/ledcaps | 35
compat/lednum | 33
compat/ledscroll | 35
compat/level5 | 31
compat/misc | 68
compat/mousekeys | 153
compat/norepeat | 9
compat/olpc | 44
compat/pc | 10
compat/pc98 | 17
compat/xfree86 | 4
compat/xtest | 23
configure.ac | 125
configure.in | 133
debian/changelog | 190
debian/compat | 2
debian/control | 12
debian/patches/105_intelligent_keyboard.patch | 68
debian/patches/108_fix_intltool_make_check.diff | 19
debian/patches/109_fr_oss_space_char.patch | 22
debian/patches/110_dead_hook_horn.patch | 21
debian/patches/111_cz_ssharp.patch | 21
debian/patches/112_dk_dvorak_tilde.patch | 18
debian/patches/113_ossmath_is_five_levels.patch | 42
debian/patches/114_shift_f10.patch | 36
debian/patches/revert-goodmap-badmap-for-apple.diff | 13
debian/patches/series | 8
debian/rules | 4
debian/watch | 2
debian/xkb-data.postinst | 30
docs/README.enhancing | 10
docs/README.symbols | 45
geometry/Makefile.am | 8
geometry/dell | 4
geometry/hhk | 2
geometry/hp | 23
geometry/kinesis | 4
geometry/macintosh | 5
geometry/microsoft | 8
geometry/pc | 7
geometry/sun | 2320 ----
geometry/teck | 627 +
geometry/typematrix | 62
keycodes/Makefile.am | 7
keycodes/olpc | 24
keycodes/sun | 804 -
keycodes/xfree86 | 4
keymap/Makefile.am | 12
keymap/README | 6
keymap/amiga | 15
keymap/ataritt | 14
keymap/digital_vndr/Makefile.am | 4
keymap/digital_vndr/us | 187
keymap/macintosh | 15
keymap/sgi_vndr/Makefile.am | 12
keymap/sgi_vndr/be | 32
keymap/sgi_vndr/bg | 18
keymap/sgi_vndr/ca | 32
keymap/sgi_vndr/ch | 65
keymap/sgi_vndr/cz | 29
keymap/sgi_vndr/de | 32
keymap/sgi_vndr/dk | 32
keymap/sgi_vndr/dvorak | 14
keymap/sgi_vndr/en_US | 56
keymap/sgi_vndr/es | 32
keymap/sgi_vndr/fi | 32
keymap/sgi_vndr/fr | 32
keymap/sgi_vndr/gb | 32
keymap/sgi_vndr/hu | 104
keymap/sgi_vndr/it | 32
keymap/sgi_vndr/jp | 7
keymap/sgi_vndr/no | 32
keymap/sgi_vndr/pl | 28
keymap/sgi_vndr/pt | 32
keymap/sgi_vndr/ru | 104
keymap/sgi_vndr/se | 32
keymap/sgi_vndr/sk | 29
keymap/sgi_vndr/th | 16
keymap/sgi_vndr/us | 42
keymap/sony | 32
keymap/sun_vndr/Makefile.am | 7
keymap/sun_vndr/all | 1091 --
keymap/sun_vndr/de | 77
keymap/sun_vndr/es | 59
keymap/sun_vndr/fi | 59
keymap/sun_vndr/fr | 59
keymap/sun_vndr/no | 59
keymap/sun_vndr/pl | 59
keymap/sun_vndr/ru | 59
keymap/sun_vndr/se | 54
keymap/sun_vndr/uk | 59
keymap/sun_vndr/us | 67
keymap/xfree86 | 374
keymap/xfree98 | 33
po/bg.po | 4969 +++++-----
po/ca.po | 5221 +++++-----
po/cs.po | 5351 +++++-----
po/da.po | 5132 +++++-----
po/de.po | 5052 +++++-----
po/el.po | 5086 ++++++----
po/eo.po | 5084 +++++-----
po/es.po | 5043 +++++-----
po/fi.po | 5603 +++++++----
po/fr.po | 5235 +++++-----
po/gl.po | 5293 +++++++---
po/hr.po | 3913 +++++++
po/hu.po | 5076 +++++-----
po/id.po | 4808 ++++++---
po/ja.po | 4799 +++++----
po/ko.po | 5141 +++++-----
po/lt.po | 4978 +++++-----
po/nl.po | 5689 ++++++-----
po/pl.po | 5029 +++++-----
po/pt_BR.po | 4396 ++++++++
po/ru.po | 5109 +++++-----
po/sl.po | 2108 ++--
po/sv.po | 5312 ++++++----
po/tr.po | 5781 ++++++++---
po/uk.po | 5092 +++++-----
po/vi.po | 4863 ++++++---
po/xkeyboard-config.pot | 3913 -------
po/zh_TW.po | 4335 ++++++--
rules/HDR | 1
rules/Makefile.am | 11
rules/base.extras.xml.in | 596 +
rules/base.lists.base.part | 55
rules/base.lists.part | 66
rules/base.m_g.part | 9
rules/base.m_k.part | 6
rules/base.m_s.part | 3
rules/base.ml1_s.part | 3
rules/base.ml2_s.part | 1
rules/base.ml3_s.part | 1
rules/base.ml4_s.part | 1
rules/base.ml_c.part | 3
rules/base.ml_s.part | 20
rules/base.ml_s1.part | 1
rules/base.mlv_s.part | 1
rules/base.o_s.part | 19
rules/base.xml.in | 907 +
rules/compat/base.l1v1_c.part | 2
rules/compat/base.l2v2_c.part | 2
rules/compat/base.l3v3_c.part | 2
rules/compat/base.l4v4_c.part | 2
rules/compat/base.lv_c.part | 2
rules/compat/layoutsMapping.lst | 1
rules/evdev.lists.part | 1
rules/evdev.m_k.part | 2
rules/evdev.m_s.part | 1
semantics/Makefile.am | 9
semantics/basic | 6
semantics/complete | 6
semantics/default | 6
semantics/xtest | 6
symbols/Makefile.am | 14
symbols/ad | 31
symbols/af | 24
symbols/al | 66
symbols/altwin | 114
symbols/am | 41
symbols/apl | 75
symbols/ara | 208
symbols/at | 2
symbols/az | 10
symbols/ba | 26
symbols/bd | 10
symbols/be | 23
symbols/bg | 494 -
symbols/br | 170
symbols/brai | 4
symbols/bt | 6
symbols/bw | 4
symbols/by | 8
symbols/ca | 47
symbols/capslock | 60
symbols/cd | 31
symbols/ch | 48
symbols/cm | 166
symbols/cn | 34
symbols/compose | 35
symbols/ctrl | 88
symbols/cz | 250
symbols/de | 254
symbols/dk | 24
symbols/ee | 15
symbols/empty | 2
symbols/epo | 29
symbols/es | 81
symbols/et | 2
symbols/eu | 62
symbols/fi | 112
symbols/fo | 4
symbols/fr | 202
symbols/fujitsu_vndr/jp | 2
symbols/fujitsu_vndr/us | 3
symbols/gb | 32
symbols/ge | 6
symbols/gh | 20
symbols/gn | 2
symbols/gr | 15
symbols/group | 323
symbols/hp_vndr/us | 5
symbols/hr | 83
symbols/hu | 5
symbols/ie | 6
symbols/il | 212
symbols/in | 662 +
symbols/inet | 300
symbols/iq | 2
symbols/ir | 177
symbols/is | 202
symbols/it | 74
symbols/jp | 135
symbols/ke | 12
symbols/keypad | 165
symbols/kg | 2
symbols/kh | 8
symbols/kr | 55
symbols/kz | 6
symbols/la | 83
symbols/latam | 63
symbols/latin | 28
symbols/level3 | 135
symbols/level5 | 93
symbols/lk | 96
symbols/lt | 17
symbols/lv | 29
symbols/ma | 4
symbols/macintosh_vndr/ch | 26
symbols/macintosh_vndr/de | 16
symbols/macintosh_vndr/dk | 40
symbols/macintosh_vndr/fi | 6
symbols/macintosh_vndr/fr | 6
symbols/macintosh_vndr/gb | 6
symbols/macintosh_vndr/it | 4
symbols/macintosh_vndr/latam | 4
symbols/macintosh_vndr/nl | 6
symbols/macintosh_vndr/no | 20
symbols/macintosh_vndr/pt | 7
symbols/macintosh_vndr/se | 20
symbols/macintosh_vndr/us | 21
symbols/mao | 7
symbols/md | 90
symbols/me | 22
symbols/mk | 4
symbols/ml | 2
symbols/mm | 4
symbols/mn | 4
symbols/mt | 2
symbols/mv | 27
symbols/nec_vndr/jp | 4
symbols/ng | 8
symbols/nl | 14
symbols/no | 86
symbols/nokia_vndr/su-8w | 7
symbols/np | 4
symbols/olpc | 8
symbols/pc | 47
symbols/ph | 4
symbols/pk | 113
symbols/pl | 241
symbols/pt | 135
symbols/ro | 17
symbols/rs | 508 -
symbols/ru | 914 +
symbols/se | 94
symbols/sharp_vndr/Makefile.am | 8
symbols/sharp_vndr/sl-c3x00 | 71
symbols/sharp_vndr/ws003sh | 70
symbols/sharp_vndr/ws007sh | 70
symbols/sharp_vndr/ws011sh | 75
symbols/sharp_vndr/ws020sh | 64
symbols/shift | 29
symbols/si | 19
symbols/sk | 155
symbols/sn | 2
symbols/sony_vndr/us | 4
symbols/srvr_ctrl | 51
symbols/sun_vndr/Makefile.am | 2
symbols/sun_vndr/ara | 171
symbols/sun_vndr/be | 83
symbols/sun_vndr/br | 72
symbols/sun_vndr/ca | 93
symbols/sun_vndr/ch | 103
symbols/sun_vndr/cz | 58
symbols/sun_vndr/de | 169
symbols/sun_vndr/dk | 97
symbols/sun_vndr/ee | 48
symbols/sun_vndr/es | 120
symbols/sun_vndr/fi | 63
symbols/sun_vndr/fr | 131
symbols/sun_vndr/gb | 79
symbols/sun_vndr/gr | 73
symbols/sun_vndr/it | 103
symbols/sun_vndr/jp | 883 -
symbols/sun_vndr/kr | 94
symbols/sun_vndr/lt | 65
symbols/sun_vndr/lv | 104
symbols/sun_vndr/nl | 88
symbols/sun_vndr/no | 106
symbols/sun_vndr/pl | 84
symbols/sun_vndr/pt | 113
symbols/sun_vndr/ro | 62
symbols/sun_vndr/ru | 155
symbols/sun_vndr/se | 252
symbols/sun_vndr/sk | 48
symbols/sun_vndr/solaris | 235
symbols/sun_vndr/tr | 95
symbols/sun_vndr/tuv | 261
symbols/sun_vndr/tw | 60
symbols/sun_vndr/ua | 72
symbols/sun_vndr/us | 445
symbols/sy | 89
symbols/terminate | 2
symbols/th | 8
symbols/tj | 196
symbols/tm | 10
symbols/tr | 422
symbols/tw | 32
symbols/typo | 108
symbols/tz | 2
symbols/ua | 489
symbols/us | 373
symbols/uz | 61
symbols/vn | 7
symbols/xfree68_vndr/amiga | 7
symbols/xfree68_vndr/ataritt | 9
symbols/za | 62
tests/genLists4Comparizon.sh | 6
types/Makefile.am | 6
types/README | 6
types/basic | 13
types/caps | 27
types/extra | 71
types/iso9995 | 6
types/level5 | 35
types/mousekeys | 6
types/nokia | 3
types/numpad | 8
types/pc | 33
xkbrules.am | 14
360 files changed, 92987 insertions(+), 81493 deletions(-)
New commits:
commit f49f2bba249fc799ca901cbefa19028de0a34d3a
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Fri Jan 22 10:35:50 2016 +0200
release to xenial
diff --git a/debian/changelog b/debian/changelog
index 8f0fce4..0c91b67 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
-xkeyboard-config (2.16-1ubuntu1) UNRELEASED; urgency=medium
+xkeyboard-config (2.16-1ubuntu1) xenial; urgency=medium
- * Merge with Debian, remaining changes:
+ * Merge with Debian (LP: #1536385, #575978), remaining changes:
- control, rules, xkb-data-i18n.install, xkb-data.install: Split out
xkb-data-i18n to be used by console-setup.
- xkb-data.postinst.in: Remove the xkb cache to make sure it gets
@@ -8,7 +8,7 @@ xkeyboard-config (2.16-1ubuntu1) UNRELEASED; urgency=medium
* Drop 105_intelligent_keyboard.patch, never made upstream and seems to
be redundant by now anyway.
- -- Timo Aaltonen <tjaalton@debian.org> Fri, 22 Jan 2016 09:59:53 +0200
+ -- Timo Aaltonen <tjaalton@debian.org> Fri, 22 Jan 2016 10:32:50 +0200
xkeyboard-config (2.16-1) unstable; urgency=medium
commit 8e10de513b499a6fec53dc82404ef48fadaad76d
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Fri Jan 22 10:20:55 2016 +0200
rules: xkeyboard-config.pot got removed upstream, no need to move it aside
diff --git a/debian/rules b/debian/rules
index 6444a58..96cebc4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,7 +21,6 @@ override_dh_auto_configure:
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:
commit 57792cb1e078d73c3eb483d1f63f6480d72a0799
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Fri Jan 22 10:03:17 2016 +0200
drop patch 105, never made upstream and looks redundant anyway
diff --git a/debian/changelog b/debian/changelog
index 7969b29..8f0fce4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,9 +5,8 @@ xkeyboard-config (2.16-1ubuntu1) UNRELEASED; urgency=medium
xkb-data-i18n to be used by console-setup.
- xkb-data.postinst.in: Remove the xkb cache to make sure it gets
regenerated.
- - 105_intelligent_keyboard.patch: Add support for the Intelligent
- Keyboard K04. Not accepted upstream, so is a candidate for being
- dropped in a future upload.
+ * Drop 105_intelligent_keyboard.patch, never made upstream and seems to
+ be redundant by now anyway.
-- Timo Aaltonen <tjaalton@debian.org> Fri, 22 Jan 2016 09:59:53 +0200
diff --git a/debian/patches/105_intelligent_keyboard.patch b/debian/patches/105_intelligent_keyboard.patch
deleted file mode 100644
index 8a31557..0000000
--- a/debian/patches/105_intelligent_keyboard.patch
+++ /dev/null
@@ -1,78 +0,0 @@
---- a/rules/base.lists.base.part
-+++ b/rules/base.lists.base.part
-@@ -36,7 +36,8 @@
- sk1300 sk2500 sk6200 sk7100 \
- sven sven303 symplon \
- toshiba_s3000 trust trustda \
-- unitekkb1925 yahoo
-+ unitekkb1925 yahoo \
-+ intelligent_keyboard_k04
-
- ! $inetmediakbds = acer_ferrari4k acer_laptop btc5090 btc9019u cherryblueb \
- cherrybluea herrycyboard chicony042 compaqik13 compaqik18 \
---- a/rules/base.xml.in
-+++ b/rules/base.xml.in
-@@ -1290,6 +1290,13 @@
- </model>
- <model>
- <configItem>
-+ <name>intelligent_keyboard_k04</name>
-+ <description>Intelligent Keyboard K04</description>
-+ <vendor>Generic</vendor>
-+ </configItem>
-+ </model>
-+ <model>
-+ <configItem>
- <name>htcdream</name>
- <_description>Htc Dream phone</_description>
- <vendor>htc</vendor>
---- a/rules/evdev.xml.in
-+++ b/rules/evdev.xml.in
-@@ -1290,6 +1290,13 @@
- </model>
- <model>
- <configItem>
-+ <name>intelligent_keyboard_k04</name>
-+ <description>Intelligent Keyboard K04</description>
-+ <vendor>Generic</vendor>
-+ </configItem>
-+ </model>
-+ <model>
-+ <configItem>
- <name>htcdream</name>
- <_description>Htc Dream phone</_description>
- <vendor>htc</vendor>
---- a/symbols/inet
-+++ b/symbols/inet
-@@ -1851,6 +1851,31 @@
- };
-
-
-+//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 ] };
-+};
-+
- // HTC Dream
- partial alphanumeric_keys
- xkb_symbols "htcdream" {
diff --git a/debian/patches/series b/debian/patches/series
index 67f4434..85f937c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,2 @@
docs.diff
revert-goodmap-badmap-for-apple.diff
-
-
-105_intelligent_keyboard.patch
commit 2ce2839e3a1dfd0bf52d152a0f49a676c72ea786
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Fri Jan 22 10:02:34 2016 +0200
update changelog
diff --git a/debian/changelog b/debian/changelog
index 76a9e51..7969b29 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+xkeyboard-config (2.16-1ubuntu1) UNRELEASED; urgency=medium
+
+ * Merge with Debian, remaining changes:
+ - control, rules, xkb-data-i18n.install, xkb-data.install: Split out
+ xkb-data-i18n to be used by console-setup.
+ - xkb-data.postinst.in: Remove the xkb cache to make sure it gets
+ regenerated.
+ - 105_intelligent_keyboard.patch: Add support for the Intelligent
+ Keyboard K04. Not accepted upstream, so is a candidate for being
+ dropped in a future upload.
+
+ -- Timo Aaltonen <tjaalton@debian.org> Fri, 22 Jan 2016 09:59:53 +0200
+
xkeyboard-config (2.16-1) unstable; urgency=medium
* Team upload.
commit 8838ce8d38d0c142f7b1b8b66f1abbca3c4d6124
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Fri Jan 22 09:57:32 2016 +0200
import 2.12-1ubuntu1
diff --git a/debian/changelog b/debian/changelog
index a8cf49b..30b0fc8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+xkeyboard-config (2.12-1ubuntu1) utopic; urgency=medium
+
+ * Merge with Debian unstable, remaining changes:
+ - control, rules, xkb-data-i18n.install, xkb-data.install: Split out
+ xkb-data-i18n to be used by console-setup.
+ - xkb-data.postinst.in: Remove the xkb cache to make sure it gets
+ regenerated.
+ - 105_intelligent_keyboard.patch: Add support for the Intelligent
+ Keyboard K04. Not accepted upstream, so is a candidate for being
+ dropped in a future upload.
+
+ -- Dmitry Shachnev <mitya57@ubuntu.com> Sun, 22 Jun 2014 19:19:04 +0400
+
xkeyboard-config (2.12-1) unstable; urgency=medium
* New upstream release
@@ -8,6 +21,21 @@ xkeyboard-config (2.12-1) unstable; urgency=medium
-- Julien Cristau <jcristau@debian.org> Fri, 06 Jun 2014 17:44:52 +0200
+xkeyboard-config (2.11-1ubuntu1) utopic; urgency=medium
+
+ * Merge with Debian unstable, remaining changes:
+ - control, rules, xkb-data-i18n.install, xkb-data.install: Split out
+ xkb-data-i18n to be used by console-setup.
+ - xkb-data.postinst.in: Remove the xkb cache to make sure it gets
+ regenerated.
+ - 105_intelligent_keyboard.patch: Add support for the Intelligent
+ Keyboard K04.
+ * Dropped bengali_to_bangla.patch, applied upstream.
+ * Dropped 108_fix_intltool_make_check.diff, seems to be no longer
+ needed.
+
+ -- Dmitry Shachnev <mitya57@ubuntu.com> Tue, 13 May 2014 16:15:55 +0400
+
xkeyboard-config (2.11-1) unstable; urgency=medium
[ Lior Kaplan ]
@@ -25,6 +53,29 @@ xkeyboard-config (2.11-1) unstable; urgency=medium
-- Julien Cristau <jcristau@debian.org> Tue, 13 May 2014 00:09:58 +0200
+xkeyboard-config (2.10.1-1ubuntu1) trusty; urgency=low
+
+ [ Dmitry Shachnev ]
+ * Merge with Debian unstable, remaining changes:
+ - control, rules, xkb-data-i18n.install, xkb-data.install: Split out
+ xkb-data-i18n to be used by console-setup.
+ - xkb-data.postinst.in: Remove the xkb cache to make sure it gets
+ regenerated.
+ - 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.
+ - Add multi-arch support.
+ * Dropped change (Ubuntu 12.04 LTS has a version newer than 1.9):
+ - Migrate settings from dvorak-intl to dvorak-alt-intl to match rename
+ in xkeyboard-config 1.9.
+
+ [ Gunnar Hjalmarsson ]
+ * debian/patches/bengali_to_bangla.patch:
+ Use the modern language name Bangla instead of Bengali (LP: #991002).
+
+ -- Dmitry Shachnev <mitya57@ubuntu.com> Sun, 29 Dec 2013 11:43:52 +0400
+
xkeyboard-config (2.10.1-1) unstable; urgency=low
[ Dmitry Shachnev ]
@@ -38,6 +89,37 @@ xkeyboard-config (2.10.1-1) unstable; urgency=low
-- Julien Cristau <jcristau@debian.org> Sun, 22 Dec 2013 16:37:56 +0100
+xkeyboard-config (2.5.1-3ubuntu2) saucy; urgency=low
+
+ * debian/patches/git_audio_mic_mute.patch: Add XF86AudioMicMute mappings,
+ thanks James M Leddy (lp: #408903)
+
+ -- Sebastien Bacher <seb128@ubuntu.com> Fri, 17 May 2013 19:09:15 +0200
+
+xkeyboard-config (2.5.1-3ubuntu1) raring; urgency=low
+
+ * Merge from Debian unstable. Remaining Ubuntu changes:
+ + control, rules, xkb-data-i18n.install, xkb-data.install: Split out
+ xkb-data-i18n to be used by console-setup.
+ + 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)
+ + Remove the xkb cache to make sure it gets regenerated.
+ + 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.
+ + 110_dead_hook_horn.patch: Add two deadkeys on level 3 and 4 of the
+ j key for the latin keymap. (LP: #825624)
+ + 111_cz_ssharp.patch: Fix mapping of 4th level of the AC11 key to
+ ssharp rather than quotedbl for the Czech layout. Cherrypick of
+ patch from upstream. (LP: #953477)
+ + 112_dk_dvorak_tilde.patch: Fix tilde key in the Danish Dvorak layout. It's
+ not the same as Norwegian as has been assumed previously. (LP: #989626)
+ * Add multi-arch support (Closes: #677884)
+
+ -- Benjamin Drung <bdrung@ubuntu.com> Sun, 03 Feb 2013 01:08:43 +0100
+
xkeyboard-config (2.5.1-3) unstable; urgency=low
* Cherry-picks from upstream:
@@ -183,7 +265,7 @@ xkeyboard-config (2.3-1ubuntu2) oneiric; urgency=low
This time move the original file away during build, and restore
on clean. (LP: #868554)
- -- Timo Aaltonen <tjaalton@batty> Wed, 05 Oct 2011 23:34:45 +0300
+ -- Timo Aaltonen <tjaalton@ubuntu.com> Wed, 05 Oct 2011 23:34:45 +0300
xkeyboard-config (2.3-1ubuntu1) oneiric; urgency=low
diff --git a/debian/control b/debian/control
index 3546159..efbd358 100644
--- a/debian/control
+++ b/debian/control
@@ -37,6 +37,8 @@ Description: X Keyboard Extension (XKB) configuration data
Package: xkb-data-i18n
Architecture: all
+Multi-Arch: foreign
+Depends: ${misc:Depends}
Description: X Keyboard Extension (XKB) configuration data translations
This package contains translations used by xkb-data. Users should
not install this package.
diff --git a/debian/patches/105_intelligent_keyboard.patch b/debian/patches/105_intelligent_keyboard.patch
index 4b90902..8a31557 100644
--- a/debian/patches/105_intelligent_keyboard.patch
+++ b/debian/patches/105_intelligent_keyboard.patch
@@ -1,8 +1,6 @@
-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 @@
+--- a/rules/base.lists.base.part
++++ b/rules/base.lists.base.part
+@@ -36,7 +36,8 @@
sk1300 sk2500 sk6200 sk7100 \
sven sven303 symplon \
toshiba_s3000 trust trustda \
@@ -10,13 +8,27 @@ index 50d1980..d92c1a9 100644
+ 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
+ ! $inetmediakbds = acer_ferrari4k acer_laptop btc5090 btc9019u cherryblueb \
+ cherrybluea herrycyboard chicony042 compaqik13 compaqik18 \
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
-@@ -1226,6 +1226,13 @@
+@@ -1290,6 +1290,13 @@
+ </model>
+ <model>
+ <configItem>
++ <name>intelligent_keyboard_k04</name>
++ <description>Intelligent Keyboard K04</description>
++ <vendor>Generic</vendor>
++ </configItem>
++ </model>
++ <model>
++ <configItem>
+ <name>htcdream</name>
+ <_description>Htc Dream phone</_description>
+ <vendor>htc</vendor>
+--- a/rules/evdev.xml.in
++++ b/rules/evdev.xml.in
+@@ -1290,6 +1290,13 @@
</model>
<model>
<configItem>
@@ -30,14 +42,12 @@ index 15581b7..350947c 100644
<name>htcdream</name>
<_description>Htc Dream phone</_description>
<vendor>htc</vendor>
-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)"
+@@ -1851,6 +1851,31 @@
};
+
+//Intelligent Keyboard K04
+partial alphanumeric_keys
+xkb_symbols "intelligent_keyboard_k04" {
diff --git a/debian/patches/108_fix_intltool_make_check.diff b/debian/patches/108_fix_intltool_make_check.diff
deleted file mode 100644
index 645e9fd..0000000
--- a/debian/patches/108_fix_intltool_make_check.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-Author: Christopher Halse Rogers <christopher.halse.rogers@canonical.com>
-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 --git a/debian/patches/109_fr_oss_space_char.patch b/debian/patches/109_fr_oss_space_char.patch
deleted file mode 100644
index a6b1c37..0000000
--- a/debian/patches/109_fr_oss_space_char.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-commit 518c769df2e9ce70cb721769a08b81504f243b2a
-Author: Sergey V. Udaltsov <svu@gnome.org>
-Date: Sat Mar 24 22:16:47 2012 +0000
-
- For fr(oss), some application can't handle space caracter properly
-
- https://bugs.freedesktop.org/show_bug.cgi?id=15804
-
-diff --git a/symbols/fr b/symbols/fr
-index c58eb0d..0bf0be2 100644
---- a/symbols/fr
-+++ b/symbols/fr
-@@ -125,7 +125,8 @@ xkb_symbols "oss" {
-
- include "latin"
- include "level3(ralt_switch)"
-- include "nbsp(level4nl)"
-+ include "nbsp(level4n)"
-+ include "level5(rctrl_switch)"
- include "keypad(oss)"
-
- name[Group1]="French (alternative)";
diff --git a/debian/patches/110_dead_hook_horn.patch b/debian/patches/110_dead_hook_horn.patch
deleted file mode 100644
index 0d66c35..0000000
--- a/debian/patches/110_dead_hook_horn.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-commit 0e88f0216f6410ba037fb40f5c4c375f3e82c042
-Author: Bryce Harrington <bryce@canonical.com>
-Date: Mon Apr 30 14:18:49 2012 -0700
-
- latin: Add dead_hook and dead_horn to J key level 3, 4
-
- Signed-off-by: Bryce Harrington <bryce@canonical.com>
-
-diff --git a/symbols/latin b/symbols/latin
-index 77b99d4..424768e 100644
---- a/symbols/latin
-+++ b/symbols/latin
-@@ -35,7 +35,7 @@ xkb_symbols "basic" {
- key <AC04> { [ f, F, dstroke, ordfeminine ] };
- key <AC05> { [ g, G, eng, ENG ] };
- key <AC06> { [ h, H, hstroke, Hstroke ] };
-- key <AC07> { [ j, J, j, J ] };
-+ key <AC07> { [ j, J, dead_hook, dead_horn ] };
- key <AC08> { [ k, K, kra, ampersand ] };
- key <AC09> { [ l, L, lstroke, Lstroke ] };
- key <AC10> { [ semicolon, colon, dead_acute, dead_doubleacute ] };
diff --git a/debian/patches/111_cz_ssharp.patch b/debian/patches/111_cz_ssharp.patch
deleted file mode 100644
index 77cfa7b..0000000
--- a/debian/patches/111_cz_ssharp.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-commit 8640e24c91e80675016458d50d7a1ad8546e32ff
-Author: Sergey V. Udaltsov <svu@gnome.org>
-Date: Sun Apr 8 05:41:11 2012 +0100
-
- Czech (qwerty) layout has " instead of ß in the 4th level
-
- https://bugs.freedesktop.org/show_bug.cgi?id=48252
-
-diff --git a/symbols/cz b/symbols/cz
-index 25fd54a..db3dd48 100644
---- a/symbols/cz
-+++ b/symbols/cz
-@@ -90,7 +90,7 @@ xkb_symbols "qwerty" {
-
- key <AB01> { [ z, Z, degree, NoSymbol ] };
- key <AC10> { [ uring, quotedbl, semicolon, colon ] };
-- key <AC11> { [ section, exclam, apostrophe, quotedbl ] };
-+ key <AC11> { [ section, exclam, apostrophe, ssharp ] };
- key <AD06> { [ y, Y, NoSymbol, NoSymbol ] };
- key <AD11> { [ uacute, slash, bracketleft, braceleft ] };
- key <AD12> { [parenright, parenleft, bracketright, braceright ] };
diff --git a/debian/patches/112_dk_dvorak_tilde.patch b/debian/patches/112_dk_dvorak_tilde.patch
deleted file mode 100644
index e43ebf9..0000000
--- a/debian/patches/112_dk_dvorak_tilde.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-commit a76516530698afb567230f367c04b804ebda044b
-Author: Sergey V. Udaltsov <svu@gnome.org>
-Date: Tue May 1 00:37:26 2012 +0100
-
- Added missing tilde to dk(dvorak)
-
- https://bugs.freedesktop.org/show_bug.cgi?id=49312
-
-diff --git a/symbols/dk b/symbols/dk
-index 1187a99..1deea28 100644
---- a/symbols/dk
-+++ b/symbols/dk
-@@ -69,4 +69,5 @@ xkb_symbols "dvorak" {
- include "no(dvorak)"
-
- name[Group1]= "Danish (Dvorak)";
-+ key <AD12> { [ asciitilde, asciicircum, dead_diaeresis, dead_tilde ] };
- };
diff --git a/debian/patches/113_ossmath_is_five_levels.patch b/debian/patches/113_ossmath_is_five_levels.patch
deleted file mode 100644
index 47765ea..0000000
--- a/debian/patches/113_ossmath_is_five_levels.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 98aba92ebb0720abfb4d676bdf29944decc6f7bf Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Thu, 21 Jun 2012 10:16:31 +1000
-Subject: [PATCH] symbols: ossmath is CTRL+ALT, not FOUR_LEVEL (#43541)
-
-having KPMU defined as FOUR_LEVEL, with 4 symbols only, triggers an xkb
-error when the keypad stuff picks up the CTRL+ALT (from x11) and waits for 5
-symbols instead.
-
-X.Org Bug 43541 <http://bugs.freedesktop.org/show_bug.cgi?id=43541>
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
----
- symbols/keypad | 11 +++++------
- 1 file changed, 5 insertions(+), 6 deletions(-)
-
-diff --git a/symbols/keypad b/symbols/keypad
-index 1bab391..b362ebc 100644
---- a/symbols/keypad
-+++ b/symbols/keypad
-@@ -267,13 +267,12 @@ xkb_symbols "legacymath" {
- partial keypad_keys
- xkb_symbols "ossmath" {
-
-- key.type[Group1]="FOUR_LEVEL_X" ;
--
-- key <KPDV> { [ KP_Divide, 0x1002215, 0x10000F7, XF86_Ungrab ] }; // / ∕ ÷ <XF86_Ungrab>
-- key <KPMU> { [ KP_Multiply, 0x10022C5, 0x10000D7, XF86_ClearGrab ] }; // * ⋅ × <XF86_ClearGrab>
-- key <KPSU> { [ KP_Subtract, 0x1002212, 0x1002212, XF86_Prev_VMode ] }; // - − − <XF86_Prev_VMode>
-+ key.type[Group1]="CTRL+ALT" ;
-
-- key <KPAD> { [ KP_Add, 0x100002B, 0x100002B, XF86_Next_VMode ] }; // + + + <XF86_Next_VMode>
-+ key <KPDV> { [ KP_Divide, 0x1002215, 0x10000F7, VoidSymbol, XF86_Ungrab ] }; // / ∕ ÷ <XF86_Ungrab>
-+ key <KPMU> { [ KP_Multiply, 0x10022C5, 0x10000D7, VoidSymbol, XF86_ClearGrab ] }; // * ⋅ × <XF86_ClearGrab>
-+ key <KPSU> { [ KP_Subtract, 0x1002212, 0x1002212, VoidSymbol, XF86_Prev_VMode ] }; // - − − <XF86_Prev_VMode>
-+ key <KPAD> { [ KP_Add, 0x100002B, 0x100002B, VoidSymbol, XF86_Next_VMode ] }; // + + + <XF86_Next_VMode>
-
- };
-
---
-1.7.10.2
-
diff --git a/debian/patches/114_shift_f10.patch b/debian/patches/114_shift_f10.patch
deleted file mode 100644
index ff2685b..0000000
--- a/debian/patches/114_shift_f10.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-commit a4f62448819764f6f27ebcb86115734d0d57ea8d
-Author: Sergey V. Udaltsov <svu@gnome.org>
-Date: Sun Sep 2 08:57:52 2012 +0100
-
- Fixed Shift-F10 behaviour
-
- Preserving shift is essential for many applications
- https://bugs.freedesktop.org/show_bug.cgi?id=45008
-
-diff --git a/types/pc b/types/pc
-index 01a5634..daebe74 100644
---- a/types/pc
-+++ b/types/pc
-@@ -59,17 +59,19 @@ partial default xkb_types "default" {
- };
-
- type "CTRL+ALT" {
-- modifiers = Control+Alt+Shift+LevelThree;
-+ modifiers = Control+Alt+Shift+LevelThree;
- map[None] = Level1;
- map[Shift] = Level2;
- map[LevelThree] = Level3;
- map[Shift+LevelThree] = Level4;
-- map[Control+Alt] = Level5;
-+ map[Control+Alt] = Level5;
-+ preserve[Shift] = Shift;
-+ preserve[Shift+LevelThree] = Shift;
- level_name[Level1] = "Base";
- level_name[Level2] = "Shift";
- level_name[Level3] = "Alt Base";
- level_name[Level4] = "Shift Alt";
-- level_name[Level5] = "Ctrl+Alt";
-+ level_name[Level5] = "Ctrl+Alt";
- };
-
- // Local eight level
diff --git a/debian/patches/series b/debian/patches/series
index d5a7052..16f2a72 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,10 +2,3 @@ docs.diff
revert-goodmap-badmap-for-apple.diff
fr-oss-rctrl.diff
105_intelligent_keyboard.patch
-108_fix_intltool_make_check.diff
-#109_fr_oss_space_char.patch
-110_dead_hook_horn.patch
-111_cz_ssharp.patch
-112_dk_dvorak_tilde.patch
-113_ossmath_is_five_levels.patch
-114_shift_f10.patch
diff --git a/debian/xkb-data.postinst b/debian/xkb-data.postinst
index 33dd7f0..b856128 100644
--- a/debian/xkb-data.postinst
Reply to: