xkb-data: Changes to 'debian-unstable'
ABOUT-NLS | 768 --
AUTHORS | 7
BUGS | 70
CREDITS | 3
Makefile.am | 4
NEWS | 16
README | 38
autogen.sh | 5
compat/Makefile.am | 13
compat/default | 12
compat/iso9995 | 4
compat/keypad | 58
compat/level5 | 2
compat/norepeat | 9
configure.ac | 125
configure.in | 133
debian/changelog | 12
debian/control | 2
debian/patches/preserve-shift.diff | 37
debian/patches/revert-goodmap-badmap-for-apple.diff | 13
debian/patches/series | 1
debian/rules | 3
debian/watch | 2
docs/README.symbols | 45
geometry/Makefile.am | 6
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/typematrix | 62
keycodes/Makefile.am | 7
keycodes/olpc | 24
keycodes/sun | 804 --
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 | 4836 +++++++++--------
po/ca.po | 4885 +++++++++--------
po/da.po | 4890 +++++++++--------
po/de.po | 4864 +++++++++--------
po/eo.po | 4880 +++++++++--------
po/fr.po | 5055 +++++++++---------
po/gl.po | 4385 ++++++++++------
po/hr.po | 3913 ++++++++++++++
po/hu.po | 4887 +++++++++--------
po/id.po | 4000 ++++++++------
po/ja.po | 4799 +++++++++--------
po/ko.po | 4939 +++++++++---------
po/lt.po | 4769 +++++++++--------
po/nl.po | 5473 ++++++++++----------
po/pl.po | 4829 +++++++++--------
po/pt_BR.po | 4197 +++++++++++++++
po/ru.po | 4881 +++++++++--------
po/sl.po | 2108 ++++---
po/uk.po | 4876 +++++++++--------
po/xkeyboard-config.pot | 3305 ++++++------
po/zh_TW.po | 4335 ++++++++++++---
rules/base.extras.xml.in | 460 +
rules/base.lists.part | 20
rules/base.m_g.part | 9
rules/base.m_k.part | 6
rules/base.m_s.part | 2
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.mlv_s.part | 1
rules/base.o_s.part | 12
rules/base.xml.in | 373 +
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/compat/layoutsMapping.lst | 1
rules/evdev.m_k.part | 2
semantics/Makefile.am | 9
semantics/basic | 6
semantics/complete | 6
semantics/default | 6
semantics/xtest | 6
symbols/Makefile.am | 12
symbols/ad | 31
symbols/af | 2
symbols/al | 2
symbols/altwin | 93
symbols/am | 33
symbols/apl | 27
symbols/ara | 53
symbols/az | 10
symbols/ba | 2
symbols/bd | 6
symbols/be | 23
symbols/bg | 2
symbols/br | 9
symbols/brai | 2
symbols/bt | 2
symbols/bw | 2
symbols/by | 2
symbols/ca | 20
symbols/capslock | 36
symbols/cd | 31
symbols/ch | 25
symbols/cm | 11
symbols/cn | 2
symbols/compose | 35
symbols/ctrl | 44
symbols/cz | 11
symbols/de | 121
symbols/dk | 10
symbols/ee | 11
symbols/empty | 2
symbols/epo | 26
symbols/es | 69
symbols/et | 2
symbols/fi | 23
symbols/fo | 2
symbols/fr | 203
symbols/fujitsu_vndr/us | 1
symbols/gb | 16
symbols/ge | 4
symbols/gh | 2
symbols/gn | 2
symbols/gr | 9
symbols/hp_vndr/us | 5
symbols/hr | 2
symbols/hu | 2
symbols/ie | 2
symbols/il | 82
symbols/in | 362 +
symbols/inet | 4
symbols/iq | 2
symbols/ir | 8
symbols/is | 4
symbols/it | 66
symbols/jp | 125
symbols/ke | 2
symbols/keypad | 115
symbols/kg | 2
symbols/kh | 2
symbols/kr | 11
symbols/kz | 2
symbols/la | 47
symbols/latam | 2
symbols/latin | 28
symbols/level3 | 133
symbols/level5 | 93
symbols/lk | 2
symbols/lt | 7
symbols/lv | 25
symbols/ma | 2
symbols/macintosh_vndr/ch | 25
symbols/macintosh_vndr/de | 16
symbols/macintosh_vndr/dk | 38
symbols/macintosh_vndr/fi | 6
symbols/macintosh_vndr/fr | 2
symbols/macintosh_vndr/gb | 6
symbols/macintosh_vndr/it | 3
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 | 17
symbols/mao | 2
symbols/md | 90
symbols/me | 20
symbols/mk | 2
symbols/ml | 2
symbols/mm | 4
symbols/mn | 4
symbols/mt | 2
symbols/mv | 25
symbols/nec_vndr/jp | 4
symbols/ng | 2
symbols/nl | 12
symbols/no | 72
symbols/nokia_vndr/su-8w | 7
symbols/np | 4
symbols/olpc | 8
symbols/pc | 45
symbols/ph | 2
symbols/pk | 111
symbols/pl | 232
symbols/pt | 16
symbols/ro | 17
symbols/rs | 10
symbols/ru | 36
symbols/se | 31
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 | 2
symbols/sk | 9
symbols/sn | 2
symbols/sony_vndr/us | 4
symbols/srvr_ctrl | 31
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 | 159
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 | 84
symbols/sun_vndr/lt | 65
symbols/sun_vndr/lv | 104
symbols/sun_vndr/nl | 88
symbols/sun_vndr/no | 106
symbols/sun_vndr/pl | 82
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 | 2
symbols/tj | 2
symbols/tm | 2
symbols/tr | 9
symbols/tw | 28
symbols/typo | 41
symbols/tz | 2
symbols/ua | 12
symbols/us | 242
symbols/uz | 8
symbols/vn | 7
symbols/xfree68_vndr/amiga | 7
symbols/xfree68_vndr/ataritt | 9
symbols/za | 2
tests/genLists4Comparizon.sh | 6
types/Makefile.am | 6
types/level5 | 1
types/pc | 8
xkbrules.am | 14
306 files changed, 61669 insertions(+), 51054 deletions(-)
New commits:
commit 8fd23f44cb72e0229127c9c5a13626d769311093
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Dec 19 12:48:28 2013 +0100
Revert "Switch to 3.0 (quilt) source format."
This reverts commit 21837e1867421e3e5a0c6b64f3c4792a0c6900fc.
Conflicts:
debian/changelog
diff --git a/debian/changelog b/debian/changelog
index e46bcd8..bb374f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,6 @@ xkeyboard-config (2.10.1-1) UNRELEASED; urgency=low
* Update debian/watch for new tarballs location (closes: #727812).
* Disable autopoint, it causes build failure and we use intltoolize
instead.
- * Switch to 3.0 (quilt) source format.
* Bump Standards-Version to 3.9.5, no changes needed.
-- Dmitry Shachnev <mitya57@gmail.com> Fri, 08 Nov 2013 16:26:21 +0400
diff --git a/debian/rules b/debian/rules
index ad05838..9f29877 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,11 +6,6 @@ override_dh_autoreconf:
intltoolize -c -f
AUTOPOINT=true dh_autoreconf autoreconf -- -vfi
-override_dh_auto_clean:
- dh_auto_clean
- find . -name Makefile.in -delete
- rm -f aclocal.m4 compile config.sub configure
-
override_dh_auto_configure:
dh_auto_configure -- \
--with-xkb-rules-symlink=xfree86,xorg \
@@ -34,8 +29,13 @@ override_dh_auto_install:
find $(CURDIR)/debian/xkb-data-udeb/usr/share/X11 -type f -print0 \
| xargs -0 perl -i -pe 's/[ \t]+/ /g'
+# Work around quilt's removing empty files:
+override_dh_quilt_unpatch:
+ dh_quilt_unpatch
+ touch rules/base.o_k.part
+
override_dh_builddeb:
dh_builddeb -- -Zxz
%:
- dh $@ --with autoreconf --builddirectory=build/
+ dh $@ --with quilt,autoreconf --builddirectory=build/
diff --git a/debian/source/format b/debian/source/format
deleted file mode 100644
index 163aaf8..0000000
--- a/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (quilt)
commit 74f5a7d8ec2b21c6a36529b6f9e31b106b52e799
Author: Dmitry Shachnev <mitya57@gmail.com>
Date: Fri Nov 8 16:26:56 2013 +0400
Close #718730 and #727812.
diff --git a/debian/changelog b/debian/changelog
index 62e367a..e46bcd8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,15 +1,15 @@
xkeyboard-config (2.10.1-1) UNRELEASED; urgency=low
- * New upstream release.
+ * New upstream release (closes: #718730).
* Refresh revert-goodmap-badmap-for-apple.diff.
* Drop preserve-shift.diff, applied upstream.
- * Update debian/watch for new tarballs location.
+ * Update debian/watch for new tarballs location (closes: #727812).
* Disable autopoint, it causes build failure and we use intltoolize
instead.
* Switch to 3.0 (quilt) source format.
* Bump Standards-Version to 3.9.5, no changes needed.
- -- Dmitry Shachnev <mitya57@gmail.com> Mon, 04 Nov 2013 18:07:05 +0400
+ -- Dmitry Shachnev <mitya57@gmail.com> Fri, 08 Nov 2013 16:26:21 +0400
xkeyboard-config (2.5.1-3) unstable; urgency=low
commit 988df75b9c075d6dd7fc01b59904b67efb63390d
Author: Dmitry Shachnev <mitya57@gmail.com>
Date: Mon Nov 4 18:57:00 2013 +0400
Bump Standards-Version to 3.9.5, no changes needed.
diff --git a/debian/changelog b/debian/changelog
index 4fcce78..62e367a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ xkeyboard-config (2.10.1-1) UNRELEASED; urgency=low
* Disable autopoint, it causes build failure and we use intltoolize
instead.
* Switch to 3.0 (quilt) source format.
+ * Bump Standards-Version to 3.9.5, no changes needed.
-- Dmitry Shachnev <mitya57@gmail.com> Mon, 04 Nov 2013 18:07:05 +0400
diff --git a/debian/control b/debian/control
index f54d1cd..4953601 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Build-Depends-Indep:
intltool,
xsltproc,
xutils-dev (>= 1:7.6+2),
-Standards-Version: 3.9.1
+Standards-Version: 3.9.5
Vcs-Git: git://git.debian.org/git/pkg-xorg/data/xkb-data
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/data/xkb-data.git
Homepage: http://www.freedesktop.org/Software/XKeyboardConfig
commit 21837e1867421e3e5a0c6b64f3c4792a0c6900fc
Author: Dmitry Shachnev <mitya57@gmail.com>
Date: Mon Nov 4 19:08:14 2013 +0400
Switch to 3.0 (quilt) source format.
diff --git a/debian/changelog b/debian/changelog
index 79e8327..4fcce78 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ xkeyboard-config (2.10.1-1) UNRELEASED; urgency=low
* Update debian/watch for new tarballs location.
* Disable autopoint, it causes build failure and we use intltoolize
instead.
+ * Switch to 3.0 (quilt) source format.
-- Dmitry Shachnev <mitya57@gmail.com> Mon, 04 Nov 2013 18:07:05 +0400
diff --git a/debian/rules b/debian/rules
index 9f29877..ad05838 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,11 @@ override_dh_autoreconf:
intltoolize -c -f
AUTOPOINT=true dh_autoreconf autoreconf -- -vfi
+override_dh_auto_clean:
+ dh_auto_clean
+ find . -name Makefile.in -delete
+ rm -f aclocal.m4 compile config.sub configure
+
override_dh_auto_configure:
dh_auto_configure -- \
--with-xkb-rules-symlink=xfree86,xorg \
@@ -29,13 +34,8 @@ override_dh_auto_install:
find $(CURDIR)/debian/xkb-data-udeb/usr/share/X11 -type f -print0 \
| xargs -0 perl -i -pe 's/[ \t]+/ /g'
-# Work around quilt's removing empty files:
-override_dh_quilt_unpatch:
- dh_quilt_unpatch
- touch rules/base.o_k.part
-
override_dh_builddeb:
dh_builddeb -- -Zxz
%:
- dh $@ --with quilt,autoreconf --builddirectory=build/
+ dh $@ --with autoreconf --builddirectory=build/
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
commit dda5c101fc1fe6bc5f0d9bf1c9955b09bddcd5fc
Author: Dmitry Shachnev <mitya57@gmail.com>
Date: Mon Nov 4 18:44:59 2013 +0400
Disable autopoint, it causes build failure.
diff --git a/debian/changelog b/debian/changelog
index 7c8ffee..79e8327 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ xkeyboard-config (2.10.1-1) UNRELEASED; urgency=low
* Refresh revert-goodmap-badmap-for-apple.diff.
* Drop preserve-shift.diff, applied upstream.
* Update debian/watch for new tarballs location.
+ * Disable autopoint, it causes build failure and we use intltoolize
+ instead.
-- Dmitry Shachnev <mitya57@gmail.com> Mon, 04 Nov 2013 18:07:05 +0400
diff --git a/debian/rules b/debian/rules
index e7a392f..9f29877 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,8 @@
xkb_base := /usr/share/X11/xkb
override_dh_autoreconf:
- dh_autoreconf -- sh -c 'intltoolize -c -f && autoreconf -vfi'
+ intltoolize -c -f
+ AUTOPOINT=true dh_autoreconf autoreconf -- -vfi
override_dh_auto_configure:
dh_auto_configure -- \
commit f42bfa99013494b694f18659041b18d9bc833151
Author: Dmitry Shachnev <mitya57@gmail.com>
Date: Mon Nov 4 18:12:50 2013 +0400
Update debian/watch for new tarballs location.
diff --git a/debian/changelog b/debian/changelog
index c5bd11a..7c8ffee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xkeyboard-config (2.10.1-1) UNRELEASED; urgency=low
* New upstream release.
* Refresh revert-goodmap-badmap-for-apple.diff.
* Drop preserve-shift.diff, applied upstream.
+ * Update debian/watch for new tarballs location.
-- Dmitry Shachnev <mitya57@gmail.com> Mon, 04 Nov 2013 18:07:05 +0400
diff --git a/debian/watch b/debian/watch
index 3dac745..338022c 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
#git=git://anongit.freedesktop.org/xkeyboard-config
version=3
-http://xorg.freedesktop.org/releases/individual/data/xkeyboard-config-(.*)\.tar\.gz
+http://xorg.freedesktop.org/releases/individual/data/xkeyboard-config/xkeyboard-config-(.*)\.tar\.gz
commit dceb5c0636729c34787f9b60ec6fbdda351201b1
Author: Dmitry Shachnev <mitya57@gmail.com>
Date: Mon Nov 4 18:11:48 2013 +0400
New upstream release (2.10.1).
Refresh revert-goodmap-badmap-for-apple.diff.
Drop preserve-shift.diff, applied upstream.
diff --git a/debian/changelog b/debian/changelog
index 9af7276..c5bd11a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xkeyboard-config (2.10.1-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+ * Refresh revert-goodmap-badmap-for-apple.diff.
+ * Drop preserve-shift.diff, applied upstream.
+
+ -- Dmitry Shachnev <mitya57@gmail.com> Mon, 04 Nov 2013 18:07:05 +0400
+
xkeyboard-config (2.5.1-3) unstable; urgency=low
* Cherry-picks from upstream:
diff --git a/debian/patches/preserve-shift.diff b/debian/patches/preserve-shift.diff
deleted file mode 100644
index 4b4960a..0000000
--- a/debian/patches/preserve-shift.diff
+++ /dev/null
@@ -1,37 +0,0 @@
-From a4f62448819764f6f27ebcb86115734d0d57ea8d Mon Sep 17 00:00:00 2001
-From: Sergey V. Udaltsov <svu@gnome.org>
-Date: Sun, 02 Sep 2012 07:57:52 +0000
-Subject: 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
---
-cgit v0.9.0.2-2-gbebe
diff --git a/debian/patches/revert-goodmap-badmap-for-apple.diff b/debian/patches/revert-goodmap-badmap-for-apple.diff
index f427448..3b6f8eb 100644
--- a/debian/patches/revert-goodmap-badmap-for-apple.diff
+++ b/debian/patches/revert-goodmap-badmap-for-apple.diff
@@ -18,8 +18,6 @@ Signed-off-by: Cyril Brulebois <kibi@debian.org>
rules/base.o_k.part | 2 ++
3 files changed, 13 insertions(+), 0 deletions(-)
-diff --git a/keycodes/macintosh b/keycodes/macintosh
-index d41ac4b..d1e0be8 100644
--- a/keycodes/macintosh
+++ b/keycodes/macintosh
@@ -36,6 +36,16 @@ default xkb_keycodes "macintosh" {
@@ -39,11 +37,9 @@ index d41ac4b..d1e0be8 100644
xkb_keycodes "old" {
minimum= 8;
-diff --git a/rules/base.m_k.part b/rules/base.m_k.part
-index dd0c391..794994c 100644
--- a/rules/base.m_k.part
+++ b/rules/base.m_k.part
-@@ -9,6 +9,7 @@
+@@ -7,6 +7,7 @@
$applealu = macintosh(alukbd)
macintosh_hhk = macintosh(hhk)
macintosh_old = macintosh(old)
@@ -51,13 +47,8 @@ index dd0c391..794994c 100644
$macs = macintosh
thinkpadz60 = xfree86(thinkpadz60)
* = xfree86
-diff --git a/rules/base.o_k.part b/rules/base.o_k.part
-index e69de29..53d2879 100644
---- a/rules/base.o_k.part
+--- /dev/null
+++ b/rules/base.o_k.part
@@ -0,0 +1,2 @@
+ apple:badmap = +macintosh(badmap)
+ apple:goodmap = +macintosh(goodmap)
---
-1.7.2.3
-
diff --git a/debian/patches/series b/debian/patches/series
index ed7ada3..85f937c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
docs.diff
revert-goodmap-badmap-for-apple.diff
-preserve-shift.diff
commit c8326b7d12b20eccfd38d661b95d9b23d8a56e27
Author: Sergey Udaltsov <sergey.udaltsov@gmail.com>
Date: Thu Oct 3 22:28:31 2013 +0100
Preparing 2.10.1
diff --git a/NEWS b/NEWS
index 03ffac4..c0db1c6 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,4 @@
+2.10.1 Critical fix
2.10 10+ bugs fixed
37 cleanup commits by Benno Schulenberg
Updated 12 translations
diff --git a/configure.ac b/configure.ac
index 12b6440..51f070c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(xkeyboard-config, 2.10)
+AC_INIT(xkeyboard-config, 2.10.1)
AC_CONFIG_SRCDIR(rules/base.xml.in)
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
commit 7c7f937a2203bdcdc3b2e7cbe55ddfc34cffe3ab
Author: Benno Schulenberg <bensberg@justemail.net>
Date: Wed Oct 2 11:54:38 2013 +0200
symbols/*: Separating the keyword 'default' with two spaces from any others.
To make it stand out a little more.
Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
diff --git a/symbols/af b/symbols/af
index 265c18e..972769b 100644
--- a/symbols/af
+++ b/symbols/af
@@ -10,7 +10,7 @@
//
// 2006-02-15 file created by M. Emal Alekozai <memala@gmx.net>
-default partial alphanumeric_keys
+default partial alphanumeric_keys
xkb_symbols "basic" {
name[Group1]= "Afghani";
diff --git a/symbols/al b/symbols/al
index ff33886..a8d6ec7 100644
--- a/symbols/al
+++ b/symbols/al
@@ -3,7 +3,7 @@
// done by Pablo Saratxaga <pablo@mandrakesoft.com>
//
-default partial alphanumeric_keys
+default partial alphanumeric_keys
xkb_symbols "basic" {
include "latin(type3)"
diff --git a/symbols/am b/symbols/am
index 9b092f4..b7cc6f6 100644
--- a/symbols/am
+++ b/symbols/am
@@ -1,6 +1,6 @@
// based on a keyboard map from an 'xkb/symbols/am' file
-default partial alphanumeric_keys
+default partial alphanumeric_keys
xkb_symbols "basic" {
name[Group1]= "Armenian";
diff --git a/symbols/apl b/symbols/apl
index ebc4115..4262d24 100644
--- a/symbols/apl
+++ b/symbols/apl
@@ -38,7 +38,7 @@
// better than using the "common" one. Choosing the complete Dyalog layout is not useful to non-Dyalog
// users.
-default partial alphanumeric_keys
+default partial alphanumeric_keys
xkb_symbols "basic" {
include "apl(dyalog_base)" // forward reference good APL keyboard without Dyalogs extras
diff --git a/symbols/ara b/symbols/ara
index 5ecffa4..71b50da 100644
--- a/symbols/ara
+++ b/symbols/ara
@@ -1,6 +1,6 @@
// based on a keyboard map from an 'xkb/symbols/ar' file
-default partial alphanumeric_keys
+default partial alphanumeric_keys
xkb_symbols "basic" {
name[Group1]= "Arabic";
diff --git a/symbols/az b/symbols/az
index cfdc93c..02330bc 100644
--- a/symbols/az
+++ b/symbols/az
@@ -1,7 +1,7 @@
// Symbols definition for a very simple Azerbaidjani keyboard layout.
// 2001 - Pablo Saratxaga <pablo@mandrakesoft.com>
-default partial alphanumeric_keys
+default partial alphanumeric_keys
xkb_symbols "latin" {
include "us"
diff --git a/symbols/ba b/symbols/ba
index 7345cc3..9a27cbd 100644
--- a/symbols/ba
+++ b/symbols/ba
@@ -1,4 +1,4 @@
-default partial alphanumeric_keys
+default partial alphanumeric_keys
xkb_symbols "basic" {
name[Group1]="Bosnian";
diff --git a/symbols/bd b/symbols/bd
index d4be368..6a70d51 100644
--- a/symbols/bd
+++ b/symbols/bd
@@ -14,7 +14,7 @@
// 3 Conjunct characters are not included
//
-default partial alphanumeric_keys
+default partial alphanumeric_keys
xkb_symbols "basic" {
name[Group1]= "Bengali";
key <ESC> { [ Escape ] };
diff --git a/symbols/be b/symbols/be
index ffb89e4..5e0eee5 100644
--- a/symbols/be
+++ b/symbols/be
@@ -1,6 +1,6 @@
// based on a keyboard map from an 'xkb/symbols/be' file
-default partial alphanumeric_keys
+default partial alphanumeric_keys
xkb_symbols "basic" {
include "latin"
diff --git a/symbols/bg b/symbols/bg
index 3b7fd4b..994380c 100644
--- a/symbols/bg
+++ b/symbols/bg
@@ -44,7 +44,7 @@
// Describes Bulgarian keyboard "BDS" modified according to the
// the new state standard BDS 5237:2006 and extended with symbols in
// levels 3 and 4.
-default partial alphanumeric_keys
+default partial alphanumeric_keys
xkb_symbols "bds" {
name[Group1]= "Bulgarian";
diff --git a/symbols/brai b/symbols/brai
index 036b56f..66364e6 100644
--- a/symbols/brai
+++ b/symbols/brai
@@ -1,5 +1,5 @@
// 10-dot patterns on the home row + v and n
-default partial alphanumeric_keys
+default partial alphanumeric_keys
xkb_symbols "home_row" {
include "brai(keypad)"
diff --git a/symbols/bt b/symbols/bt
index f76f13a..c02505e 100644
--- a/symbols/bt
+++ b/symbols/bt
@@ -13,7 +13,7 @@
// Version 1.0 2004-07-29 Some correction by Pema Geyleg <pema_geyleg@druknet.bt>
/////////////////////////////////////////////////////////////////
-default partial alphanumeric_keys
+default partial alphanumeric_keys
xkb_symbols "basic" {
name[Group1]= "Dzongkha";
diff --git a/symbols/bw b/symbols/bw
index 29fdc1c..48de2e2 100644
--- a/symbols/bw
+++ b/symbols/bw
@@ -1,4 +1,4 @@
-default partial alphanumeric_keys
+default partial alphanumeric_keys
xkb_symbols "tswana" {
include "us"
diff --git a/symbols/by b/symbols/by
index 443a764..00ecd6a 100644
--- a/symbols/by
+++ b/symbols/by
@@ -5,7 +5,7 @@
// Added third level with russian symbols
// See freedesktop.org bug #23604
-default partial alphanumeric_keys
+default partial alphanumeric_keys
xkb_symbols "basic" {
include "ru(winkeys)"
name[Group1]= "Belarusian";
diff --git a/symbols/ca b/symbols/ca
index b039c48..c4d37ad 100644
--- a/symbols/ca
+++ b/symbols/ca
@@ -1,4 +1,4 @@
-default partial
+default partial
xkb_symbols "fr" {
name[Group1] = "French (Canada)";
diff --git a/symbols/capslock b/symbols/capslock
index 8b315c6..337c5ef 100644
--- a/symbols/capslock
+++ b/symbols/capslock
@@ -1,4 +1,4 @@
-default partial hidden modifier_keys
+default partial hidden modifier_keys
xkb_symbols "capslock" {
replace key <CAPS> { [ Caps_Lock ] };
modifier_map Lock { Caps_Lock };
diff --git a/symbols/cd b/symbols/cd
index e5b09e8..a87c749 100644
--- a/symbols/cd
+++ b/symbols/cd
@@ -1,7 +1,7 @@
// based on us_intl keyboard map file and a Sinhala keyboard map
// version 0.3
-default partial alphanumeric_keys
+default partial alphanumeric_keys
xkb_symbols "basic" {
name[Group1]= "French (Democratic Republic of the Congo)";
diff --git a/symbols/ch b/symbols/ch
index 671c3c5..54663f1 100644
--- a/symbols/ch
+++ b/symbols/ch
@@ -1,4 +1,4 @@
-default partial alphanumeric_keys
+default partial alphanumeric_keys
xkb_symbols "basic" {
include "latin"
diff --git a/symbols/cm b/symbols/cm
index cdc8577..6404c97 100644
--- a/symbols/cm
+++ b/symbols/cm
@@ -36,8 +36,7 @@
// == Cameroon Dvorak ==
// Cameroon Dvorak is uses a similar system to Cameroon QWERTY.
-default
-partial alphanumeric_keys
+default partial alphanumeric_keys
xkb_symbols "basic" {
name[Group1]="English (Cameroon)";
diff --git a/symbols/cn b/symbols/cn
index 75ebbf6..e6b2c52 100644
--- a/symbols/cn
+++ b/symbols/cn
@@ -1,7 +1,7 @@
//
// Default Chinese is the same as American
//
-default partial alphanumeric_keys
+default partial alphanumeric_keys
xkb_symbols "basic" {
include "us(basic)"
diff --git a/symbols/cz b/symbols/cz
index 3d31700..20af4b2 100644
--- a/symbols/cz
+++ b/symbols/cz
@@ -1,4 +1,4 @@
-default partial alphanumeric_keys
+default partial alphanumeric_keys
xkb_symbols "basic" {
// This layout conforms to a new cz compromise standard designed
diff --git a/symbols/dk b/symbols/dk
index 4619357..34667fc 100644
--- a/symbols/dk
+++ b/symbols/dk
@@ -1,6 +1,6 @@
// based on a keyboard map from an 'xkb/symbols/dk' file
-default partial alphanumeric_keys
+default partial alphanumeric_keys
xkb_symbols "basic" {
include "latin(type2)"
diff --git a/symbols/ee b/symbols/ee
index 61d865c..9384bee 100644
--- a/symbols/ee
+++ b/symbols/ee
@@ -2,7 +2,7 @@
// Estonian XKB-keymap by Ville Hallik <ville@linux.ee>
//
-default partial alphanumeric_keys
+default partial alphanumeric_keys
xkb_symbols "basic" {
// Describes the differences between a very simple en_US
diff --git a/symbols/empty b/symbols/empty
index cae3303..acdd677 100644
--- a/symbols/empty
+++ b/symbols/empty
@@ -1,4 +1,4 @@
-default partial alphanumeric_keys modifier_keys
+default partial alphanumeric_keys modifier_keys
xkb_symbols "basic" {
name[Group1]= "Empty";
};
diff --git a/symbols/epo b/symbols/epo
index ae73835..1f7f3fc 100644
--- a/symbols/epo
+++ b/symbols/epo
@@ -7,7 +7,7 @@
// Benno Schulenberg (Beno Sĥilenberĥ) <bensberg@justemail.net>
// Chusslove Illich (Ĉaslavo Iliĉo) <caslav.ilic@gmx.net>
Reply to: