Geis

Merge lp:~oif-team/geis/packaging-1.0.13 into lp:~oif-team/geis/packaging

  1. packaging-1.0.13
  2. Merge into packaging
Proposed by Stephen M. Webb
Status: Merged
Merged at revision: 85
Proposed branch: lp:~oif-team/geis/packaging-1.0.13
Merge into: lp:~oif-team/geis/packaging
Diff against target: 352 lines (+85/-32)
8 files modified
ChangeLog (+33/-0)
configure (+10/-10)
configure.ac (+2/-2)
debian/changelog (+14/-0)
geis/geis.h (+8/-0)
libutouch-geis-xcb/Makefile.am (+1/-1)
libutouch-geis-xcb/Makefile.in (+1/-1)
libutouch-geis-xcb/geis_xcb.c (+16/-18)
To merge this branch: bzr merge lp:~oif-team/geis/packaging-1.0.13
Reviewer Review Type Date Requested Status
Chase Douglas (community) Needs Fixing
Henrik Rydberg (community) Approve
Review via email: mp+38454@code.launchpad.net

This proposal supersedes a proposal from 2010-10-14.

Description of the change

Release 1.0.13

To post a comment you must log in.
Revision history for this message
Henrik Rydberg (rydberg) wrote :

Looks good to me.

review: Approve
Revision history for this message
Chase Douglas (chasedouglas) wrote :

Didier noted in the last utouch-grail upload that we should be putting more detail in the changelog. Instead of just noting the bug report for the one fix, it should have a condensed summary of the changes in the release.

Otherwise, I think it's good.

review: Needs Fixing
lp:~oif-team/geis/packaging-1.0.13 updated
87. By Stephen M. Webb

Added more detail to debian/changelog.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ChangeLog'
2--- ChangeLog 2010-09-14 11:39:59 +0000
3+++ ChangeLog 2010-11-09 03:26:46 +0000
4@@ -1,3 +1,36 @@
5+2010-10-14 Stephen M. Webb <stephen.webb@canonical.com>
6+
7+ Release version 1.0.13.
8+
9+ * configure.ac (AC_INIT): bumped package version to 1.0.13
10+
11+2010-10-12 Stephen M. Webb <stephen.webb@canonical.com>
12+
13+ Removed extra newlines from diagnostic messages
14+
15+ * libutouch-geis-xcb/geis_xcb.c: removed newline from several diagnostic
16+ messages.
17+
18+2010-10-07 Stephen M. Webb <stephen.webb@canonical.com>
19+
20+ Fixed LP: #656503 - event dispatch can hang under some circumstances
21+
22+ * libutouch-geis-xcb/geis_xcb.c (geis_xcb_dispatch): changed loop condition
23+ * libutouch-geis-xcb/Makefile.am (libutouch_geis_la_LDFLAGS): bumped library
24+ revision
25+
26+2010-09-28 Stephen M. Webb <stephen.webb@canonical.com>
27+
28+ Version bump to 1.0.12.
29+
30+ * configure.ac (AC_INIT): bumped package version to 1.0.12
31+
32+2010-09-28 Stephen M. Webb <stephen.webb@canonical.com>
33+
34+ Made lib compatible with C++.
35+
36+ * geis/geis.h: forced C linkage
37+
38 2010-09-14 Stephen M. Webb <stephen.webb@canonical.com>
39
40 Version bump tp 1.0.11
41
42=== modified file 'configure'
43--- configure 2010-09-16 15:54:44 +0000
44+++ configure 2010-11-09 03:26:46 +0000
45@@ -1,6 +1,6 @@
46 #! /bin/sh
47 # Guess values for system-dependent variables and create Makefiles.
48-# Generated by GNU Autoconf 2.67 for utouch-geis 1.0.11.
49+# Generated by GNU Autoconf 2.67 for utouch-geis 1.0.13.
50 #
51 # Report bugs to <stephen.webb@canonical.com>.
52 #
53@@ -701,8 +701,8 @@
54 # Identity of this package.
55 PACKAGE_NAME='utouch-geis'
56 PACKAGE_TARNAME='utouch-geis'
57-PACKAGE_VERSION='1.0.11'
58-PACKAGE_STRING='utouch-geis 1.0.11'
59+PACKAGE_VERSION='1.0.13'
60+PACKAGE_STRING='utouch-geis 1.0.13'
61 PACKAGE_BUGREPORT='stephen.webb@canonical.com'
62 PACKAGE_URL='https://launchpad.net/utouch-geis'
63
64@@ -1447,7 +1447,7 @@
65 # Omit some internal or obsolete options to make the list less imposing.
66 # This message is too long to be a string in the A/UX 3.1 sh.
67 cat <<_ACEOF
68-\`configure' configures utouch-geis 1.0.11 to adapt to many kinds of systems.
69+\`configure' configures utouch-geis 1.0.13 to adapt to many kinds of systems.
70
71 Usage: $0 [OPTION]... [VAR=VALUE]...
72
73@@ -1517,7 +1517,7 @@
74
75 if test -n "$ac_init_help"; then
76 case $ac_init_help in
77- short | recursive ) echo "Configuration of utouch-geis 1.0.11:";;
78+ short | recursive ) echo "Configuration of utouch-geis 1.0.13:";;
79 esac
80 cat <<\_ACEOF
81
82@@ -1632,7 +1632,7 @@
83 test -n "$ac_init_help" && exit $ac_status
84 if $ac_init_version; then
85 cat <<\_ACEOF
86-utouch-geis configure 1.0.11
87+utouch-geis configure 1.0.13
88 generated by GNU Autoconf 2.67
89
90 Copyright (C) 2010 Free Software Foundation, Inc.
91@@ -1910,7 +1910,7 @@
92 This file contains any messages produced by compilers while
93 running configure, to aid debugging if configure makes a mistake.
94
95-It was created by utouch-geis $as_me 1.0.11, which was
96+It was created by utouch-geis $as_me 1.0.13, which was
97 generated by GNU Autoconf 2.67. Invocation command line was
98
99 $ $0 $@
100@@ -2728,7 +2728,7 @@
101
102 # Define the identity of the package.
103 PACKAGE='utouch-geis'
104- VERSION='1.0.11'
105+ VERSION='1.0.13'
106
107
108 cat >>confdefs.h <<_ACEOF
109@@ -11704,7 +11704,7 @@
110 # report actual input values of CONFIG_FILES etc. instead of their
111 # values after options handling.
112 ac_log="
113-This file was extended by utouch-geis $as_me 1.0.11, which was
114+This file was extended by utouch-geis $as_me 1.0.13, which was
115 generated by GNU Autoconf 2.67. Invocation command line was
116
117 CONFIG_FILES = $CONFIG_FILES
118@@ -11771,7 +11771,7 @@
119 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
120 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
121 ac_cs_version="\\
122-utouch-geis config.status 1.0.11
123+utouch-geis config.status 1.0.13
124 configured by $0, generated by GNU Autoconf 2.67,
125 with options \\"\$ac_cs_config\\"
126
127
128=== modified file 'configure.ac'
129--- configure.ac 2010-09-16 15:54:44 +0000
130+++ configure.ac 2010-11-09 03:26:46 +0000
131@@ -1,8 +1,8 @@
132 # -*- Autoconf -*-
133 # Process this file with autoconf to produce a configure script.
134-
135+#
136 AC_PREREQ(2.65)
137-AC_INIT([utouch-geis],[1.0.11],
138+AC_INIT([utouch-geis],[1.0.13],
139 [stephen.webb@canonical.com],,
140 [https://launchpad.net/utouch-geis])
141 AC_CONFIG_HEADERS([geis_config.h])
142
143=== modified file 'debian/changelog'
144--- debian/changelog 2010-09-16 16:10:34 +0000
145+++ debian/changelog 2010-11-09 03:26:46 +0000
146@@ -1,3 +1,17 @@
147+utouch-geis (1.0.13-0ubuntu1) UNRELEASED; urgency=low
148+
149+ * Fixes failed make for some dependent projects (LP: #660576).
150+ * Prevents event dispatch from hanging under some circumstances
151+ (LP: #656503).
152+
153+ -- Stephen M. Webb <stephen.webb@canonical.com> Thu, 14 Oct 2010 16:08:11 -0400
154+
155+utouch-geis (1.0.12-0ubuntu1) UNRELEASED; urgency=low
156+
157+ * Adds support for use with C++.
158+
159+ -- Stephen M. Webb <stephen.webb@canonical.com> Thu, 14 Oct 2010 16:08:11 -0400
160+
161 utouch-geis (1.0.11-0ubuntu1) maverick; urgency=low
162
163 [ Ara Pulido ]
164
165=== modified file 'geis/geis.h'
166--- geis/geis.h 2010-09-16 15:58:43 +0000
167+++ geis/geis.h 2010-11-09 03:26:46 +0000
168@@ -20,6 +20,10 @@
169 #ifndef GEIS_GEIS_H_
170 #define GEIS_GEIS_H_
171
172+#ifdef __cplusplus
173+extern "C" {
174+#endif
175+
176 #define GEIS_VERSION_1_0 1
177
178 #include <geis/geisimpl.h>
179@@ -385,4 +389,8 @@
180
181 /* @} */
182
183+#ifdef __cplusplus
184+} // extern "C"
185+#endif
186+
187 #endif /* GEIS_GEIS_H_ */
188
189=== modified file 'libutouch-geis-xcb/Makefile.am'
190--- libutouch-geis-xcb/Makefile.am 2010-09-16 15:54:44 +0000
191+++ libutouch-geis-xcb/Makefile.am 2010-11-09 03:26:46 +0000
192@@ -36,7 +36,7 @@
193
194 libutouch_geis_la_LDFLAGS = \
195 -Wl,-z,defs -Wl,--as-needed \
196- -version-info 1:1:0 \
197+ -version-info 1:2:0 \
198 -Wl,--version-script=$(version_script)
199
200 libutouch_geis_la_LIBADD = \
201
202=== modified file 'libutouch-geis-xcb/Makefile.in'
203--- libutouch-geis-xcb/Makefile.in 2010-09-16 15:54:44 +0000
204+++ libutouch-geis-xcb/Makefile.in 2010-11-09 03:26:46 +0000
205@@ -275,7 +275,7 @@
206
207 libutouch_geis_la_LDFLAGS = \
208 -Wl,-z,defs -Wl,--as-needed \
209- -version-info 1:1:0 \
210+ -version-info 1:2:0 \
211 -Wl,--version-script=$(version_script)
212
213 libutouch_geis_la_LIBADD = \
214
215=== modified file 'libutouch-geis-xcb/geis_xcb.c'
216--- libutouch-geis-xcb/geis_xcb.c 2010-09-16 15:54:44 +0000
217+++ libutouch-geis-xcb/geis_xcb.c 2010-11-09 03:26:46 +0000
218@@ -659,14 +659,14 @@
219 &error);
220 if (!version_reply)
221 {
222- geis_error("failed to receive gesture version reply\n");
223+ geis_error("failed to receive gesture version reply.");
224 goto error_exit;
225 }
226
227 if (version_reply->major_version != XCB_GESTURE_MAJOR_VERSION
228 && version_reply->minor_version != XCB_GESTURE_MINOR_VERSION)
229 {
230- geis_error("server supports unrecognized version: %d.%d\n",
231+ geis_error("server supports unrecognized version: %d.%d",
232 version_reply->major_version, version_reply->minor_version);
233 }
234
235@@ -733,13 +733,13 @@
236 {
237 const xcb_query_extension_reply_t *extension_info;
238 extension_info = xcb_get_extension_data(xcb->connection, &xcb_gesture_id);
239+ xcb_generic_event_t *event = NULL;
240
241- xcb_generic_event_t *event = xcb_poll_for_event(xcb->connection);
242- while (event)
243+ while (event = xcb_poll_for_event(xcb->connection))
244 {
245 xcb_gesture_notify_event_t *gesture_event = NULL;
246 if (event->response_type != GenericEvent) {
247- geis_warning("received non-generic event type: %d\n",
248+ geis_warning("received non-generic event type: %d",
249 event->response_type);
250 continue;
251 }
252@@ -747,14 +747,14 @@
253 gesture_event = (xcb_gesture_notify_event_t*)event;
254 if (gesture_event->extension != extension_info->major_opcode)
255 {
256- geis_warning("received non-gesture extension event: %d\n",
257+ geis_warning("received non-gesture extension event: %d",
258 gesture_event->extension);
259 continue;
260 }
261
262 if (gesture_event->event_type != XCB_GESTURE_NOTIFY)
263 {
264- geis_warning("received unrecognized gesture event type: %d\n",
265+ geis_warning("received unrecognized gesture event type: %d",
266 gesture_event->event_type);
267 continue;
268 }
269@@ -763,15 +763,13 @@
270 gesture_event->event);
271 if (!instance)
272 {
273- geis_error("no instance found for window_id 0x%08x\n",
274+ geis_error("no instance found for window_id 0x%08x",
275 gesture_event->event);
276 }
277 else
278 {
279 geis_xcb_dispatch_gesture(instance, gesture_event);
280 }
281-
282- event = xcb_poll_for_event(xcb->connection);
283 }
284 }
285 }
286@@ -846,7 +844,7 @@
287 &error);
288 if (!events_reply)
289 {
290- geis_error("failed to receive selected events reply\n");
291+ geis_error("failed to receive selected events reply");
292 goto really_done;
293 }
294
295@@ -860,7 +858,7 @@
296 mask_len_reply = xcb_gesture_event_mask_mask_data_length(event_mask);
297 if (mask_len_reply != mask_len)
298 {
299- geis_error("incorrect mask length returned by server - expected %d, got %d\n",
300+ geis_error("incorrect mask length returned by server - expected %d, got %d",
301 mask_len, mask_len_reply);
302 goto done;
303 }
304@@ -868,7 +866,7 @@
305 mask_reply = xcb_gesture_event_mask_mask_data(event_mask);
306 if (memcmp(mask, mask_reply, mask_len * 4) != 0)
307 {
308- geis_error("incorrect mask returned by server\n");
309+ geis_error("incorrect mask returned by server");
310 goto done;
311 }
312
313@@ -878,7 +876,7 @@
314
315 if (!device_is_found)
316 {
317- geis_error("gesture mask for device %d not returned by server\n", device_id);
318+ geis_error("gesture mask for device %d not returned by server", device_id);
319 goto done;
320 }
321
322@@ -906,11 +904,11 @@
323
324 if (gesture_list == GEIS_ALL_GESTURES)
325 {
326- geis_debug("subscribing device %d for the all gestures\n", device_id);
327+ geis_debug("subscribing device %d for all gestures", device_id);
328 }
329 else
330 {
331- geis_debug("subscribing device %d for the following gestures:\n", device_id);
332+ geis_debug("subscribing device %d for the following gestures:", device_id);
333 for (g = gesture_list; *g; ++g)
334 {
335 geis_debug("\t\"%s\"\n", *g);
336@@ -920,7 +918,7 @@
337 geis_xcb_map_gestures_to_mask(gesture_list, &mask, &mask_len);
338 if (!mask)
339 {
340- geis_error("failed to allocate mask\n");
341+ geis_error("failed to allocate mask");
342 goto really_done;
343 }
344
345@@ -932,7 +930,7 @@
346 error = xcb_request_check(xcb->connection, select_cookie);
347 if (error)
348 {
349- geis_error("failed to select events for window 0x%08x\n", window_id);
350+ geis_error("failed to select events for window 0x%08x", window_id);
351 goto done;
352 }
353

Subscribers

People subscribed via source and target branches

to all changes: