Merge lp:~chasedouglas/grail/versions into lp:grail

Proposed by Chase Douglas
Status: Merged
Merged at revision: 175
Proposed branch: lp:~chasedouglas/grail/versions
Merge into: lp:grail
Diff against target: 95 lines (+68/-1)
3 files modified
configure.ac (+1/-1)
src/Makefile.am (+1/-0)
src/libutouch-grail.ver (+66/-0)
To merge this branch: bzr merge lp:~chasedouglas/grail/versions
Reviewer Review Type Date Requested Status
Stephen M. Webb (community) Approve
Review via email: mp+90174@code.launchpad.net

Description of the change

Add version script and bump libtool version in anticipation of a release.

To post a comment you must log in.
Revision history for this message
Stephen M. Webb (bregma) wrote :

This is an unusual use of symbol versioning -- but understandable, since it's retconning. It shouldn't make a difference because of the SONAME bump.

Verified building with libutouch-geis. Looks OK.

I'm a big fan of symbol versioning. Approve.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'configure.ac'
2--- configure.ac 2012-01-25 02:37:56 +0000
3+++ configure.ac 2012-01-25 17:57:22 +0000
4@@ -17,7 +17,7 @@
5 AM_SILENT_RULES([yes])
6 AM_MAINTAINER_MODE([enable])
7
8-LIB_VERSION=3:0:2
9+LIB_VERSION=4:0:3
10 AC_SUBST([LIB_VERSION])
11
12 # Initialize libtool
13
14=== modified file 'src/Makefile.am'
15--- src/Makefile.am 2012-01-25 15:49:55 +0000
16+++ src/Makefile.am 2012-01-25 17:57:22 +0000
17@@ -4,6 +4,7 @@
18
19 libutouch_grail_la_LDFLAGS = \
20 -version-info @LIB_VERSION@ \
21+ -Wl,--version-script=libutouch-grail.ver \
22 -lm \
23 $(MTDEV_LIBS) \
24 $(EVEMU_LIBS) \
25
26=== added file 'src/libutouch-grail.ver'
27--- src/libutouch-grail.ver 1970-01-01 00:00:00 +0000
28+++ src/libutouch-grail.ver 2012-01-25 17:57:22 +0000
29@@ -0,0 +1,66 @@
30+UTOUCH_GRAIL_2.0 {
31+ global:
32+ grail_close;
33+ grail_delete;
34+ grail_filter_abs_events;
35+ grail_get_contact_frame;
36+ grail_get_contacts;
37+ grail_get_control;
38+ grail_get_units;
39+ grail_get_version;
40+ grail_idle;
41+ grail_mask_clear_mask;
42+ grail_mask_count;
43+ grail_mask_get_first;
44+ grail_mask_get_next;
45+ grail_mask_set_mask;
46+ grail_new_raw;
47+ grail_open;
48+ grail_pull;
49+ grail_pump_frame;
50+ grail_set_bbox;
51+ grail_set_coordinate_transform_callback;
52+
53+ local:
54+ *;
55+};
56+
57+UTOUCH_GRAIL_3.0 {
58+ global:
59+ grail_accept_gesture;
60+ grail_delete_v3;
61+ grail_event_get_property;
62+ grail_event_get_time;
63+ grail_event_get_type;
64+ grail_event_ref;
65+ grail_event_unref;
66+ grail_get_event;
67+ grail_get_fd;
68+ grail_new;
69+ grail_next_timeout;
70+ grail_process_frame_event;
71+ grail_reject_gesture;
72+ grail_slice_get_center_of_rotation_x;
73+ grail_slice_get_center_of_rotation_y;
74+ grail_slice_get_construction_finished;
75+ grail_slice_get_cumulative_transform;
76+ grail_slice_get_frame;
77+ grail_slice_get_id;
78+ grail_slice_get_num_touches;
79+ grail_slice_get_original_center_x;
80+ grail_slice_get_original_center_y;
81+ grail_slice_get_original_radius;
82+ grail_slice_get_property;
83+ grail_slice_get_recognized;
84+ grail_slice_get_state;
85+ grail_slice_get_subscription;
86+ grail_slice_get_touch_id;
87+ grail_slice_get_transform;
88+ grail_subscription_activate;
89+ grail_subscription_deactivate;
90+ grail_subscription_delete;
91+ grail_subscription_get_property;
92+ grail_subscription_new;
93+ grail_subscription_set_property;
94+ grail_update_time;
95+} UTOUCH_GRAIL_2.0;

Subscribers

People subscribed via source and target branches