Grail

Merge lp:~dandrader/grail/release_3.0.8-0ubuntu1 into lp:grail/ubuntu

  1. release_3.0.8-0ubuntu1
  2. Merge into packaging
Proposed by Daniel d'Andrada
Status: Merged
Merged at revision: 136
Proposed branch: lp:~dandrader/grail/release_3.0.8-0ubuntu1
Merge into: lp:grail/ubuntu
Diff against target: 1209 lines (+120/-348)
35 files modified
INSTALL (+2/-2)
Makefile.in (+2/-4)
aclocal.m4 (+3/-3)
config-aux/ltmain.sh (+2/-2)
configure (+19/-208)
configure.ac (+2/-4)
debian/changelog (+7/-2)
debian/control (+3/-3)
debian/libgrail6.install (+1/-1)
debian/libgrail6.symbols (+38/-38)
include/oif/grail.h (+2/-3)
src/Makefile.am (+0/-2)
src/Makefile.in (+2/-7)
src/handle.cpp (+5/-6)
src/handle.h (+1/-2)
src/libgrail.ver (+2/-2)
test/Makefile.in (+1/-3)
test/gtest/Makefile.in (+1/-3)
test/integration/Makefile.am (+0/-1)
test/integration/Makefile.in (+2/-6)
test/integration/x11/fixture.cpp (+2/-2)
test/regular/Makefile.am (+2/-4)
test/regular/Makefile.in (+5/-9)
test/regular/grail-fixture.h (+1/-1)
test/regular/grail.cpp (+2/-3)
test/regular/intermittent_3touch.cpp (+1/-2)
test/regular/one-touch-gest-finished.cpp (+1/-2)
test/regular/pending-end.cpp (+1/-2)
test/regular/still-gest-finishes.cpp (+1/-2)
tools/Makefile.am (+0/-2)
tools/Makefile.in (+1/-9)
tools/grail-test-3-1.c (+2/-2)
tools/grail-test-atomic.c (+2/-2)
tools/grail-test-edge.c (+2/-2)
tools/grail-test-propagation.c (+2/-2)
To merge this branch: bzr merge lp:~dandrader/grail/release_3.0.8-0ubuntu1
Reviewer Review Type Date Requested Status
OIF Packaging Pending
Review via email: mp+133662@code.launchpad.net

Description of the change

Release version 3.0.8-0ubuntu1

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'INSTALL'
2--- INSTALL 2012-06-21 20:30:14 +0000
3+++ INSTALL 2012-11-09 12:26:39 +0000
4@@ -1,7 +1,7 @@
5 grail - Gesture Recognition And Instantiation Library
6
7-To build, you need to have the autoconf, libtool, mtdev-dev, libevemu-dev,
8-and libframe packages installed. Then, do
9+To build, you need to have the autoconf, libtool, and libframe-dev
10+packages installed. Then, do
11
12 ./autogen.sh
13 ./configure
14
15=== modified file 'Makefile.in'
16--- Makefile.in 2012-07-26 19:20:06 +0000
17+++ Makefile.in 2012-11-09 12:26:39 +0000
18@@ -1,4 +1,4 @@
19-# Makefile.in generated by automake 1.11.5 from Makefile.am.
20+# Makefile.in generated by automake 1.11.6 from Makefile.am.
21 # @configure_input@
22
23 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
24@@ -234,8 +234,6 @@
25 MAKEINFO = @MAKEINFO@
26 MANIFEST_TOOL = @MANIFEST_TOOL@
27 MKDIR_P = @MKDIR_P@
28-MTDEV_CFLAGS = @MTDEV_CFLAGS@
29-MTDEV_LIBS = @MTDEV_LIBS@
30 NM = @NM@
31 NMEDIT = @NMEDIT@
32 OBJDUMP = @OBJDUMP@
33@@ -673,7 +671,7 @@
34 *.zip*) \
35 unzip $(distdir).zip ;;\
36 esac
37- chmod -R a-w $(distdir); chmod a+w $(distdir)
38+ chmod -R a-w $(distdir); chmod u+w $(distdir)
39 mkdir $(distdir)/_build
40 mkdir $(distdir)/_inst
41 chmod a-w $(distdir)
42
43=== modified file 'aclocal.m4'
44--- aclocal.m4 2012-07-26 19:20:06 +0000
45+++ aclocal.m4 2012-11-09 12:26:39 +0000
46@@ -1,4 +1,4 @@
47-# generated automatically by aclocal 1.11.5 -*- Autoconf -*-
48+# generated automatically by aclocal 1.11.6 -*- Autoconf -*-
49
50 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
51 # 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
52@@ -38,7 +38,7 @@
53 [am__api_version='1.11'
54 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
55 dnl require some minimum version. Point them to the right macro.
56-m4_if([$1], [1.11.5], [],
57+m4_if([$1], [1.11.6], [],
58 [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
59 ])
60
61@@ -54,7 +54,7 @@
62 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
63 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
64 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
65-[AM_AUTOMAKE_VERSION([1.11.5])dnl
66+[AM_AUTOMAKE_VERSION([1.11.6])dnl
67 m4_ifndef([AC_AUTOCONF_VERSION],
68 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
69 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
70
71=== modified file 'config-aux/ltmain.sh'
72--- config-aux/ltmain.sh 2012-01-30 23:19:19 +0000
73+++ config-aux/ltmain.sh 2012-11-09 12:26:39 +0000
74@@ -70,7 +70,7 @@
75 # compiler: $LTCC
76 # compiler flags: $LTCFLAGS
77 # linker: $LD (gnu? $with_gnu_ld)
78-# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1ubuntu1
79+# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1ubuntu2
80 # automake: $automake_version
81 # autoconf: $autoconf_version
82 #
83@@ -80,7 +80,7 @@
84
85 PROGRAM=libtool
86 PACKAGE=libtool
87-VERSION="2.4.2 Debian-2.4.2-1ubuntu1"
88+VERSION="2.4.2 Debian-2.4.2-1ubuntu2"
89 TIMESTAMP=""
90 package_revision=1.3337
91
92
93=== modified file 'configure'
94--- configure 2012-07-26 19:20:06 +0000
95+++ configure 2012-11-09 12:26:39 +0000
96@@ -1,6 +1,6 @@
97 #! /bin/sh
98 # Guess values for system-dependent variables and create Makefiles.
99-# Generated by GNU Autoconf 2.69 for Gesture Recognition And Instantiation Library 3.0.6.
100+# Generated by GNU Autoconf 2.69 for Gesture Recognition And Instantiation Library 3.0.8.
101 #
102 #
103 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
104@@ -587,8 +587,8 @@
105 # Identity of this package.
106 PACKAGE_NAME='Gesture Recognition And Instantiation Library'
107 PACKAGE_TARNAME='grail'
108-PACKAGE_VERSION='3.0.6'
109-PACKAGE_STRING='Gesture Recognition And Instantiation Library 3.0.6'
110+PACKAGE_VERSION='3.0.8'
111+PACKAGE_STRING='Gesture Recognition And Instantiation Library 3.0.8'
112 PACKAGE_BUGREPORT=''
113 PACKAGE_URL=''
114
115@@ -653,6 +653,8 @@
116 BASE_CXXFLAGS
117 XORG_GTEST_CPPFLAGS
118 XORG_GTEST_SOURCE
119+EVEMU_LIBS
120+EVEMU_CFLAGS
121 X11_LIBS
122 X11_CFLAGS
123 HAVE_GTEST_FALSE
124@@ -664,10 +666,6 @@
125 XINPUT_CFLAGS
126 FRAME_LIBS
127 FRAME_CFLAGS
128-EVEMU_LIBS
129-EVEMU_CFLAGS
130-MTDEV_LIBS
131-MTDEV_CFLAGS
132 PKG_CONFIG_LIBDIR
133 PKG_CONFIG_PATH
134 PKG_CONFIG
135@@ -832,16 +830,14 @@
136 PKG_CONFIG
137 PKG_CONFIG_PATH
138 PKG_CONFIG_LIBDIR
139-MTDEV_CFLAGS
140-MTDEV_LIBS
141-EVEMU_CFLAGS
142-EVEMU_LIBS
143 FRAME_CFLAGS
144 FRAME_LIBS
145 XINPUT_CFLAGS
146 XINPUT_LIBS
147 X11_CFLAGS
148-X11_LIBS'
149+X11_LIBS
150+EVEMU_CFLAGS
151+EVEMU_LIBS'
152
153
154 # Initialize some variables set by options.
155@@ -1382,7 +1378,7 @@
156 # Omit some internal or obsolete options to make the list less imposing.
157 # This message is too long to be a string in the A/UX 3.1 sh.
158 cat <<_ACEOF
159-\`configure' configures Gesture Recognition And Instantiation Library 3.0.6 to adapt to many kinds of systems.
160+\`configure' configures Gesture Recognition And Instantiation Library 3.0.8 to adapt to many kinds of systems.
161
162 Usage: $0 [OPTION]... [VAR=VALUE]...
163
164@@ -1452,7 +1448,7 @@
165
166 if test -n "$ac_init_help"; then
167 case $ac_init_help in
168- short | recursive ) echo "Configuration of Gesture Recognition And Instantiation Library 3.0.6:";;
169+ short | recursive ) echo "Configuration of Gesture Recognition And Instantiation Library 3.0.8:";;
170 esac
171 cat <<\_ACEOF
172
173@@ -1517,12 +1513,6 @@
174 directories to add to pkg-config's search path
175 PKG_CONFIG_LIBDIR
176 path overriding pkg-config's built-in search path
177- MTDEV_CFLAGS
178- C compiler flags for MTDEV, overriding pkg-config
179- MTDEV_LIBS linker flags for MTDEV, overriding pkg-config
180- EVEMU_CFLAGS
181- C compiler flags for EVEMU, overriding pkg-config
182- EVEMU_LIBS linker flags for EVEMU, overriding pkg-config
183 FRAME_CFLAGS
184 C compiler flags for FRAME, overriding pkg-config
185 FRAME_LIBS linker flags for FRAME, overriding pkg-config
186@@ -1531,6 +1521,9 @@
187 XINPUT_LIBS linker flags for XINPUT, overriding pkg-config
188 X11_CFLAGS C compiler flags for X11, overriding pkg-config
189 X11_LIBS linker flags for X11, overriding pkg-config
190+ EVEMU_CFLAGS
191+ C compiler flags for EVEMU, overriding pkg-config
192+ EVEMU_LIBS linker flags for EVEMU, overriding pkg-config
193
194 Use these variables to override the choices made by `configure' or to help
195 it to find libraries and programs with nonstandard names/locations.
196@@ -1598,7 +1591,7 @@
197 test -n "$ac_init_help" && exit $ac_status
198 if $ac_init_version; then
199 cat <<\_ACEOF
200-Gesture Recognition And Instantiation Library configure 3.0.6
201+Gesture Recognition And Instantiation Library configure 3.0.8
202 generated by GNU Autoconf 2.69
203
204 Copyright (C) 2012 Free Software Foundation, Inc.
205@@ -2043,7 +2036,7 @@
206 This file contains any messages produced by compilers while
207 running configure, to aid debugging if configure makes a mistake.
208
209-It was created by Gesture Recognition And Instantiation Library $as_me 3.0.6, which was
210+It was created by Gesture Recognition And Instantiation Library $as_me 3.0.8, which was
211 generated by GNU Autoconf 2.69. Invocation command line was
212
213 $ $0 $@
214@@ -2864,7 +2857,7 @@
215
216 # Define the identity of the package.
217 PACKAGE='grail'
218- VERSION='3.0.6'
219+ VERSION='3.0.8'
220
221
222 cat >>confdefs.h <<_ACEOF
223@@ -2967,7 +2960,7 @@
224
225
226
227-LIB_VERSION=5:0:0
228+LIB_VERSION=6:0:0
229
230
231 # Initialize libtool
232@@ -15941,188 +15934,6 @@
233 fi
234
235 pkg_failed=no
236-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MTDEV" >&5
237-$as_echo_n "checking for MTDEV... " >&6; }
238-
239-if test -n "$MTDEV_CFLAGS"; then
240- pkg_cv_MTDEV_CFLAGS="$MTDEV_CFLAGS"
241- elif test -n "$PKG_CONFIG"; then
242- if test -n "$PKG_CONFIG" && \
243- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mtdev >= 1.1\""; } >&5
244- ($PKG_CONFIG --exists --print-errors "mtdev >= 1.1") 2>&5
245- ac_status=$?
246- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
247- test $ac_status = 0; }; then
248- pkg_cv_MTDEV_CFLAGS=`$PKG_CONFIG --cflags "mtdev >= 1.1" 2>/dev/null`
249- test "x$?" != "x0" && pkg_failed=yes
250-else
251- pkg_failed=yes
252-fi
253- else
254- pkg_failed=untried
255-fi
256-if test -n "$MTDEV_LIBS"; then
257- pkg_cv_MTDEV_LIBS="$MTDEV_LIBS"
258- elif test -n "$PKG_CONFIG"; then
259- if test -n "$PKG_CONFIG" && \
260- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mtdev >= 1.1\""; } >&5
261- ($PKG_CONFIG --exists --print-errors "mtdev >= 1.1") 2>&5
262- ac_status=$?
263- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
264- test $ac_status = 0; }; then
265- pkg_cv_MTDEV_LIBS=`$PKG_CONFIG --libs "mtdev >= 1.1" 2>/dev/null`
266- test "x$?" != "x0" && pkg_failed=yes
267-else
268- pkg_failed=yes
269-fi
270- else
271- pkg_failed=untried
272-fi
273-
274-
275-
276-if test $pkg_failed = yes; then
277- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
278-$as_echo "no" >&6; }
279-
280-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
281- _pkg_short_errors_supported=yes
282-else
283- _pkg_short_errors_supported=no
284-fi
285- if test $_pkg_short_errors_supported = yes; then
286- MTDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "mtdev >= 1.1" 2>&1`
287- else
288- MTDEV_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "mtdev >= 1.1" 2>&1`
289- fi
290- # Put the nasty error message in config.log where it belongs
291- echo "$MTDEV_PKG_ERRORS" >&5
292-
293- as_fn_error $? "Package requirements (mtdev >= 1.1) were not met:
294-
295-$MTDEV_PKG_ERRORS
296-
297-Consider adjusting the PKG_CONFIG_PATH environment variable if you
298-installed software in a non-standard prefix.
299-
300-Alternatively, you may set the environment variables MTDEV_CFLAGS
301-and MTDEV_LIBS to avoid the need to call pkg-config.
302-See the pkg-config man page for more details." "$LINENO" 5
303-elif test $pkg_failed = untried; then
304- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
305-$as_echo "no" >&6; }
306- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
307-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
308-as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
309-is in your PATH or set the PKG_CONFIG environment variable to the full
310-path to pkg-config.
311-
312-Alternatively, you may set the environment variables MTDEV_CFLAGS
313-and MTDEV_LIBS to avoid the need to call pkg-config.
314-See the pkg-config man page for more details.
315-
316-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
317-See \`config.log' for more details" "$LINENO" 5; }
318-else
319- MTDEV_CFLAGS=$pkg_cv_MTDEV_CFLAGS
320- MTDEV_LIBS=$pkg_cv_MTDEV_LIBS
321- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
322-$as_echo "yes" >&6; }
323-
324-fi
325-
326-pkg_failed=no
327-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EVEMU" >&5
328-$as_echo_n "checking for EVEMU... " >&6; }
329-
330-if test -n "$EVEMU_CFLAGS"; then
331- pkg_cv_EVEMU_CFLAGS="$EVEMU_CFLAGS"
332- elif test -n "$PKG_CONFIG"; then
333- if test -n "$PKG_CONFIG" && \
334- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evemu >= 1.0.5\""; } >&5
335- ($PKG_CONFIG --exists --print-errors "evemu >= 1.0.5") 2>&5
336- ac_status=$?
337- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
338- test $ac_status = 0; }; then
339- pkg_cv_EVEMU_CFLAGS=`$PKG_CONFIG --cflags "evemu >= 1.0.5" 2>/dev/null`
340- test "x$?" != "x0" && pkg_failed=yes
341-else
342- pkg_failed=yes
343-fi
344- else
345- pkg_failed=untried
346-fi
347-if test -n "$EVEMU_LIBS"; then
348- pkg_cv_EVEMU_LIBS="$EVEMU_LIBS"
349- elif test -n "$PKG_CONFIG"; then
350- if test -n "$PKG_CONFIG" && \
351- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evemu >= 1.0.5\""; } >&5
352- ($PKG_CONFIG --exists --print-errors "evemu >= 1.0.5") 2>&5
353- ac_status=$?
354- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
355- test $ac_status = 0; }; then
356- pkg_cv_EVEMU_LIBS=`$PKG_CONFIG --libs "evemu >= 1.0.5" 2>/dev/null`
357- test "x$?" != "x0" && pkg_failed=yes
358-else
359- pkg_failed=yes
360-fi
361- else
362- pkg_failed=untried
363-fi
364-
365-
366-
367-if test $pkg_failed = yes; then
368- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
369-$as_echo "no" >&6; }
370-
371-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
372- _pkg_short_errors_supported=yes
373-else
374- _pkg_short_errors_supported=no
375-fi
376- if test $_pkg_short_errors_supported = yes; then
377- EVEMU_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "evemu >= 1.0.5" 2>&1`
378- else
379- EVEMU_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "evemu >= 1.0.5" 2>&1`
380- fi
381- # Put the nasty error message in config.log where it belongs
382- echo "$EVEMU_PKG_ERRORS" >&5
383-
384- as_fn_error $? "Package requirements (evemu >= 1.0.5) were not met:
385-
386-$EVEMU_PKG_ERRORS
387-
388-Consider adjusting the PKG_CONFIG_PATH environment variable if you
389-installed software in a non-standard prefix.
390-
391-Alternatively, you may set the environment variables EVEMU_CFLAGS
392-and EVEMU_LIBS to avoid the need to call pkg-config.
393-See the pkg-config man page for more details." "$LINENO" 5
394-elif test $pkg_failed = untried; then
395- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
396-$as_echo "no" >&6; }
397- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
398-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
399-as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
400-is in your PATH or set the PKG_CONFIG environment variable to the full
401-path to pkg-config.
402-
403-Alternatively, you may set the environment variables EVEMU_CFLAGS
404-and EVEMU_LIBS to avoid the need to call pkg-config.
405-See the pkg-config man page for more details.
406-
407-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
408-See \`config.log' for more details" "$LINENO" 5; }
409-else
410- EVEMU_CFLAGS=$pkg_cv_EVEMU_CFLAGS
411- EVEMU_LIBS=$pkg_cv_EVEMU_LIBS
412- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
413-$as_echo "yes" >&6; }
414-
415-fi
416-
417-pkg_failed=no
418 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FRAME" >&5
419 $as_echo_n "checking for FRAME... " >&6; }
420
421@@ -22690,7 +22501,7 @@
422 # report actual input values of CONFIG_FILES etc. instead of their
423 # values after options handling.
424 ac_log="
425-This file was extended by Gesture Recognition And Instantiation Library $as_me 3.0.6, which was
426+This file was extended by Gesture Recognition And Instantiation Library $as_me 3.0.8, which was
427 generated by GNU Autoconf 2.69. Invocation command line was
428
429 CONFIG_FILES = $CONFIG_FILES
430@@ -22756,7 +22567,7 @@
431 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
432 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
433 ac_cs_version="\\
434-Gesture Recognition And Instantiation Library config.status 3.0.6
435+Gesture Recognition And Instantiation Library config.status 3.0.8
436 configured by $0, generated by GNU Autoconf 2.69,
437 with options \\"\$ac_cs_config\\"
438
439
440=== modified file 'configure.ac'
441--- configure.ac 2012-07-26 19:20:06 +0000
442+++ configure.ac 2012-11-09 12:26:39 +0000
443@@ -1,7 +1,7 @@
444 # Initialize Autoconf
445 AC_PREREQ([2.60])
446 AC_INIT([Gesture Recognition And Instantiation Library],
447- [3.0.6],
448+ [3.0.8],
449 [],
450 [grail])
451 AC_CONFIG_SRCDIR([Makefile.am])
452@@ -14,7 +14,7 @@
453 AM_SILENT_RULES([yes])
454 AM_MAINTAINER_MODE([enable])
455
456-LIB_VERSION=5:0:0
457+LIB_VERSION=6:0:0
458 AC_SUBST([LIB_VERSION])
459
460 # Initialize libtool
461@@ -25,8 +25,6 @@
462 AC_PROG_CXX
463 AC_PROG_INSTALL
464
465-PKG_CHECK_MODULES([MTDEV], [mtdev >= 1.1])
466-PKG_CHECK_MODULES([EVEMU], [evemu >= 1.0.5])
467 PKG_CHECK_MODULES([FRAME], [frame >= 2.2.0])
468
469 PKG_CHECK_MODULES([XINPUT],
470
471=== modified file 'debian/changelog'
472--- debian/changelog 2012-08-06 17:06:19 +0000
473+++ debian/changelog 2012-11-09 12:26:39 +0000
474@@ -1,8 +1,13 @@
475-grail (3.0.6-0ubuntu2) UNRELEASED; urgency=low
476+grail (3.0.8-0ubuntu1) raring; urgency=low
477
478+ [ Chase Douglas ]
479 * Remove patches, they have been merged upstream
480
481- -- Chase Douglas <chase.douglas@ubuntu.com> Mon, 06 Aug 2012 10:06:08 -0700
482+ [ Daniel d'Andrada ]
483+ * New upstream release.
484+ * Update library name and symbols to reflect new SONAME
485+
486+ -- Daniel d'Andrada <daniel.dandrada@canonical.com> Fri, 09 Nov 2012 10:19:29 -0200
487
488 grail (3.0.6-0ubuntu1) quantal; urgency=low
489
490
491=== modified file 'debian/control'
492--- debian/control 2012-07-27 21:28:55 +0000
493+++ debian/control 2012-11-09 12:26:39 +0000
494@@ -15,7 +15,7 @@
495 Vcs-Bzr: https://code.launchpad.net/~oif-packaging/grail/packaging
496 Vcs-Browser: http://bazaar.launchpad.net/~oif-packaging/grail/packaging/files
497
498-Package: libgrail5
499+Package: libgrail6
500 Architecture: any
501 Pre-Depends: ${misc:Pre-Depends}
502 Depends: ${misc:Depends},
503@@ -31,7 +31,7 @@
504 Architecture: any
505 Pre-Depends: ${misc:Pre-Depends}
506 Depends: libframe-dev,
507- libgrail5 (= ${binary:Version}),
508+ libgrail6 (= ${binary:Version}),
509 ${misc:Depends}
510 Replaces: libutouch-grail-dev
511 Conflicts: libutouch-grail-dev
512@@ -47,7 +47,7 @@
513 Section: libdevel
514 Architecture: any
515 Pre-Depends: ${misc:Pre-Depends}
516-Depends: libgrail5 (= ${binary:Version}),
517+Depends: libgrail6 (= ${binary:Version}),
518 ${misc:Depends},
519 ${shlibs:Depends}
520 Replaces: utouch-grail-tools
521
522=== renamed file 'debian/libgrail5.install' => 'debian/libgrail6.install'
523--- debian/libgrail5.install 2012-07-27 19:24:34 +0000
524+++ debian/libgrail6.install 2012-11-09 12:26:39 +0000
525@@ -1,1 +1,1 @@
526-usr/lib/*/libgrail.so.5*
527+usr/lib/*/libgrail.so.6*
528
529=== renamed file 'debian/libgrail5.symbols' => 'debian/libgrail6.symbols'
530--- debian/libgrail5.symbols 2012-07-27 19:24:34 +0000
531+++ debian/libgrail6.symbols 2012-11-09 12:26:39 +0000
532@@ -1,38 +1,38 @@
533-libgrail.so.5 libgrail5 #MINVER#
534- (symver)GRAIL_3.0 3.0.6
535- grail_accept_gesture@GRAIL_3.0 3.0.6
536- grail_delete_v3@GRAIL_3.0 3.0.6
537- grail_event_get_property@GRAIL_3.0 3.0.6
538- grail_event_get_time@GRAIL_3.0 3.0.6
539- grail_event_get_type@GRAIL_3.0 3.0.6
540- grail_event_ref@GRAIL_3.0 3.0.6
541- grail_event_unref@GRAIL_3.0 3.0.6
542- grail_get_event@GRAIL_3.0 3.0.6
543- grail_get_fd@GRAIL_3.0 3.0.6
544- grail_new@GRAIL_3.0 3.0.6
545- grail_next_timeout@GRAIL_3.0 3.0.6
546- grail_process_frame_event@GRAIL_3.0 3.0.6
547- grail_reject_gesture@GRAIL_3.0 3.0.6
548- grail_slice_get_center_of_rotation_x@GRAIL_3.0 3.0.6
549- grail_slice_get_center_of_rotation_y@GRAIL_3.0 3.0.6
550- grail_slice_get_construction_finished@GRAIL_3.0 3.0.6
551- grail_slice_get_cumulative_transform@GRAIL_3.0 3.0.6
552- grail_slice_get_frame@GRAIL_3.0 3.0.6
553- grail_slice_get_id@GRAIL_3.0 3.0.6
554- grail_slice_get_num_touches@GRAIL_3.0 3.0.6
555- grail_slice_get_original_center_x@GRAIL_3.0 3.0.6
556- grail_slice_get_original_center_y@GRAIL_3.0 3.0.6
557- grail_slice_get_original_radius@GRAIL_3.0 3.0.6
558- grail_slice_get_property@GRAIL_3.0 3.0.6
559- grail_slice_get_recognized@GRAIL_3.0 3.0.6
560- grail_slice_get_state@GRAIL_3.0 3.0.6
561- grail_slice_get_subscription@GRAIL_3.0 3.0.6
562- grail_slice_get_touch_id@GRAIL_3.0 3.0.6
563- grail_slice_get_transform@GRAIL_3.0 3.0.6
564- grail_subscription_activate@GRAIL_3.0 3.0.6
565- grail_subscription_deactivate@GRAIL_3.0 3.0.6
566- grail_subscription_delete@GRAIL_3.0 3.0.6
567- grail_subscription_get_property@GRAIL_3.0 3.0.6
568- grail_subscription_new@GRAIL_3.0 3.0.6
569- grail_subscription_set_property@GRAIL_3.0 3.0.6
570- grail_update_time@GRAIL_3.0 3.0.6
571+libgrail.so.6 libgrail6 #MINVER#
572+ (symver)GRAIL_3.1 3.0.8
573+ grail_accept_gesture@GRAIL_3.1 3.0.8
574+ grail_delete@GRAIL_3.1 3.0.8
575+ grail_event_get_property@GRAIL_3.1 3.0.8
576+ grail_event_get_time@GRAIL_3.1 3.0.8
577+ grail_event_get_type@GRAIL_3.1 3.0.8
578+ grail_event_ref@GRAIL_3.1 3.0.8
579+ grail_event_unref@GRAIL_3.1 3.0.8
580+ grail_get_event@GRAIL_3.1 3.0.8
581+ grail_get_fd@GRAIL_3.1 3.0.8
582+ grail_new@GRAIL_3.1 3.0.8
583+ grail_next_timeout@GRAIL_3.1 3.0.8
584+ grail_process_frame_event@GRAIL_3.1 3.0.8
585+ grail_reject_gesture@GRAIL_3.1 3.0.8
586+ grail_slice_get_center_of_rotation_x@GRAIL_3.1 3.0.8
587+ grail_slice_get_center_of_rotation_y@GRAIL_3.1 3.0.8
588+ grail_slice_get_construction_finished@GRAIL_3.1 3.0.8
589+ grail_slice_get_cumulative_transform@GRAIL_3.1 3.0.8
590+ grail_slice_get_frame@GRAIL_3.1 3.0.8
591+ grail_slice_get_id@GRAIL_3.1 3.0.8
592+ grail_slice_get_num_touches@GRAIL_3.1 3.0.8
593+ grail_slice_get_original_center_x@GRAIL_3.1 3.0.8
594+ grail_slice_get_original_center_y@GRAIL_3.1 3.0.8
595+ grail_slice_get_original_radius@GRAIL_3.1 3.0.8
596+ grail_slice_get_property@GRAIL_3.1 3.0.8
597+ grail_slice_get_recognized@GRAIL_3.1 3.0.8
598+ grail_slice_get_state@GRAIL_3.1 3.0.8
599+ grail_slice_get_subscription@GRAIL_3.1 3.0.8
600+ grail_slice_get_touch_id@GRAIL_3.1 3.0.8
601+ grail_slice_get_transform@GRAIL_3.1 3.0.8
602+ grail_subscription_activate@GRAIL_3.1 3.0.8
603+ grail_subscription_deactivate@GRAIL_3.1 3.0.8
604+ grail_subscription_delete@GRAIL_3.1 3.0.8
605+ grail_subscription_get_property@GRAIL_3.1 3.0.8
606+ grail_subscription_new@GRAIL_3.1 3.0.8
607+ grail_subscription_set_property@GRAIL_3.1 3.0.8
608+ grail_update_time@GRAIL_3.1 3.0.8
609
610=== modified file 'include/oif/grail.h'
611--- include/oif/grail.h 2012-06-21 20:30:14 +0000
612+++ include/oif/grail.h 2012-11-09 12:26:39 +0000
613@@ -397,12 +397,11 @@
614 /**
615 * Create a new grail context
616 *
617- * @param [in] frame_handle The frame context object
618 * @param [out] handle The new grail context object
619 * @return UGStatusSuccess or UGStatusErrorResources
620 */
621 GRAIL_PUBLIC
622-UGStatus grail_new(UFHandle frame_handle, UGHandle *handle);
623+UGStatus grail_new(UGHandle *handle);
624
625 /**
626 * Delete a grail context
627@@ -410,7 +409,7 @@
628 * @param [in] handle The grail context object
629 */
630 GRAIL_PUBLIC
631-void grail_delete_v3(UGHandle handle);
632+void grail_delete(UGHandle handle);
633
634 /**
635 * Get the event file descriptor for the frame context
636
637=== modified file 'src/Makefile.am'
638--- src/Makefile.am 2012-06-21 20:30:14 +0000
639+++ src/Makefile.am 2012-11-09 12:26:39 +0000
640@@ -12,8 +12,6 @@
641 -Wl,--version-script=$(version_script)
642
643 libgrail_la_LIBADD = \
644- $(MTDEV_LIBS) \
645- $(EVEMU_LIBS) \
646 $(FRAME_LIBS) \
647 $(COVERAGE_LIBS) \
648 -lm
649
650=== modified file 'src/Makefile.in'
651--- src/Makefile.in 2012-07-26 19:20:06 +0000
652+++ src/Makefile.in 2012-11-09 12:26:39 +0000
653@@ -1,4 +1,4 @@
654-# Makefile.in generated by automake 1.11.5 from Makefile.am.
655+# Makefile.in generated by automake 1.11.6 from Makefile.am.
656 # @configure_input@
657
658 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
659@@ -99,8 +99,7 @@
660 "$(DESTDIR)$(libgrail_includedir)"
661 LTLIBRARIES = $(lib_LTLIBRARIES)
662 am__DEPENDENCIES_1 =
663-libgrail_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
664- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
665+libgrail_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
666 am_libgrail_la_OBJECTS = atomic-recognizer.lo event.lo gesture.lo \
667 handle.lo log.lo recognizer.lo regular-recognizer.lo slice.lo \
668 subscription.lo touch.lo
669@@ -228,8 +227,6 @@
670 MAKEINFO = @MAKEINFO@
671 MANIFEST_TOOL = @MANIFEST_TOOL@
672 MKDIR_P = @MKDIR_P@
673-MTDEV_CFLAGS = @MTDEV_CFLAGS@
674-MTDEV_LIBS = @MTDEV_LIBS@
675 NM = @NM@
676 NMEDIT = @NMEDIT@
677 OBJDUMP = @OBJDUMP@
678@@ -327,8 +324,6 @@
679 -Wl,--version-script=$(version_script)
680
681 libgrail_la_LIBADD = \
682- $(MTDEV_LIBS) \
683- $(EVEMU_LIBS) \
684 $(FRAME_LIBS) \
685 $(COVERAGE_LIBS) \
686 -lm
687
688=== modified file 'src/handle.cpp'
689--- src/handle.cpp 2012-07-24 21:52:37 +0000
690+++ src/handle.cpp 2012-11-09 12:26:39 +0000
691@@ -40,9 +40,8 @@
692 namespace oif {
693 namespace grail {
694
695-UGHandle::UGHandle(UFHandle frame_handle)
696- : frame_handle_(frame_handle),
697- event_fd_(eventfd(0, EFD_NONBLOCK)),
698+UGHandle::UGHandle()
699+ : event_fd_(eventfd(0, EFD_NONBLOCK)),
700 next_id_(0) {
701 if (event_fd_ == -1) {
702 throw std::runtime_error("Error: failed to create eventfd instance\n");
703@@ -292,9 +291,9 @@
704
705 extern "C" {
706
707-UGStatus grail_new(UFHandle frame_handle, UGHandle* handle) {
708+UGStatus grail_new(UGHandle* handle) {
709 try {
710- *handle = new oif::grail::UGHandle(frame_handle);
711+ *handle = new oif::grail::UGHandle;
712 } catch(const std::exception&) {
713 return UGStatusErrorResources;
714 }
715@@ -302,7 +301,7 @@
716 return UGStatusSuccess;
717 }
718
719-void grail_delete_v3(UGHandle handle) {
720+void grail_delete(UGHandle handle) {
721 delete static_cast<oif::grail::UGHandle*>(handle);
722 }
723
724
725=== modified file 'src/handle.h'
726--- src/handle.h 2012-06-21 20:30:14 +0000
727+++ src/handle.h 2012-11-09 12:26:39 +0000
728@@ -38,7 +38,7 @@
729
730 class UGHandle : public UGHandle_ {
731 public:
732- explicit UGHandle(UFHandle frame_handle);
733+ UGHandle();
734 ~UGHandle();
735
736 int event_fd() const { return event_fd_; }
737@@ -61,7 +61,6 @@
738 private:
739 typedef std::unique_ptr<Recognizer> UniqueRecognizer;
740
741- const UFHandle frame_handle_;
742 int event_fd_;
743 unsigned int next_id_;
744 std::map<UFDevice, std::map<UFWindowId, UniqueRecognizer>> recognizers_;
745
746=== modified file 'src/libgrail.ver'
747--- src/libgrail.ver 2012-06-21 20:30:14 +0000
748+++ src/libgrail.ver 2012-11-09 12:26:39 +0000
749@@ -1,7 +1,7 @@
750-GRAIL_3.0 {
751+GRAIL_3.1 {
752 global:
753 grail_accept_gesture;
754- grail_delete_v3;
755+ grail_delete;
756 grail_event_get_property;
757 grail_event_get_time;
758 grail_event_get_type;
759
760=== modified file 'test/Makefile.in'
761--- test/Makefile.in 2012-07-26 19:20:06 +0000
762+++ test/Makefile.in 2012-11-09 12:26:39 +0000
763@@ -1,4 +1,4 @@
764-# Makefile.in generated by automake 1.11.5 from Makefile.am.
765+# Makefile.in generated by automake 1.11.6 from Makefile.am.
766 # @configure_input@
767
768 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
769@@ -184,8 +184,6 @@
770 MAKEINFO = @MAKEINFO@
771 MANIFEST_TOOL = @MANIFEST_TOOL@
772 MKDIR_P = @MKDIR_P@
773-MTDEV_CFLAGS = @MTDEV_CFLAGS@
774-MTDEV_LIBS = @MTDEV_LIBS@
775 NM = @NM@
776 NMEDIT = @NMEDIT@
777 OBJDUMP = @OBJDUMP@
778
779=== modified file 'test/gtest/Makefile.in'
780--- test/gtest/Makefile.in 2012-07-26 19:20:06 +0000
781+++ test/gtest/Makefile.in 2012-11-09 12:26:39 +0000
782@@ -1,4 +1,4 @@
783-# Makefile.in generated by automake 1.11.5 from Makefile.am.
784+# Makefile.in generated by automake 1.11.6 from Makefile.am.
785 # @configure_input@
786
787 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
788@@ -187,8 +187,6 @@
789 MAKEINFO = @MAKEINFO@
790 MANIFEST_TOOL = @MANIFEST_TOOL@
791 MKDIR_P = @MKDIR_P@
792-MTDEV_CFLAGS = @MTDEV_CFLAGS@
793-MTDEV_LIBS = @MTDEV_LIBS@
794 NM = @NM@
795 NMEDIT = @NMEDIT@
796 OBJDUMP = @OBJDUMP@
797
798=== modified file 'test/integration/Makefile.am'
799--- test/integration/Makefile.am 2012-07-24 21:52:37 +0000
800+++ test/integration/Makefile.am 2012-11-09 12:26:39 +0000
801@@ -57,7 +57,6 @@
802 $(top_builddir)/test/gtest/libgtest_grail.a \
803 $(EVEMU_LIBS) \
804 $(FRAME_LIBS) \
805- $(MTDEV_LIBS) \
806 $(COVERAGE_LIBS) \
807 $(GTEST_LIBS) \
808 $(XORG_GTEST_LIBS) \
809
810=== modified file 'test/integration/Makefile.in'
811--- test/integration/Makefile.in 2012-07-26 19:20:06 +0000
812+++ test/integration/Makefile.in 2012-11-09 12:26:39 +0000
813@@ -1,4 +1,4 @@
814-# Makefile.in generated by automake 1.11.5 from Makefile.am.
815+# Makefile.in generated by automake 1.11.6 from Makefile.am.
816 # @configure_input@
817
818 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
819@@ -90,8 +90,7 @@
820 $(top_builddir)/test/gtest/libgtest_grail.a \
821 $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
822 $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
823- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
824- $(am__DEPENDENCIES_1)
825+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
826 AM_V_lt = $(am__v_lt_@AM_V@)
827 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
828 am__v_lt_0 = --silent
829@@ -218,8 +217,6 @@
830 MAKEINFO = @MAKEINFO@
831 MANIFEST_TOOL = @MANIFEST_TOOL@
832 MKDIR_P = @MKDIR_P@
833-MTDEV_CFLAGS = @MTDEV_CFLAGS@
834-MTDEV_LIBS = @MTDEV_LIBS@
835 NM = @NM@
836 NMEDIT = @NMEDIT@
837 OBJDUMP = @OBJDUMP@
838@@ -363,7 +360,6 @@
839 $(top_builddir)/test/gtest/libgtest_grail.a \
840 $(EVEMU_LIBS) \
841 $(FRAME_LIBS) \
842- $(MTDEV_LIBS) \
843 $(COVERAGE_LIBS) \
844 $(GTEST_LIBS) \
845 $(XORG_GTEST_LIBS) \
846
847=== modified file 'test/integration/x11/fixture.cpp'
848--- test/integration/x11/fixture.cpp 2012-06-21 20:30:14 +0000
849+++ test/integration/x11/fixture.cpp 2012-11-09 12:26:39 +0000
850@@ -103,7 +103,7 @@
851 UFStatus frame_status = frame_x11_new(Display(), &frame_handle_);
852 ASSERT_EQ(UFStatusSuccess, frame_status);
853
854- UGStatus grail_status = grail_new(frame_handle_, &grail_handle_);
855+ UGStatus grail_status = grail_new(&grail_handle_);
856 ASSERT_EQ(UGStatusSuccess, grail_status);
857 ASSERT_NE(grail_handle_, nullptr);
858 }
859@@ -223,7 +223,7 @@
860
861 void oif::grail::x11::testing::Test::TearDown() {
862 XSyncDestroyAlarm(Display(), alarm_);
863- grail_delete_v3(grail_handle_);
864+ grail_delete(grail_handle_);
865 frame_x11_delete(frame_handle_);
866 xorg::testing::Test::TearDown();
867 }
868
869=== modified file 'test/regular/Makefile.am'
870--- test/regular/Makefile.am 2012-07-24 21:52:37 +0000
871+++ test/regular/Makefile.am 2012-11-09 12:26:39 +0000
872@@ -10,16 +10,14 @@
873 test_c_compile_SOURCES = test-c-compile.c
874 test_c_compile_LDADD = \
875 $(top_builddir)/src/libgrail.la \
876- $(FRAME_LIBS) \
877- $(MTDEV_LIBS)
878+ $(FRAME_LIBS)
879 test_c_compile_CFLAGS = \
880 -I$(top_srcdir)/include
881
882 test_cxx_compile_SOURCES = test-cxx-compile.cpp
883 test_cxx_compile_LDADD = \
884 $(top_builddir)/src/libgrail.la \
885- $(FRAME_LIBS) \
886- $(MTDEV_LIBS)
887+ $(FRAME_LIBS)
888 test_cxx_compile_CPPFLAGS = \
889 -I$(top_srcdir)/include
890
891
892=== modified file 'test/regular/Makefile.in'
893--- test/regular/Makefile.in 2012-07-26 19:20:06 +0000
894+++ test/regular/Makefile.in 2012-11-09 12:26:39 +0000
895@@ -1,4 +1,4 @@
896-# Makefile.in generated by automake 1.11.5 from Makefile.am.
897+# Makefile.in generated by automake 1.11.6 from Makefile.am.
898 # @configure_input@
899
900 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
901@@ -90,7 +90,7 @@
902 am_test_c_compile_OBJECTS = test_c_compile-test-c-compile.$(OBJEXT)
903 test_c_compile_OBJECTS = $(am_test_c_compile_OBJECTS)
904 test_c_compile_DEPENDENCIES = $(top_builddir)/src/libgrail.la \
905- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
906+ $(am__DEPENDENCIES_1)
907 test_c_compile_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
908 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
909 $(test_c_compile_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o \
910@@ -99,7 +99,7 @@
911 test_cxx_compile-test-cxx-compile.$(OBJEXT)
912 test_cxx_compile_OBJECTS = $(am_test_cxx_compile_OBJECTS)
913 test_cxx_compile_DEPENDENCIES = $(top_builddir)/src/libgrail.la \
914- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
915+ $(am__DEPENDENCIES_1)
916 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
917 depcomp = $(SHELL) $(top_srcdir)/config-aux/depcomp
918 am__depfiles_maybe = depfiles
919@@ -220,8 +220,6 @@
920 MAKEINFO = @MAKEINFO@
921 MANIFEST_TOOL = @MANIFEST_TOOL@
922 MKDIR_P = @MKDIR_P@
923-MTDEV_CFLAGS = @MTDEV_CFLAGS@
924-MTDEV_LIBS = @MTDEV_LIBS@
925 NM = @NM@
926 NMEDIT = @NMEDIT@
927 OBJDUMP = @OBJDUMP@
928@@ -313,8 +311,7 @@
929 test_c_compile_SOURCES = test-c-compile.c
930 test_c_compile_LDADD = \
931 $(top_builddir)/src/libgrail.la \
932- $(FRAME_LIBS) \
933- $(MTDEV_LIBS)
934+ $(FRAME_LIBS)
935
936 test_c_compile_CFLAGS = \
937 -I$(top_srcdir)/include
938@@ -322,8 +319,7 @@
939 test_cxx_compile_SOURCES = test-cxx-compile.cpp
940 test_cxx_compile_LDADD = \
941 $(top_builddir)/src/libgrail.la \
942- $(FRAME_LIBS) \
943- $(MTDEV_LIBS)
944+ $(FRAME_LIBS)
945
946 test_cxx_compile_CPPFLAGS = \
947 -I$(top_srcdir)/include
948
949=== modified file 'test/regular/grail-fixture.h'
950--- test/regular/grail-fixture.h 2012-07-24 21:52:37 +0000
951+++ test/regular/grail-fixture.h 2012-11-09 12:26:39 +0000
952@@ -33,7 +33,7 @@
953 virtual void TearDown()
954 {
955 if (grail_handle)
956- grail_delete_v3(grail_handle);
957+ grail_delete(grail_handle);
958 }
959
960 protected:
961
962=== modified file 'test/regular/grail.cpp'
963--- test/regular/grail.cpp 2012-07-24 21:52:37 +0000
964+++ test/regular/grail.cpp 2012-11-09 12:26:39 +0000
965@@ -3,10 +3,9 @@
966 #include "oif/grail.h"
967
968 TEST(grail, grail) {
969- UFHandle frame_handle = NULL;
970 UGHandle grail_handle = NULL;
971
972- ASSERT_EQ(UGStatusSuccess, grail_new(frame_handle, &grail_handle));
973+ ASSERT_EQ(UGStatusSuccess, grail_new(&grail_handle));
974
975 int fd = grail_get_fd(grail_handle);
976
977@@ -63,5 +62,5 @@
978 grail_accept_gesture(grail_handle, 0));*/
979
980 grail_subscription_delete(subscription);
981- grail_delete_v3(grail_handle);
982+ grail_delete(grail_handle);
983 }
984
985=== modified file 'test/regular/intermittent_3touch.cpp'
986--- test/regular/intermittent_3touch.cpp 2012-07-24 21:52:37 +0000
987+++ test/regular/intermittent_3touch.cpp 2012-11-09 12:26:39 +0000
988@@ -17,10 +17,9 @@
989 TEST_F(Intermittent3TouchTest, Test)
990 {
991 UGStatus status;
992- struct UFHandle_ frame_handle_struct;
993 fake_window_id = 321;
994
995- status = grail_new(&frame_handle_struct, &grail_handle);
996+ status = grail_new(&grail_handle);
997 ASSERT_EQ(UGStatusSuccess, status);
998
999 SendDeviceAddedEvent(time);
1000
1001=== modified file 'test/regular/one-touch-gest-finished.cpp'
1002--- test/regular/one-touch-gest-finished.cpp 2012-07-24 21:52:37 +0000
1003+++ test/regular/one-touch-gest-finished.cpp 2012-11-09 12:26:39 +0000
1004@@ -10,11 +10,10 @@
1005 TEST_F(SingleTouchGestureTest, QuickTapEndsWithConstructionFinished)
1006 {
1007 UGStatus status;
1008- struct UFHandle_ frame_handle_struct;
1009 UFWindowId fake_window_id = 321;
1010 uint64_t time = 1234;
1011
1012- status = grail_new(&frame_handle_struct, &grail_handle);
1013+ status = grail_new(&grail_handle);
1014 ASSERT_EQ(UGStatusSuccess, status);
1015
1016 SendDeviceAddedEvent(time);
1017
1018=== modified file 'test/regular/pending-end.cpp'
1019--- test/regular/pending-end.cpp 2012-07-24 21:52:37 +0000
1020+++ test/regular/pending-end.cpp 2012-11-09 12:26:39 +0000
1021@@ -9,10 +9,9 @@
1022 TEST_F(GrailTest, PendingEndImpedesGestures)
1023 {
1024 UGStatus status;
1025- struct UFHandle_ frame_handle_struct;
1026 fake_window_id = 321;
1027
1028- status = grail_new(&frame_handle_struct, &grail_handle);
1029+ status = grail_new(&grail_handle);
1030 ASSERT_EQ(UGStatusSuccess, status);
1031
1032 SendDeviceAddedEvent(time);
1033
1034=== modified file 'test/regular/still-gest-finishes.cpp'
1035--- test/regular/still-gest-finishes.cpp 2012-07-03 22:12:48 +0000
1036+++ test/regular/still-gest-finishes.cpp 2012-11-09 12:26:39 +0000
1037@@ -10,11 +10,10 @@
1038 TEST_F(GrailTest, StillGestureFinishesConstruction)
1039 {
1040 UGStatus status;
1041- struct UFHandle_ frame_handle_struct;
1042 UFWindowId fake_window_id = 321;
1043 uint64_t time = 1234;
1044
1045- status = grail_new(&frame_handle_struct, &grail_handle);
1046+ status = grail_new(&grail_handle);
1047 ASSERT_EQ(UGStatusSuccess, status);
1048
1049 SendDeviceAddedEvent(time);
1050
1051=== modified file 'tools/Makefile.am'
1052--- tools/Makefile.am 2012-06-21 20:30:14 +0000
1053+++ tools/Makefile.am 2012-11-09 12:26:39 +0000
1054@@ -51,8 +51,6 @@
1055 LDADD = \
1056 $(top_builddir)/src/libgrail.la \
1057 $(FRAME_LIBS) \
1058- $(EVEMU_LIBS) \
1059- $(MTDEV_LIBS) \
1060 $(X11_LIBS) \
1061 $(XINPUT_LIBS) \
1062 $(COVERAGE_LIBS) \
1063
1064=== modified file 'tools/Makefile.in'
1065--- tools/Makefile.in 2012-07-26 19:20:06 +0000
1066+++ tools/Makefile.in 2012-11-09 12:26:39 +0000
1067@@ -1,4 +1,4 @@
1068-# Makefile.in generated by automake 1.11.5 from Makefile.am.
1069+# Makefile.in generated by automake 1.11.6 from Makefile.am.
1070 # @configure_input@
1071
1072 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
1073@@ -79,7 +79,6 @@
1074 am__DEPENDENCIES_1 =
1075 grail_test_3_1_DEPENDENCIES = $(top_builddir)/src/libgrail.la \
1076 $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
1077- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
1078 $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
1079 AM_V_lt = $(am__v_lt_@AM_V@)
1080 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
1081@@ -90,7 +89,6 @@
1082 grail_test_atomic_LDADD = $(LDADD)
1083 grail_test_atomic_DEPENDENCIES = $(top_builddir)/src/libgrail.la \
1084 $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
1085- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
1086 $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
1087 am_grail_test_edge_OBJECTS = grail-test-edge.$(OBJEXT) \
1088 device.$(OBJEXT) servertime.$(OBJEXT) slice.$(OBJEXT)
1089@@ -98,7 +96,6 @@
1090 grail_test_edge_LDADD = $(LDADD)
1091 grail_test_edge_DEPENDENCIES = $(top_builddir)/src/libgrail.la \
1092 $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
1093- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
1094 $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
1095 am_grail_test_propagation_OBJECTS = grail-test-propagation.$(OBJEXT) \
1096 device.$(OBJEXT) servertime.$(OBJEXT) slice.$(OBJEXT)
1097@@ -106,7 +103,6 @@
1098 grail_test_propagation_LDADD = $(LDADD)
1099 grail_test_propagation_DEPENDENCIES = $(top_builddir)/src/libgrail.la \
1100 $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
1101- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
1102 $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
1103 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
1104 depcomp = $(SHELL) $(top_srcdir)/config-aux/depcomp
1105@@ -240,8 +236,6 @@
1106 MAKEINFO = @MAKEINFO@
1107 MANIFEST_TOOL = @MANIFEST_TOOL@
1108 MKDIR_P = @MKDIR_P@
1109-MTDEV_CFLAGS = @MTDEV_CFLAGS@
1110-MTDEV_LIBS = @MTDEV_LIBS@
1111 NM = @NM@
1112 NMEDIT = @NMEDIT@
1113 OBJDUMP = @OBJDUMP@
1114@@ -373,8 +367,6 @@
1115 LDADD = \
1116 $(top_builddir)/src/libgrail.la \
1117 $(FRAME_LIBS) \
1118- $(EVEMU_LIBS) \
1119- $(MTDEV_LIBS) \
1120 $(X11_LIBS) \
1121 $(XINPUT_LIBS) \
1122 $(COVERAGE_LIBS) \
1123
1124=== modified file 'tools/grail-test-3-1.c'
1125--- tools/grail-test-3-1.c 2012-06-21 20:30:14 +0000
1126+++ tools/grail-test-3-1.c 2012-11-09 12:26:39 +0000
1127@@ -281,7 +281,7 @@
1128
1129 nfds = frame_fd + 1 > nfds ? frame_fd + 1 : nfds;
1130
1131- grail_status = grail_new(frame_handle, &grail_handle);
1132+ grail_status = grail_new(&grail_handle);
1133 if (grail_status != UGStatusSuccess) {
1134 fprintf(stderr, "Error: failed to create grail instance\n");
1135 frame_x11_delete(frame_handle);
1136@@ -365,7 +365,7 @@
1137 }
1138
1139 destroy_alarm(display, alarm);
1140- grail_delete_v3(grail_handle);
1141+ grail_delete(grail_handle);
1142 frame_x11_delete(frame_handle);
1143 XCloseDisplay(display);
1144
1145
1146=== modified file 'tools/grail-test-atomic.c'
1147--- tools/grail-test-atomic.c 2012-06-21 20:30:14 +0000
1148+++ tools/grail-test-atomic.c 2012-11-09 12:26:39 +0000
1149@@ -296,7 +296,7 @@
1150
1151 nfds = frame_fd + 1 > nfds ? frame_fd + 1 : nfds;
1152
1153- grail_status = grail_new(frame_handle, &grail_handle);
1154+ grail_status = grail_new(&grail_handle);
1155 if (grail_status != UGStatusSuccess) {
1156 fprintf(stderr, "Error: failed to create grail instance\n");
1157 frame_x11_delete(frame_handle);
1158@@ -380,7 +380,7 @@
1159 }
1160
1161 destroy_alarm(display, alarm);
1162- grail_delete_v3(grail_handle);
1163+ grail_delete(grail_handle);
1164 frame_x11_delete(frame_handle);
1165 XCloseDisplay(display);
1166
1167
1168=== modified file 'tools/grail-test-edge.c'
1169--- tools/grail-test-edge.c 2012-06-21 20:30:14 +0000
1170+++ tools/grail-test-edge.c 2012-11-09 12:26:39 +0000
1171@@ -295,7 +295,7 @@
1172
1173 nfds = frame_fd + 1 > nfds ? frame_fd + 1 : nfds;
1174
1175- grail_status = grail_new(frame_handle, &grail_handle);
1176+ grail_status = grail_new(&grail_handle);
1177 if (grail_status != UGStatusSuccess) {
1178 fprintf(stderr, "Error: failed to create grail instance\n");
1179 frame_x11_delete(frame_handle);
1180@@ -379,7 +379,7 @@
1181 }
1182
1183 destroy_alarm(display, alarm);
1184- grail_delete_v3(grail_handle);
1185+ grail_delete(grail_handle);
1186 frame_x11_delete(frame_handle);
1187 XCloseDisplay(display);
1188
1189
1190=== modified file 'tools/grail-test-propagation.c'
1191--- tools/grail-test-propagation.c 2012-06-21 20:30:14 +0000
1192+++ tools/grail-test-propagation.c 2012-11-09 12:26:39 +0000
1193@@ -263,7 +263,7 @@
1194
1195 nfds = frame_fd + 1 > nfds ? frame_fd + 1 : nfds;
1196
1197- grail_status = grail_new(frame_handle, &grail_handle);
1198+ grail_status = grail_new(&grail_handle);
1199 if (grail_status != UGStatusSuccess) {
1200 fprintf(stderr, "Error: failed to create grail instance\n");
1201 frame_x11_delete(frame_handle);
1202@@ -347,7 +347,7 @@
1203 }
1204
1205 destroy_alarm(display, alarm);
1206- grail_delete_v3(grail_handle);
1207+ grail_delete(grail_handle);
1208 frame_x11_delete(frame_handle);
1209 XCloseDisplay(display);
1210

Subscribers

People subscribed via source and target branches