libxkbcommon: Changes to 'debian-unstable'
COPYING | 27
Makefile.am | 62
NEWS | 44
PACKAGING | 50
README.md | 92
bench/.gitignore | 4
bench/compose.c | 63
bench/key-proc.c | 2
bench/rules.c | 60
bench/rulescomp.c | 53
configure.ac | 29
debian/changelog | 10
debian/control | 1
debian/libxkbcommon-dev.install | 2
debian/libxkbcommon-x11-0.symbols | 9
debian/libxkbcommon0.symbols | 175
debian/patches/0001-Remove-linux-input.h-include-from-test-x11comp.c.patch | 33
debian/patches/series | 1
debian/rules | 2
doc/Doxyfile.in | 18
doc/compat.md | 55
doc/doxygen-extra.css | 9
doc/quick-guide.md | 24
src/compat.c | 189
src/compose/parser.c | 759 +
src/compose/parser.h | 36
src/compose/paths.c | 204
src/compose/paths.h | 42
src/compose/state.c | 196
src/compose/table.c | 219
src/compose/table.h | 100
src/darray.h | 6
src/keymap.c | 6
src/keymap.h | 2
src/keysym.c | 12
src/keysym.h | 3
src/scanner-utils.h | 44
src/state.c | 2
src/xkbcomp/ast-build.c | 8
src/xkbcomp/keycodes.c | 9
src/xkbcomp/keymap-dump.c | 32
src/xkbcomp/keymap.c | 4
src/xkbcomp/parser.y | 12
src/xkbcomp/rules.c | 115
src/xkbcomp/scanner.c | 6
src/xkbcomp/symbols.c | 74
test/.gitignore | 2
test/common.c | 43
test/compose.c | 525
test/data/compat/accessx | 10
test/data/compat/basic | 11
test/data/compat/caps | 15
test/data/compat/complete | 2
test/data/compat/iso9995 | 9
test/data/compat/ledcaps | 35
test/data/compat/lednum | 33
test/data/compat/ledscroll | 35
test/data/compat/level5 | 31
test/data/compat/misc | 68
test/data/compat/mousekeys | 153
test/data/compat/pc | 10
test/data/compat/xfree86 | 4
test/data/compose/en_US.UTF-8/Compose | 5973 ++++++++++
test/data/keycodes/xfree86 | 4
test/data/keymaps/host.xkb | 17
test/data/keymaps/no-aliases.xkb | 460
test/data/keymaps/stringcomp.data | 17
test/data/rules/base | 111
test/data/rules/evdev | 57
test/data/symbols/altwin | 107
test/data/symbols/ca | 42
test/data/symbols/capslock | 60
test/data/symbols/ch | 35
test/data/symbols/ctrl | 88
test/data/symbols/cz | 173
test/data/symbols/de | 125
test/data/symbols/empty | 2
test/data/symbols/group | 323
test/data/symbols/il | 136
test/data/symbols/in | 517
test/data/symbols/inet | 264
test/data/symbols/keypad | 131
test/data/symbols/latin | 26
test/data/symbols/level3 | 115
test/data/symbols/level5 | 91
test/data/symbols/macintosh_vndr/apple | 141
test/data/symbols/macintosh_vndr/us | 145
test/data/symbols/pc | 45
test/data/symbols/ru | 838 -
test/data/symbols/shift | 29
test/data/symbols/srvr_ctrl | 51
test/data/symbols/terminate | 2
test/data/symbols/us | 174
test/data/sync.sh | 2
test/data/types/basic | 13
test/data/types/extra | 71
test/data/types/iso9995 | 6
test/data/types/level5 | 34
test/data/types/mousekeys | 6
test/data/types/numpad | 8
test/data/types/pc | 25
test/evdev-scancodes.h | 587
test/filecomp.c | 1
test/interactive-evdev.c | 68
test/interactive-x11.c | 2
test/keyseq.c | 33
test/rules-file.c | 48
test/rulescomp.c | 57
test/state.c | 2
test/test.h | 5
test/x11comp.c | 9
xkbcommon-x11.map | 9
xkbcommon.map | 87
xkbcommon/xkbcommon-compose.h | 483
xkbcommon/xkbcommon-x11.h | 73
xkbcommon/xkbcommon.h | 135
116 files changed, 12798 insertions(+), 3156 deletions(-)
New commits:
commit 9dca32d90765db1146f6b00a7c0ab4192114eb66
Author: Michael Stapelberg <stapelberg@debian.org>
Date: Mon May 18 19:53:20 2015 +0200
upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 3beaeca..c5bb46b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libxkbcommon (0.5.0-1) UNRELEASED; urgency=medium
+libxkbcommon (0.5.0-1) unstable; urgency=medium
* New upstream release.
* Drop debian/patches, applied upstream.
@@ -6,7 +6,7 @@ libxkbcommon (0.5.0-1) UNRELEASED; urgency=medium
(Closes: #723086)
* Enable --parallel (Thanks Pino Toscano) (Closes: #760621)
- -- Michael Stapelberg <stapelberg@debian.org> Mon, 18 May 2015 18:51:42 +0200
+ -- Michael Stapelberg <stapelberg@debian.org> Mon, 18 May 2015 19:53:18 +0200
libxkbcommon (0.4.3-2) unstable; urgency=high
commit 4714956ab903cb53a06f8d5f6090cb7dfb8c4960
Author: Michael Stapelberg <stapelberg@debian.org>
Date: Mon May 18 19:50:46 2015 +0200
Enable --parallel (Thanks Pino Toscano)
diff --git a/debian/changelog b/debian/changelog
index 6993fb5..3beaeca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ libxkbcommon (0.5.0-1) UNRELEASED; urgency=medium
* Drop debian/patches, applied upstream.
* libxkbcommon-dev: install documentation (Thanks Fernando Seiti Furusato)
(Closes: #723086)
+ * Enable --parallel (Thanks Pino Toscano) (Closes: #760621)
-- Michael Stapelberg <stapelberg@debian.org> Mon, 18 May 2015 18:51:42 +0200
diff --git a/debian/rules b/debian/rules
index 0e66ae2..f3d1103 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,7 +14,7 @@ override_dh_makeshlibs:
dh_makeshlibs -- -c4
%:
- dh $@ --with autoreconf,quilt
+ dh $@ --parallel --with autoreconf,quilt
# For maintainer use only, generate a tarball
commit acb9b9ec9e0343dbd796b0d7e249b842017c60de
Author: Michael Stapelberg <stapelberg@debian.org>
Date: Mon May 18 19:40:48 2015 +0200
libxkbcommon-dev: install documentation (Thanks Fernando Seiti Furusato)
diff --git a/debian/changelog b/debian/changelog
index 64406c4..6993fb5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ libxkbcommon (0.5.0-1) UNRELEASED; urgency=medium
* New upstream release.
* Drop debian/patches, applied upstream.
+ * libxkbcommon-dev: install documentation (Thanks Fernando Seiti Furusato)
+ (Closes: #723086)
-- Michael Stapelberg <stapelberg@debian.org> Mon, 18 May 2015 18:51:42 +0200
diff --git a/debian/control b/debian/control
index 6626a4d..5212dd8 100644
--- a/debian/control
+++ b/debian/control
@@ -18,6 +18,7 @@ Build-Depends:
x11proto-kb-dev (>= 1.0.5),
xkb-data,
xvfb,
+ doxygen,
Standards-Version: 3.9.5
Homepage: http://www.xkbcommon.org/
Vcs-Git: git://anonscm.debian.org/pkg-xorg/lib/libxkbcommon
diff --git a/debian/libxkbcommon-dev.install b/debian/libxkbcommon-dev.install
index 87b7f46..1c7f4ea 100644
--- a/debian/libxkbcommon-dev.install
+++ b/debian/libxkbcommon-dev.install
@@ -7,3 +7,4 @@ usr/include/xkbcommon/xkbcommon-names.h
usr/lib/*/libxkbcommon.a
usr/lib/*/libxkbcommon.so
usr/lib/*/pkgconfig/xkbcommon.pc
+usr/share/doc/libxkbcommon/* usr/share/doc/libxkbcommon-dev/
commit 3de3dd12dc09e00823e5870c2e0b44b714bc2804
Author: Michael Stapelberg <stapelberg@debian.org>
Date: Mon May 18 19:21:46 2015 +0200
update symbols file (new xkb_compose_* symbols, versions)
Upstream changed the initial version for all symbols to 0.5.0 in
https://github.com/xkbcommon/libxkbcommon/commit/b92f79240972a7eb9311039ee4e2eda2bca8039c
diff --git a/debian/libxkbcommon-x11-0.symbols b/debian/libxkbcommon-x11-0.symbols
index 1ff2fff..a891198 100644
--- a/debian/libxkbcommon-x11-0.symbols
+++ b/debian/libxkbcommon-x11-0.symbols
@@ -1,6 +1,7 @@
libxkbcommon-x11.so.0 libxkbcommon-x11-0 #MINVER#
* Build-Depends-Package: libxkbcommon-x11-dev
- xkb_x11_get_core_keyboard_device_id@Base 0.4.0
- xkb_x11_keymap_new_from_device@Base 0.4.0
- xkb_x11_setup_xkb_extension@Base 0.4.0
- xkb_x11_state_new_from_device@Base 0.4.0
+ V_0.5.0@V_0.5.0 0.5.0
+ xkb_x11_get_core_keyboard_device_id@V_0.5.0 0.5.0
+ xkb_x11_keymap_new_from_device@V_0.5.0 0.5.0
+ xkb_x11_setup_xkb_extension@V_0.5.0 0.5.0
+ xkb_x11_state_new_from_device@V_0.5.0 0.5.0
diff --git a/debian/libxkbcommon0.symbols b/debian/libxkbcommon0.symbols
index 8000529..eada08b 100644
--- a/debian/libxkbcommon0.symbols
+++ b/debian/libxkbcommon0.symbols
@@ -1,94 +1,85 @@
libxkbcommon.so.0 libxkbcommon0 #MINVER#
* Build-Depends-Package: libxkbcommon-dev
- xkb_context_get_log_level@Base 0.2.0
- xkb_context_get_log_verbosity@Base 0.2.0
- xkb_context_get_user_data@Base 0.2.0
- xkb_context_include_path_append@Base 0.2.0
- xkb_context_include_path_append_default@Base 0.2.0
- xkb_context_include_path_clear@Base 0.2.0
- xkb_context_include_path_get@Base 0.2.0
- xkb_context_include_path_reset_defaults@Base 0.2.0
- xkb_context_new@Base 0.2.0
- xkb_context_num_include_paths@Base 0.2.0
- xkb_context_ref@Base 0.2.0
- xkb_context_set_log_fn@Base 0.2.0
- xkb_context_set_log_level@Base 0.2.0
- xkb_context_set_log_verbosity@Base 0.2.0
- xkb_context_set_user_data@Base 0.2.0
- xkb_context_unref@Base 0.2.0
- xkb_key_get_syms@Base 0.2.0
- xkb_key_mod_index_is_consumed@Base 0.2.0
- xkb_key_mod_mask_remove_consumed@Base 0.2.0
- xkb_key_num_groups@Base 0.2.0
- xkb_key_repeats@Base 0.2.0
- xkb_keymap_get_as_string@Base 0.2.0
- xkb_keymap_key_for_each@Base 0.3.1
- xkb_keymap_key_get_syms_by_level@Base 0.2.0
- xkb_keymap_key_repeats@Base 0.2.0
- xkb_keymap_layout_get_index@Base 0.2.0
- xkb_keymap_layout_get_name@Base 0.2.0
- xkb_keymap_led_get_index@Base 0.2.0
- xkb_keymap_led_get_name@Base 0.2.0
- xkb_keymap_max_keycode@Base 0.3.1
- xkb_keymap_min_keycode@Base 0.3.1
- xkb_keymap_mod_get_index@Base 0.2.0
- xkb_keymap_mod_get_name@Base 0.2.0
- xkb_keymap_new_from_buffer@Base 0.3.1
- xkb_keymap_new_from_file@Base 0.2.0
- xkb_keymap_new_from_names@Base 0.2.0
- xkb_keymap_new_from_string@Base 0.2.0
- xkb_keymap_num_layouts@Base 0.2.0
- xkb_keymap_num_layouts_for_key@Base 0.2.0
- xkb_keymap_num_leds@Base 0.2.0
- xkb_keymap_num_levels_for_key@Base 0.2.0
- xkb_keymap_num_mods@Base 0.2.0
- xkb_keymap_ref@Base 0.2.0
- xkb_keymap_unref@Base 0.2.0
- xkb_keysym_from_name@Base 0.2.0
- xkb_keysym_get_name@Base 0.2.0
- xkb_keysym_to_utf32@Base 0.2.0
- xkb_keysym_to_utf8@Base 0.2.0
- xkb_map_get_as_string@Base 0.2.0
- xkb_map_group_get_index@Base 0.2.0
- xkb_map_group_get_name@Base 0.2.0
- xkb_map_led_get_index@Base 0.2.0
- xkb_map_led_get_name@Base 0.2.0
- xkb_map_mod_get_index@Base 0.2.0
- xkb_map_mod_get_name@Base 0.2.0
- xkb_map_new_from_file@Base 0.2.0
- xkb_map_new_from_names@Base 0.2.0
- xkb_map_new_from_string@Base 0.2.0
- xkb_map_num_groups@Base 0.2.0
- xkb_map_num_leds@Base 0.2.0
- xkb_map_num_mods@Base 0.2.0
- xkb_map_ref@Base 0.2.0
- xkb_map_unref@Base 0.2.0
- xkb_state_get_keymap@Base 0.2.0
- xkb_state_get_map@Base 0.2.0
- xkb_state_group_index_is_active@Base 0.2.0
- xkb_state_group_name_is_active@Base 0.2.0
- xkb_state_key_get_consumed_mods@Base 0.4.1
- xkb_state_key_get_layout@Base 0.2.0
- xkb_state_key_get_level@Base 0.2.0
- xkb_state_key_get_one_sym@Base 0.2.0
- xkb_state_key_get_syms@Base 0.2.0
- xkb_state_key_get_utf32@Base 0.4.1
- xkb_state_key_get_utf8@Base 0.4.1
- xkb_state_layout_index_is_active@Base 0.2.0
- xkb_state_layout_name_is_active@Base 0.2.0
- xkb_state_led_index_is_active@Base 0.2.0
- xkb_state_led_name_is_active@Base 0.2.0
- xkb_state_mod_index_is_active@Base 0.2.0
- xkb_state_mod_index_is_consumed@Base 0.2.0
- xkb_state_mod_indices_are_active@Base 0.2.0
- xkb_state_mod_mask_remove_consumed@Base 0.2.0
- xkb_state_mod_name_is_active@Base 0.2.0
- xkb_state_mod_names_are_active@Base 0.2.0
- xkb_state_new@Base 0.2.0
- xkb_state_ref@Base 0.2.0
- xkb_state_serialize_group@Base 0.2.0
- xkb_state_serialize_layout@Base 0.2.0
- xkb_state_serialize_mods@Base 0.2.0
- xkb_state_unref@Base 0.2.0
- xkb_state_update_key@Base 0.2.0
- xkb_state_update_mask@Base 0.2.0
+ V_0.5.0@V_0.5.0 0.5.0
+ xkb_compose_state_feed@V_0.5.0 0.5.0
+ xkb_compose_state_get_compose_table@V_0.5.0 0.5.0
+ xkb_compose_state_get_one_sym@V_0.5.0 0.5.0
+ xkb_compose_state_get_status@V_0.5.0 0.5.0
+ xkb_compose_state_get_utf8@V_0.5.0 0.5.0
+ xkb_compose_state_new@V_0.5.0 0.5.0
+ xkb_compose_state_ref@V_0.5.0 0.5.0
+ xkb_compose_state_reset@V_0.5.0 0.5.0
+ xkb_compose_state_unref@V_0.5.0 0.5.0
+ xkb_compose_table_new_from_buffer@V_0.5.0 0.5.0
+ xkb_compose_table_new_from_file@V_0.5.0 0.5.0
+ xkb_compose_table_new_from_locale@V_0.5.0 0.5.0
+ xkb_compose_table_ref@V_0.5.0 0.5.0
+ xkb_compose_table_unref@V_0.5.0 0.5.0
+ xkb_context_get_log_level@V_0.5.0 0.5.0
+ xkb_context_get_log_verbosity@V_0.5.0 0.5.0
+ xkb_context_get_user_data@V_0.5.0 0.5.0
+ xkb_context_include_path_append@V_0.5.0 0.5.0
+ xkb_context_include_path_append_default@V_0.5.0 0.5.0
+ xkb_context_include_path_clear@V_0.5.0 0.5.0
+ xkb_context_include_path_get@V_0.5.0 0.5.0
+ xkb_context_include_path_reset_defaults@V_0.5.0 0.5.0
+ xkb_context_new@V_0.5.0 0.5.0
+ xkb_context_num_include_paths@V_0.5.0 0.5.0
+ xkb_context_ref@V_0.5.0 0.5.0
+ xkb_context_set_log_fn@V_0.5.0 0.5.0
+ xkb_context_set_log_level@V_0.5.0 0.5.0
+ xkb_context_set_log_verbosity@V_0.5.0 0.5.0
+ xkb_context_set_user_data@V_0.5.0 0.5.0
+ xkb_context_unref@V_0.5.0 0.5.0
+ xkb_keymap_get_as_string@V_0.5.0 0.5.0
+ xkb_keymap_key_for_each@V_0.5.0 0.5.0
+ xkb_keymap_key_get_syms_by_level@V_0.5.0 0.5.0
+ xkb_keymap_key_repeats@V_0.5.0 0.5.0
+ xkb_keymap_layout_get_index@V_0.5.0 0.5.0
+ xkb_keymap_layout_get_name@V_0.5.0 0.5.0
+ xkb_keymap_led_get_index@V_0.5.0 0.5.0
+ xkb_keymap_led_get_name@V_0.5.0 0.5.0
+ xkb_keymap_max_keycode@V_0.5.0 0.5.0
+ xkb_keymap_min_keycode@V_0.5.0 0.5.0
+ xkb_keymap_mod_get_index@V_0.5.0 0.5.0
+ xkb_keymap_mod_get_name@V_0.5.0 0.5.0
+ xkb_keymap_new_from_buffer@V_0.5.0 0.5.0
+ xkb_keymap_new_from_file@V_0.5.0 0.5.0
+ xkb_keymap_new_from_names@V_0.5.0 0.5.0
+ xkb_keymap_new_from_string@V_0.5.0 0.5.0
+ xkb_keymap_num_layouts@V_0.5.0 0.5.0
+ xkb_keymap_num_layouts_for_key@V_0.5.0 0.5.0
+ xkb_keymap_num_leds@V_0.5.0 0.5.0
+ xkb_keymap_num_levels_for_key@V_0.5.0 0.5.0
+ xkb_keymap_num_mods@V_0.5.0 0.5.0
+ xkb_keymap_ref@V_0.5.0 0.5.0
+ xkb_keymap_unref@V_0.5.0 0.5.0
+ xkb_keysym_from_name@V_0.5.0 0.5.0
+ xkb_keysym_get_name@V_0.5.0 0.5.0
+ xkb_keysym_to_utf32@V_0.5.0 0.5.0
+ xkb_keysym_to_utf8@V_0.5.0 0.5.0
+ xkb_state_get_keymap@V_0.5.0 0.5.0
+ xkb_state_key_get_consumed_mods@V_0.5.0 0.5.0
+ xkb_state_key_get_layout@V_0.5.0 0.5.0
+ xkb_state_key_get_level@V_0.5.0 0.5.0
+ xkb_state_key_get_one_sym@V_0.5.0 0.5.0
+ xkb_state_key_get_syms@V_0.5.0 0.5.0
+ xkb_state_key_get_utf32@V_0.5.0 0.5.0
+ xkb_state_key_get_utf8@V_0.5.0 0.5.0
+ xkb_state_layout_index_is_active@V_0.5.0 0.5.0
+ xkb_state_layout_name_is_active@V_0.5.0 0.5.0
+ xkb_state_led_index_is_active@V_0.5.0 0.5.0
+ xkb_state_led_name_is_active@V_0.5.0 0.5.0
+ xkb_state_mod_index_is_active@V_0.5.0 0.5.0
+ xkb_state_mod_index_is_consumed@V_0.5.0 0.5.0
+ xkb_state_mod_indices_are_active@V_0.5.0 0.5.0
+ xkb_state_mod_mask_remove_consumed@V_0.5.0 0.5.0
+ xkb_state_mod_name_is_active@V_0.5.0 0.5.0
+ xkb_state_mod_names_are_active@V_0.5.0 0.5.0
+ xkb_state_new@V_0.5.0 0.5.0
+ xkb_state_ref@V_0.5.0 0.5.0
+ xkb_state_serialize_layout@V_0.5.0 0.5.0
+ xkb_state_serialize_mods@V_0.5.0 0.5.0
+ xkb_state_unref@V_0.5.0 0.5.0
+ xkb_state_update_key@V_0.5.0 0.5.0
+ xkb_state_update_mask@V_0.5.0 0.5.0
commit 684cd75c08769b7e6dc3669338a43cdc49f1e75f
Author: Michael Stapelberg <stapelberg@debian.org>
Date: Mon May 18 19:12:43 2015 +0200
install libxkbcommon-compose.h
diff --git a/debian/libxkbcommon-dev.install b/debian/libxkbcommon-dev.install
index 28113bc..87b7f46 100644
--- a/debian/libxkbcommon-dev.install
+++ b/debian/libxkbcommon-dev.install
@@ -1,6 +1,7 @@
# Use no wildcards to ensure we spot any update:
usr/include/xkbcommon/xkbcommon.h
usr/include/xkbcommon/xkbcommon-compat.h
+usr/include/xkbcommon/xkbcommon-compose.h
usr/include/xkbcommon/xkbcommon-keysyms.h
usr/include/xkbcommon/xkbcommon-names.h
usr/lib/*/libxkbcommon.a
commit 9044ad442233b8f6a9acbb55237dc48817876b02
Author: Michael Stapelberg <stapelberg@debian.org>
Date: Mon May 18 19:10:16 2015 +0200
drop patches, applied upstream.
diff --git a/debian/changelog b/debian/changelog
index cac7a20..64406c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
libxkbcommon (0.5.0-1) UNRELEASED; urgency=medium
* New upstream release.
+ * Drop debian/patches, applied upstream.
-- Michael Stapelberg <stapelberg@debian.org> Mon, 18 May 2015 18:51:42 +0200
diff --git a/debian/patches/0001-Remove-linux-input.h-include-from-test-x11comp.c.patch b/debian/patches/0001-Remove-linux-input.h-include-from-test-x11comp.c.patch
deleted file mode 100644
index c99a925..0000000
--- a/debian/patches/0001-Remove-linux-input.h-include-from-test-x11comp.c.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From e95fb475ebd203b030f17ddf9c55e487d3c929a0 Mon Sep 17 00:00:00 2001
-From: Pino Toscano <toscano.pino@tiscali.it>
-Date: Sat, 6 Sep 2014 11:05:44 +0300
-Subject: [PATCH] Remove <linux/input.h> include from test/x11comp.c
-
-libxkbcommon 0.4.3 introduces a new test, x11comp, which does not build
-on non-Linux OSes because of the unconditional <linux/input.h> include.
-
-This seems not needed even on Linux, so attached there is a simple patch
-to remove it.
-
-https://bugs.freedesktop.org/show_bug.cgi?id=83551
-
-Signed-off-by: Ran Benita <ran234@gmail.com>
----
- test/x11comp.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/test/x11comp.c b/test/x11comp.c
-index c30ed63..bc87a72 100644
---- a/test/x11comp.c
-+++ b/test/x11comp.c
-@@ -28,7 +28,6 @@
- #include <signal.h>
- #include <sys/types.h>
- #include <sys/wait.h>
--#include <linux/input.h>
-
- #include "test.h"
- #include "xkbcommon/xkbcommon-x11.h"
---
-2.1.0
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 8e9aec8..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-Remove-linux-input.h-include-from-test-x11comp.c.patch
commit bb0d6bd23565c28f6af93cf6631a00859b29392a
Author: Michael Stapelberg <stapelberg@debian.org>
Date: Mon May 18 18:51:51 2015 +0200
New upstream release.
diff --git a/debian/changelog b/debian/changelog
index 8c6074d..cac7a20 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libxkbcommon (0.5.0-1) UNRELEASED; urgency=medium
+
+ * New upstream release.
+
+ -- Michael Stapelberg <stapelberg@debian.org> Mon, 18 May 2015 18:51:42 +0200
+
libxkbcommon (0.4.3-2) unstable; urgency=high
* d/p/0001-Remove-linux-input.h-include-from-test-x11comp.c.patch:
commit c43c3c866eb9d52cd8f61e75cbef1c30d07f3a28
Author: Ran Benita <ran234@gmail.com>
Date: Sat Oct 18 16:41:59 2014 +0300
Bump version to 0.5.0
Signed-off-by: Ran Benita <ran234@gmail.com>
diff --git a/configure.ac b/configure.ac
index 169ab7c..cb176ee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ dnl Process this file with autoconf to create configure.
# Initialize Autoconf
AC_PREREQ([2.62])
-AC_INIT([libxkbcommon], [0.4.3],
+AC_INIT([libxkbcommon], [0.5.0],
[https://bugs.freedesktop.org/enter_bug.cgi?product=libxkbcommon],
[libxkbcommon], [http://xkbcommon.org])
AC_CONFIG_SRCDIR([Makefile.am])
commit 60104e7955266f9b8ab43bf6ccd013d6fa8a2de3
Author: Ran Benita <ran234@gmail.com>
Date: Sat Oct 18 16:35:49 2014 +0300
Update NEWS
Signed-off-by: Ran Benita <ran234@gmail.com>
diff --git a/NEWS b/NEWS
index 4dab3ae..bec2bd9 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,47 @@
+libxkbcommon 0.5.0 - 2014-10-18
+==================
+
+- Added support for Compose/dead keys in a new module (included in
+ libxkbcommon). See the documentation or the
+ xkbcommon/xkbcommon-compose.h header file for more details.
+
+- Improved and reordered some sections of the documentation.
+
+- The doxygen HTML pages were made nicer to read.
+
+- Most tests now run also on non-linux platforms.
+
+- A warning is emitted by default about RMLVO values which are not used
+ during keymap compilation, which are most often a user misconfiguration.
+ For example, "terminate:ctrl_alt_backspace" instead of
+ "terminate:ctrl_alt_bksp".
+
+- Added symbol versioning for libxkbcommon and libxkbcommon-x11.
+ Note: binaries compiled against this and future versions will not be
+ able to link against the previous versions of the library.
+
+- Removed several compatablity symbols from the binary (the API isn't
+ affected). This affects binaries which
+
+ 1. Were compiled against a pre-stable (<0.2.0) version of libxkbcommon, and
+ 2. Are linked against the this or later version of libxkbcommon.
+
+ Such a scenario is likely to fail already.
+
+- If Xvfb is not available, the x11comp test is now correctly skipped
+ instead of hanging.
+
+- Benchmarks were moved to a separate bench/ directory.
+
+- Build fixes from OpenBSD.
+
+- Fixed a bug where key type entries such as "map[None] = Level2;" were
+ ignored.
+
+- New API:
+ XKB_COMPOSE_*
+ xkb_compose_*
+
libxkbcommon 0.4.3 - 2014-08-19
==================
commit b92f79240972a7eb9311039ee4e2eda2bca8039c
Author: Ran Benita <ran234@gmail.com>
Date: Sat Oct 18 16:38:13 2014 +0300
Change initial symbol file versions to V_0.5.0
It will be quite confusing to use V_0.4.3 since this was already
released without symbol versioning.
Hopefully this doesn't cause any trouble for people who are using -git.
Signed-off-by: Ran Benita <ran234@gmail.com>
diff --git a/xkbcommon-x11.map b/xkbcommon-x11.map
index c1a3240..a219288 100644
--- a/xkbcommon-x11.map
+++ b/xkbcommon-x11.map
@@ -1,4 +1,4 @@
-V_0.4.3 {
+V_0.5.0 {
global:
xkb_x11_setup_xkb_extension;
xkb_x11_get_core_keyboard_device_id;
diff --git a/xkbcommon.map b/xkbcommon.map
index 3bbb13e..29fd7ac 100644
--- a/xkbcommon.map
+++ b/xkbcommon.map
@@ -1,4 +1,4 @@
-V_0.4.3 {
+V_0.5.0 {
global:
xkb_keysym_get_name;
xkb_keysym_from_name;
commit 47bb9fd13794d0420e27da47b1a7ac2787cfc417
Author: Ran Benita <ran234@gmail.com>
Date: Sat Oct 18 16:37:46 2014 +0300
compose: fill @since TBD
Signed-off-by: Ran Benita <ran234@gmail.com>
diff --git a/xkbcommon/xkbcommon-compose.h b/xkbcommon/xkbcommon-compose.h
index fd6badb..5755aec 100644
--- a/xkbcommon/xkbcommon-compose.h
+++ b/xkbcommon/xkbcommon-compose.h
@@ -38,7 +38,7 @@ extern "C" {
/**
* @defgroup compose Compose and dead-keys support
* Support for Compose and dead-keys.
- * @since TBD
+ * @since 0.5.0
*
* @{
*/
commit aa41d8833475fece07a29bc797100e3d827a8b7e
Author: Ran Benita <ran234@gmail.com>
Date: Sat Oct 18 16:03:41 2014 +0300
doc/compat.md: add compose incompatibilities
Signed-off-by: Ran Benita <ran234@gmail.com>
diff --git a/doc/compat.md b/doc/compat.md
index c7c6518..63a45e7 100644
--- a/doc/compat.md
+++ b/doc/compat.md
@@ -44,3 +44,12 @@ Notable additions:
- multiple keysyms per level
+ this requires incompatible dataset changes, such that X11 would
not be able to parse these
+
+## Compose support
+
+Relative to the standard implementation in libX11 (described in the
+Compose(5) man-page), some features are not supported:
+
+- the (! MODIFIER) syntax
+- using modifier keysyms in Compose sequences
+- several interactions with Braille keysyms
commit 413954aa44e7fc103f27fdc7cd962ae8532d96be
Author: Ran Benita <ran234@gmail.com>
Date: Sat Oct 18 15:51:41 2014 +0300
Add PACKAGING file
Signed-off-by: Ran Benita <ran234@gmail.com>
diff --git a/Makefile.am b/Makefile.am
index dfb3572..8e45ccb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,7 +14,8 @@ EXTRA_DIST = \
doc/rules-format.txt \
doc/doxygen-extra.css \
xkbcommon.map \
- xkbcommon-x11.map
+ xkbcommon-x11.map \
+ PACKAGING
AM_CPPFLAGS = \
-DDFLT_XKB_CONFIG_ROOT='"$(XKBCONFIGROOT)"' \
diff --git a/PACKAGING b/PACKAGING
new file mode 100644
index 0000000..738ccc4
--- /dev/null
+++ b/PACKAGING
@@ -0,0 +1,50 @@
+libxkbcommon consists of two shared libraries, libxkbcommon (the main
+library) and libxkbcommon-x11 (an addon library for XCB clients).
+
+The files for libxkbcommon-x11 are:
+ libxkbcommon-x11.a libxkbcommon.so* xkbcommon/xkbcommon-x11.h
+ xkbcommon-x11.map xkbcommon-x11.pc
+
+libxkbcommon-x11 can be disabled with --disable-x11 (see
+`./configure --help` for other options/variables).
+
+Dependencies for libxkbcommon:
+- C compiler, autoconf, automake, pkg-config, libc, etc.
+
+- (build optional) xorg-util-macros.
+ Output included in tarball.
+
+- (build optional) bison (preferred) or byacc>=20141006.
+ Output included in tarball.
+ byacc must be configured with --enable-btyacc.
+
+- (build optional, runtime) xkeyboard-config.
+ During build, for automatically detecting the value of
+ --with-xkb-config-root instead of guessing (/usr/share/X11/xkb).
+ During runtime, not strictly needed, but most users of the library
+ would need it.
+
+- (runtime) libX11.
+ Contains the dataset for Compose support (/usr/share/X11/locale).
+ Please don't depend on it explicitly.
+
+- (build optional) doxygen.
+ For generating the HTML documentation.
+
+- (build optional) gperf.
+ Output included in git and tarball. To regenerate, use
+ `make update-keywords`.
+
+Dependencies for libxkbcommon-x11:
+- libxkbcommon.
+
+- libxcb>=1.10 with libxcb-xkb.
+
+Dependencies for libxkbcommon-x11 tests:
+- xkbcomp, Xvfb.
+ If they are not available, the relevant tests are skipped.
+
+Unless libxcb is always available as part of the system, it is preferred
+that libxkbcommon and libxkbcommon-x11 be split into separate packages,
+such that the main library does not depend on libxcb. This avoids a
+transitive dependency of Wayland clients on X libraries.
commit 047d06122e88886bd49a4438e75fcbfc990ba1bf
Author: Ran Benita <ran234@gmail.com>
Date: Sat Oct 18 15:07:37 2014 +0300
Makefile.am: add symbol files to EXTRA_DIST
Signed-off-by: Ran Benita <ran234@gmail.com>
diff --git a/Makefile.am b/Makefile.am
index cd2dfab..dfb3572 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,7 +12,9 @@ EXTRA_DIST = \
doc/compat.md \
doc/keymap-format-text-v1.txt \
doc/rules-format.txt \
- doc/doxygen-extra.css
+ doc/doxygen-extra.css \
+ xkbcommon.map \
+ xkbcommon-x11.map
AM_CPPFLAGS = \
-DDFLT_XKB_CONFIG_ROOT='"$(XKBCONFIGROOT)"' \
commit 6337d789e66f7730fd347a324bdcbf52a57d86d7
Author: Ran Benita <ran234@gmail.com>
Date: Sat Oct 18 14:52:54 2014 +0300
README: we also accepts patches through github
Signed-off-by: Ran Benita <ran234@gmail.com>
diff --git a/README.md b/README.md
index 043b485..867b532 100644
--- a/README.md
+++ b/README.md
@@ -42,6 +42,7 @@ xkbcommon is maintained in git at
Patches are always welcome, and may be sent to either
<xorg-devel@lists.x.org> or <wayland-devel@lists.freedesktop.org>
+or through github.
Bugs are also welcome, and may be reported either at
Bugzilla https://bugs.freedesktop.org/describecomponents.cgi?product=libxkbcommon
commit 0419f6e78377a91f997f0f67ae0ef49fa1bc09c3
Author: Ran Benita <ran234@gmail.com>
Date: Sat Oct 18 14:50:49 2014 +0300
docs: make html output have a fixed width, hide footer
It's hard to read text which stretches indefinitely.
The footer is not adding much.
Signed-off-by: Ran Benita <ran234@gmail.com>
diff --git a/Makefile.am b/Makefile.am
index b2bdbe7..cd2dfab 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,7 +11,8 @@ EXTRA_DIST = \
doc/quick-guide.md \
doc/compat.md \
doc/keymap-format-text-v1.txt \
- doc/rules-format.txt
+ doc/rules-format.txt \
+ doc/doxygen-extra.css
AM_CPPFLAGS = \
-DDFLT_XKB_CONFIG_ROOT='"$(XKBCONFIGROOT)"' \
diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
index 8ef97b6..5881ff9 100644
--- a/doc/Doxyfile.in
+++ b/doc/Doxyfile.in
@@ -925,7 +925,7 @@ HTML_STYLESHEET =
# robust against future updates. Doxygen will copy the style sheet file to
# the output directory.
-HTML_EXTRA_STYLESHEET =
+HTML_EXTRA_STYLESHEET = @abs_top_srcdir@/doc/doxygen-extra.css
# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
# other source files which should be copied to the HTML output directory. Note
diff --git a/doc/doxygen-extra.css b/doc/doxygen-extra.css
new file mode 100644
index 0000000..632ebad
--- /dev/null
+++ b/doc/doxygen-extra.css
@@ -0,0 +1,9 @@
+div#top, div.header, div.contents {
+ margin-left: auto;
+ margin-right: auto;
+ width: 960px;
+}
+
+.footer {
+ display: none;
+}
commit b05a05edbd4f386de8cb82003ed3408786478e0f
Author: Ran Benita <ran234@gmail.com>
Date: Sat Oct 18 14:29:37 2014 +0300
README: add notes about Compose support
Signed-off-by: Ran Benita <ran234@gmail.com>
diff --git a/README.md b/README.md
index 5e68e93..043b485 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,9 @@
# libxkbcommon
-libxkbcommon is a keymap compiler and support library which processes a
-reduced subset of keymaps as defined by the XKB specification.
+libxkbcommon is a keyboard keymap compiler and support library which
+processes a reduced subset of keymaps as defined by the XKB (X Keyboard
+Extension) specification. It also contains a module for handling Compose
+and dead keys.
## Quick Guide
@@ -23,6 +25,9 @@ by all current distributions for their X11 XKB data. More information on
xkeyboard-config is available here:
http://www.freedesktop.org/wiki/Software/XKeyboardConfig
+The dataset for Compose is distributed in libX11, as part of the X locale
+data.
+
## Relation to X11
See [Compatibility](doc/compat.md) notes.
commit 49dc91cedb3f7a8205c1f346f8b2e891decf9209
Author: Ran Benita <ran234@gmail.com>
Date: Sat Oct 18 14:12:14 2014 +0300
doc/quick-guide: some improvements
Signed-off-by: Ran Benita <ran234@gmail.com>
diff --git a/doc/quick-guide.md b/doc/quick-guide.md
index a8634fd..3cf5b3b 100644
--- a/doc/quick-guide.md
+++ b/doc/quick-guide.md
@@ -1,6 +1,6 @@
# Quick Guide
-## Intro
+## Introduction
This document contains a quick walk-through of the often-used parts of
the library. We will employ a few use-cases to lead the examples:
@@ -42,8 +42,9 @@ let's create one:
The xkb_context contains the keymap include paths, the log level and
functions, and other general customizable administrativia.
-Next we need to create a keymap, xkb_keymap. There are different ways to
-do this.
+Next we need to create a keymap, xkb_keymap. This is an immutable object
+which contains all of the information about the keys, layouts, etc. There
+are different ways to do this.
If we are an evdev client, we have nothing to go by, so we need to ask
the user for his/her keymap preferences (for example, an Icelandic
@@ -54,7 +55,14 @@ passing NULL chooses the system's default.
~~~{.c}
struct xkb_keymap *keymap;
- struct xkb_rule_names names = <...>;
+ /* Example RMLVO for Icelandic Dvorak. */
+ struct xkb_rule_names names = {
+ .rules = NULL,
+ .model = "pc105",
+ .layout = "is",
+ .variant = "dvorak",
+ .options = "terminate:ctrl_alt_bksp"
+ };
keymap = xkb_keymap_new_from_names(ctx, &names,
XKB_KEYMAP_COMPILE_NO_FLAGS);
@@ -65,6 +73,7 @@ If we are a Wayland client, the compositor gives us a string complete
with a keymap. In this case, we can create the keymap object like this:
~~~{.c}
+ /* From the wl_keyboard::keymap event. */
const char *keymap_string = <...>;
keymap = xkb_keymap_new_from_string(ctx, keymap_string,
@@ -92,7 +101,8 @@ we will use the core keyboard device:
~~~
Now that we have the keymap, we are ready to handle the keyboard devices.
-For each device, we create an xkb_state:
+For each device, we create an xkb_state, which remembers things like which
+keyboard modifiers and LEDs are active:
~~~{.c}
struct xkb_state *state;
commit bac0c323b6559e37af04c4d6c8eb118d926ce07c
Author: Ran Benita <ran234@gmail.com>
Date: Sat Oct 18 13:58:56 2014 +0300
README: remove elaborate details from the intro
Point to the "quick guide" instead.
Signed-off-by: Ran Benita <ran234@gmail.com>
diff --git a/README.md b/README.md
index 2d71d67..5e68e93 100644
--- a/README.md
+++ b/README.md
@@ -1,16 +1,7 @@
# libxkbcommon
-xkbcommon is a keymap compiler and support library which processes a
-reduced subset of keymaps as defined by the XKB specification. Primarily,
-a keymap is created from a set of Rules/Model/Layout/Variant/Options names,
-processed through an XKB ruleset, and compiled into a struct xkb_keymap,
-which is the base type for all xkbcommon operations.
-
Reply to: