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
=== modified file 'INSTALL'
--- INSTALL 2012-06-21 20:30:14 +0000
+++ INSTALL 2012-11-09 12:26:39 +0000
@@ -1,7 +1,7 @@
1grail - Gesture Recognition And Instantiation Library1grail - Gesture Recognition And Instantiation Library
22
3To build, you need to have the autoconf, libtool, mtdev-dev, libevemu-dev,3To build, you need to have the autoconf, libtool, and libframe-dev
4and libframe packages installed. Then, do4packages installed. Then, do
55
6 ./autogen.sh6 ./autogen.sh
7 ./configure7 ./configure
88
=== modified file 'Makefile.in'
--- Makefile.in 2012-07-26 19:20:06 +0000
+++ Makefile.in 2012-11-09 12:26:39 +0000
@@ -1,4 +1,4 @@
1# Makefile.in generated by automake 1.11.5 from Makefile.am.1# Makefile.in generated by automake 1.11.6 from Makefile.am.
2# @configure_input@2# @configure_input@
33
4# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,4# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -234,8 +234,6 @@
234MAKEINFO = @MAKEINFO@234MAKEINFO = @MAKEINFO@
235MANIFEST_TOOL = @MANIFEST_TOOL@235MANIFEST_TOOL = @MANIFEST_TOOL@
236MKDIR_P = @MKDIR_P@236MKDIR_P = @MKDIR_P@
237MTDEV_CFLAGS = @MTDEV_CFLAGS@
238MTDEV_LIBS = @MTDEV_LIBS@
239NM = @NM@237NM = @NM@
240NMEDIT = @NMEDIT@238NMEDIT = @NMEDIT@
241OBJDUMP = @OBJDUMP@239OBJDUMP = @OBJDUMP@
@@ -673,7 +671,7 @@
673 *.zip*) \671 *.zip*) \
674 unzip $(distdir).zip ;;\672 unzip $(distdir).zip ;;\
675 esac673 esac
676 chmod -R a-w $(distdir); chmod a+w $(distdir)674 chmod -R a-w $(distdir); chmod u+w $(distdir)
677 mkdir $(distdir)/_build675 mkdir $(distdir)/_build
678 mkdir $(distdir)/_inst676 mkdir $(distdir)/_inst
679 chmod a-w $(distdir)677 chmod a-w $(distdir)
680678
=== modified file 'aclocal.m4'
--- aclocal.m4 2012-07-26 19:20:06 +0000
+++ aclocal.m4 2012-11-09 12:26:39 +0000
@@ -1,4 +1,4 @@
1# generated automatically by aclocal 1.11.5 -*- Autoconf -*-1# generated automatically by aclocal 1.11.6 -*- Autoconf -*-
22
3# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,3# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
4# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,4# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
@@ -38,7 +38,7 @@
38[am__api_version='1.11'38[am__api_version='1.11'
39dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to39dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
40dnl require some minimum version. Point them to the right macro.40dnl require some minimum version. Point them to the right macro.
41m4_if([$1], [1.11.5], [],41m4_if([$1], [1.11.6], [],
42 [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl42 [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
43])43])
4444
@@ -54,7 +54,7 @@
54# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.54# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
55# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.55# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
56AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],56AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
57[AM_AUTOMAKE_VERSION([1.11.5])dnl57[AM_AUTOMAKE_VERSION([1.11.6])dnl
58m4_ifndef([AC_AUTOCONF_VERSION],58m4_ifndef([AC_AUTOCONF_VERSION],
59 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl59 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
60_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])60_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
6161
=== modified file 'config-aux/ltmain.sh'
--- config-aux/ltmain.sh 2012-01-30 23:19:19 +0000
+++ config-aux/ltmain.sh 2012-11-09 12:26:39 +0000
@@ -70,7 +70,7 @@
70# compiler: $LTCC70# compiler: $LTCC
71# compiler flags: $LTCFLAGS71# compiler flags: $LTCFLAGS
72# linker: $LD (gnu? $with_gnu_ld)72# linker: $LD (gnu? $with_gnu_ld)
73# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1ubuntu173# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1ubuntu2
74# automake: $automake_version74# automake: $automake_version
75# autoconf: $autoconf_version75# autoconf: $autoconf_version
76#76#
@@ -80,7 +80,7 @@
8080
81PROGRAM=libtool81PROGRAM=libtool
82PACKAGE=libtool82PACKAGE=libtool
83VERSION="2.4.2 Debian-2.4.2-1ubuntu1"83VERSION="2.4.2 Debian-2.4.2-1ubuntu2"
84TIMESTAMP=""84TIMESTAMP=""
85package_revision=1.333785package_revision=1.3337
8686
8787
=== modified file 'configure'
--- configure 2012-07-26 19:20:06 +0000
+++ configure 2012-11-09 12:26:39 +0000
@@ -1,6 +1,6 @@
1#! /bin/sh1#! /bin/sh
2# Guess values for system-dependent variables and create Makefiles.2# Guess values for system-dependent variables and create Makefiles.
3# Generated by GNU Autoconf 2.69 for Gesture Recognition And Instantiation Library 3.0.6.3# Generated by GNU Autoconf 2.69 for Gesture Recognition And Instantiation Library 3.0.8.
4#4#
5#5#
6# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.6# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -587,8 +587,8 @@
587# Identity of this package.587# Identity of this package.
588PACKAGE_NAME='Gesture Recognition And Instantiation Library'588PACKAGE_NAME='Gesture Recognition And Instantiation Library'
589PACKAGE_TARNAME='grail'589PACKAGE_TARNAME='grail'
590PACKAGE_VERSION='3.0.6'590PACKAGE_VERSION='3.0.8'
591PACKAGE_STRING='Gesture Recognition And Instantiation Library 3.0.6'591PACKAGE_STRING='Gesture Recognition And Instantiation Library 3.0.8'
592PACKAGE_BUGREPORT=''592PACKAGE_BUGREPORT=''
593PACKAGE_URL=''593PACKAGE_URL=''
594594
@@ -653,6 +653,8 @@
653BASE_CXXFLAGS653BASE_CXXFLAGS
654XORG_GTEST_CPPFLAGS654XORG_GTEST_CPPFLAGS
655XORG_GTEST_SOURCE655XORG_GTEST_SOURCE
656EVEMU_LIBS
657EVEMU_CFLAGS
656X11_LIBS658X11_LIBS
657X11_CFLAGS659X11_CFLAGS
658HAVE_GTEST_FALSE660HAVE_GTEST_FALSE
@@ -664,10 +666,6 @@
664XINPUT_CFLAGS666XINPUT_CFLAGS
665FRAME_LIBS667FRAME_LIBS
666FRAME_CFLAGS668FRAME_CFLAGS
667EVEMU_LIBS
668EVEMU_CFLAGS
669MTDEV_LIBS
670MTDEV_CFLAGS
671PKG_CONFIG_LIBDIR669PKG_CONFIG_LIBDIR
672PKG_CONFIG_PATH670PKG_CONFIG_PATH
673PKG_CONFIG671PKG_CONFIG
@@ -832,16 +830,14 @@
832PKG_CONFIG830PKG_CONFIG
833PKG_CONFIG_PATH831PKG_CONFIG_PATH
834PKG_CONFIG_LIBDIR832PKG_CONFIG_LIBDIR
835MTDEV_CFLAGS
836MTDEV_LIBS
837EVEMU_CFLAGS
838EVEMU_LIBS
839FRAME_CFLAGS833FRAME_CFLAGS
840FRAME_LIBS834FRAME_LIBS
841XINPUT_CFLAGS835XINPUT_CFLAGS
842XINPUT_LIBS836XINPUT_LIBS
843X11_CFLAGS837X11_CFLAGS
844X11_LIBS'838X11_LIBS
839EVEMU_CFLAGS
840EVEMU_LIBS'
845841
846842
847# Initialize some variables set by options.843# Initialize some variables set by options.
@@ -1382,7 +1378,7 @@
1382 # Omit some internal or obsolete options to make the list less imposing.1378 # Omit some internal or obsolete options to make the list less imposing.
1383 # This message is too long to be a string in the A/UX 3.1 sh.1379 # This message is too long to be a string in the A/UX 3.1 sh.
1384 cat <<_ACEOF1380 cat <<_ACEOF
1385\`configure' configures Gesture Recognition And Instantiation Library 3.0.6 to adapt to many kinds of systems.1381\`configure' configures Gesture Recognition And Instantiation Library 3.0.8 to adapt to many kinds of systems.
13861382
1387Usage: $0 [OPTION]... [VAR=VALUE]...1383Usage: $0 [OPTION]... [VAR=VALUE]...
13881384
@@ -1452,7 +1448,7 @@
14521448
1453if test -n "$ac_init_help"; then1449if test -n "$ac_init_help"; then
1454 case $ac_init_help in1450 case $ac_init_help in
1455 short | recursive ) echo "Configuration of Gesture Recognition And Instantiation Library 3.0.6:";;1451 short | recursive ) echo "Configuration of Gesture Recognition And Instantiation Library 3.0.8:";;
1456 esac1452 esac
1457 cat <<\_ACEOF1453 cat <<\_ACEOF
14581454
@@ -1517,12 +1513,6 @@
1517 directories to add to pkg-config's search path1513 directories to add to pkg-config's search path
1518 PKG_CONFIG_LIBDIR1514 PKG_CONFIG_LIBDIR
1519 path overriding pkg-config's built-in search path1515 path overriding pkg-config's built-in search path
1520 MTDEV_CFLAGS
1521 C compiler flags for MTDEV, overriding pkg-config
1522 MTDEV_LIBS linker flags for MTDEV, overriding pkg-config
1523 EVEMU_CFLAGS
1524 C compiler flags for EVEMU, overriding pkg-config
1525 EVEMU_LIBS linker flags for EVEMU, overriding pkg-config
1526 FRAME_CFLAGS1516 FRAME_CFLAGS
1527 C compiler flags for FRAME, overriding pkg-config1517 C compiler flags for FRAME, overriding pkg-config
1528 FRAME_LIBS linker flags for FRAME, overriding pkg-config1518 FRAME_LIBS linker flags for FRAME, overriding pkg-config
@@ -1531,6 +1521,9 @@
1531 XINPUT_LIBS linker flags for XINPUT, overriding pkg-config1521 XINPUT_LIBS linker flags for XINPUT, overriding pkg-config
1532 X11_CFLAGS C compiler flags for X11, overriding pkg-config1522 X11_CFLAGS C compiler flags for X11, overriding pkg-config
1533 X11_LIBS linker flags for X11, overriding pkg-config1523 X11_LIBS linker flags for X11, overriding pkg-config
1524 EVEMU_CFLAGS
1525 C compiler flags for EVEMU, overriding pkg-config
1526 EVEMU_LIBS linker flags for EVEMU, overriding pkg-config
15341527
1535Use these variables to override the choices made by `configure' or to help1528Use these variables to override the choices made by `configure' or to help
1536it to find libraries and programs with nonstandard names/locations.1529it to find libraries and programs with nonstandard names/locations.
@@ -1598,7 +1591,7 @@
1598test -n "$ac_init_help" && exit $ac_status1591test -n "$ac_init_help" && exit $ac_status
1599if $ac_init_version; then1592if $ac_init_version; then
1600 cat <<\_ACEOF1593 cat <<\_ACEOF
1601Gesture Recognition And Instantiation Library configure 3.0.61594Gesture Recognition And Instantiation Library configure 3.0.8
1602generated by GNU Autoconf 2.691595generated by GNU Autoconf 2.69
16031596
1604Copyright (C) 2012 Free Software Foundation, Inc.1597Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2043,7 +2036,7 @@
2043This file contains any messages produced by compilers while2036This file contains any messages produced by compilers while
2044running configure, to aid debugging if configure makes a mistake.2037running configure, to aid debugging if configure makes a mistake.
20452038
2046It was created by Gesture Recognition And Instantiation Library $as_me 3.0.6, which was2039It was created by Gesture Recognition And Instantiation Library $as_me 3.0.8, which was
2047generated by GNU Autoconf 2.69. Invocation command line was2040generated by GNU Autoconf 2.69. Invocation command line was
20482041
2049 $ $0 $@2042 $ $0 $@
@@ -2864,7 +2857,7 @@
28642857
2865# Define the identity of the package.2858# Define the identity of the package.
2866 PACKAGE='grail'2859 PACKAGE='grail'
2867 VERSION='3.0.6'2860 VERSION='3.0.8'
28682861
28692862
2870cat >>confdefs.h <<_ACEOF2863cat >>confdefs.h <<_ACEOF
@@ -2967,7 +2960,7 @@
29672960
29682961
29692962
2970LIB_VERSION=5:0:02963LIB_VERSION=6:0:0
29712964
29722965
2973# Initialize libtool2966# Initialize libtool
@@ -15941,188 +15934,6 @@
15941fi15934fi
1594215935
15943pkg_failed=no15936pkg_failed=no
15944{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MTDEV" >&5
15945$as_echo_n "checking for MTDEV... " >&6; }
15946
15947if test -n "$MTDEV_CFLAGS"; then
15948 pkg_cv_MTDEV_CFLAGS="$MTDEV_CFLAGS"
15949 elif test -n "$PKG_CONFIG"; then
15950 if test -n "$PKG_CONFIG" && \
15951 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mtdev >= 1.1\""; } >&5
15952 ($PKG_CONFIG --exists --print-errors "mtdev >= 1.1") 2>&5
15953 ac_status=$?
15954 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
15955 test $ac_status = 0; }; then
15956 pkg_cv_MTDEV_CFLAGS=`$PKG_CONFIG --cflags "mtdev >= 1.1" 2>/dev/null`
15957 test "x$?" != "x0" && pkg_failed=yes
15958else
15959 pkg_failed=yes
15960fi
15961 else
15962 pkg_failed=untried
15963fi
15964if test -n "$MTDEV_LIBS"; then
15965 pkg_cv_MTDEV_LIBS="$MTDEV_LIBS"
15966 elif test -n "$PKG_CONFIG"; then
15967 if test -n "$PKG_CONFIG" && \
15968 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mtdev >= 1.1\""; } >&5
15969 ($PKG_CONFIG --exists --print-errors "mtdev >= 1.1") 2>&5
15970 ac_status=$?
15971 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
15972 test $ac_status = 0; }; then
15973 pkg_cv_MTDEV_LIBS=`$PKG_CONFIG --libs "mtdev >= 1.1" 2>/dev/null`
15974 test "x$?" != "x0" && pkg_failed=yes
15975else
15976 pkg_failed=yes
15977fi
15978 else
15979 pkg_failed=untried
15980fi
15981
15982
15983
15984if test $pkg_failed = yes; then
15985 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
15986$as_echo "no" >&6; }
15987
15988if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
15989 _pkg_short_errors_supported=yes
15990else
15991 _pkg_short_errors_supported=no
15992fi
15993 if test $_pkg_short_errors_supported = yes; then
15994 MTDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "mtdev >= 1.1" 2>&1`
15995 else
15996 MTDEV_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "mtdev >= 1.1" 2>&1`
15997 fi
15998 # Put the nasty error message in config.log where it belongs
15999 echo "$MTDEV_PKG_ERRORS" >&5
16000
16001 as_fn_error $? "Package requirements (mtdev >= 1.1) were not met:
16002
16003$MTDEV_PKG_ERRORS
16004
16005Consider adjusting the PKG_CONFIG_PATH environment variable if you
16006installed software in a non-standard prefix.
16007
16008Alternatively, you may set the environment variables MTDEV_CFLAGS
16009and MTDEV_LIBS to avoid the need to call pkg-config.
16010See the pkg-config man page for more details." "$LINENO" 5
16011elif test $pkg_failed = untried; then
16012 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
16013$as_echo "no" >&6; }
16014 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
16015$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
16016as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
16017is in your PATH or set the PKG_CONFIG environment variable to the full
16018path to pkg-config.
16019
16020Alternatively, you may set the environment variables MTDEV_CFLAGS
16021and MTDEV_LIBS to avoid the need to call pkg-config.
16022See the pkg-config man page for more details.
16023
16024To get pkg-config, see <http://pkg-config.freedesktop.org/>.
16025See \`config.log' for more details" "$LINENO" 5; }
16026else
16027 MTDEV_CFLAGS=$pkg_cv_MTDEV_CFLAGS
16028 MTDEV_LIBS=$pkg_cv_MTDEV_LIBS
16029 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
16030$as_echo "yes" >&6; }
16031
16032fi
16033
16034pkg_failed=no
16035{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EVEMU" >&5
16036$as_echo_n "checking for EVEMU... " >&6; }
16037
16038if test -n "$EVEMU_CFLAGS"; then
16039 pkg_cv_EVEMU_CFLAGS="$EVEMU_CFLAGS"
16040 elif test -n "$PKG_CONFIG"; then
16041 if test -n "$PKG_CONFIG" && \
16042 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evemu >= 1.0.5\""; } >&5
16043 ($PKG_CONFIG --exists --print-errors "evemu >= 1.0.5") 2>&5
16044 ac_status=$?
16045 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
16046 test $ac_status = 0; }; then
16047 pkg_cv_EVEMU_CFLAGS=`$PKG_CONFIG --cflags "evemu >= 1.0.5" 2>/dev/null`
16048 test "x$?" != "x0" && pkg_failed=yes
16049else
16050 pkg_failed=yes
16051fi
16052 else
16053 pkg_failed=untried
16054fi
16055if test -n "$EVEMU_LIBS"; then
16056 pkg_cv_EVEMU_LIBS="$EVEMU_LIBS"
16057 elif test -n "$PKG_CONFIG"; then
16058 if test -n "$PKG_CONFIG" && \
16059 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evemu >= 1.0.5\""; } >&5
16060 ($PKG_CONFIG --exists --print-errors "evemu >= 1.0.5") 2>&5
16061 ac_status=$?
16062 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
16063 test $ac_status = 0; }; then
16064 pkg_cv_EVEMU_LIBS=`$PKG_CONFIG --libs "evemu >= 1.0.5" 2>/dev/null`
16065 test "x$?" != "x0" && pkg_failed=yes
16066else
16067 pkg_failed=yes
16068fi
16069 else
16070 pkg_failed=untried
16071fi
16072
16073
16074
16075if test $pkg_failed = yes; then
16076 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
16077$as_echo "no" >&6; }
16078
16079if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
16080 _pkg_short_errors_supported=yes
16081else
16082 _pkg_short_errors_supported=no
16083fi
16084 if test $_pkg_short_errors_supported = yes; then
16085 EVEMU_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "evemu >= 1.0.5" 2>&1`
16086 else
16087 EVEMU_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "evemu >= 1.0.5" 2>&1`
16088 fi
16089 # Put the nasty error message in config.log where it belongs
16090 echo "$EVEMU_PKG_ERRORS" >&5
16091
16092 as_fn_error $? "Package requirements (evemu >= 1.0.5) were not met:
16093
16094$EVEMU_PKG_ERRORS
16095
16096Consider adjusting the PKG_CONFIG_PATH environment variable if you
16097installed software in a non-standard prefix.
16098
16099Alternatively, you may set the environment variables EVEMU_CFLAGS
16100and EVEMU_LIBS to avoid the need to call pkg-config.
16101See the pkg-config man page for more details." "$LINENO" 5
16102elif test $pkg_failed = untried; then
16103 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
16104$as_echo "no" >&6; }
16105 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
16106$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
16107as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
16108is in your PATH or set the PKG_CONFIG environment variable to the full
16109path to pkg-config.
16110
16111Alternatively, you may set the environment variables EVEMU_CFLAGS
16112and EVEMU_LIBS to avoid the need to call pkg-config.
16113See the pkg-config man page for more details.
16114
16115To get pkg-config, see <http://pkg-config.freedesktop.org/>.
16116See \`config.log' for more details" "$LINENO" 5; }
16117else
16118 EVEMU_CFLAGS=$pkg_cv_EVEMU_CFLAGS
16119 EVEMU_LIBS=$pkg_cv_EVEMU_LIBS
16120 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
16121$as_echo "yes" >&6; }
16122
16123fi
16124
16125pkg_failed=no
16126{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FRAME" >&515937{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FRAME" >&5
16127$as_echo_n "checking for FRAME... " >&6; }15938$as_echo_n "checking for FRAME... " >&6; }
1612815939
@@ -22690,7 +22501,7 @@
22690# report actual input values of CONFIG_FILES etc. instead of their22501# report actual input values of CONFIG_FILES etc. instead of their
22691# values after options handling.22502# values after options handling.
22692ac_log="22503ac_log="
22693This file was extended by Gesture Recognition And Instantiation Library $as_me 3.0.6, which was22504This file was extended by Gesture Recognition And Instantiation Library $as_me 3.0.8, which was
22694generated by GNU Autoconf 2.69. Invocation command line was22505generated by GNU Autoconf 2.69. Invocation command line was
2269522506
22696 CONFIG_FILES = $CONFIG_FILES22507 CONFIG_FILES = $CONFIG_FILES
@@ -22756,7 +22567,7 @@
22756cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=122567cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
22757ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"22568ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
22758ac_cs_version="\\22569ac_cs_version="\\
22759Gesture Recognition And Instantiation Library config.status 3.0.622570Gesture Recognition And Instantiation Library config.status 3.0.8
22760configured by $0, generated by GNU Autoconf 2.69,22571configured by $0, generated by GNU Autoconf 2.69,
22761 with options \\"\$ac_cs_config\\"22572 with options \\"\$ac_cs_config\\"
2276222573
2276322574
=== modified file 'configure.ac'
--- configure.ac 2012-07-26 19:20:06 +0000
+++ configure.ac 2012-11-09 12:26:39 +0000
@@ -1,7 +1,7 @@
1# Initialize Autoconf1# Initialize Autoconf
2AC_PREREQ([2.60])2AC_PREREQ([2.60])
3AC_INIT([Gesture Recognition And Instantiation Library],3AC_INIT([Gesture Recognition And Instantiation Library],
4 [3.0.6],4 [3.0.8],
5 [],5 [],
6 [grail])6 [grail])
7AC_CONFIG_SRCDIR([Makefile.am])7AC_CONFIG_SRCDIR([Makefile.am])
@@ -14,7 +14,7 @@
14AM_SILENT_RULES([yes])14AM_SILENT_RULES([yes])
15AM_MAINTAINER_MODE([enable])15AM_MAINTAINER_MODE([enable])
1616
17LIB_VERSION=5:0:017LIB_VERSION=6:0:0
18AC_SUBST([LIB_VERSION])18AC_SUBST([LIB_VERSION])
1919
20# Initialize libtool20# Initialize libtool
@@ -25,8 +25,6 @@
25AC_PROG_CXX25AC_PROG_CXX
26AC_PROG_INSTALL26AC_PROG_INSTALL
2727
28PKG_CHECK_MODULES([MTDEV], [mtdev >= 1.1])
29PKG_CHECK_MODULES([EVEMU], [evemu >= 1.0.5])
30PKG_CHECK_MODULES([FRAME], [frame >= 2.2.0])28PKG_CHECK_MODULES([FRAME], [frame >= 2.2.0])
3129
32PKG_CHECK_MODULES([XINPUT],30PKG_CHECK_MODULES([XINPUT],
3331
=== modified file 'debian/changelog'
--- debian/changelog 2012-08-06 17:06:19 +0000
+++ debian/changelog 2012-11-09 12:26:39 +0000
@@ -1,8 +1,13 @@
1grail (3.0.6-0ubuntu2) UNRELEASED; urgency=low1grail (3.0.8-0ubuntu1) raring; urgency=low
22
3 [ Chase Douglas ]
3 * Remove patches, they have been merged upstream4 * Remove patches, they have been merged upstream
45
5 -- Chase Douglas <chase.douglas@ubuntu.com> Mon, 06 Aug 2012 10:06:08 -07006 [ Daniel d'Andrada ]
7 * New upstream release.
8 * Update library name and symbols to reflect new SONAME
9
10 -- Daniel d'Andrada <daniel.dandrada@canonical.com> Fri, 09 Nov 2012 10:19:29 -0200
611
7grail (3.0.6-0ubuntu1) quantal; urgency=low12grail (3.0.6-0ubuntu1) quantal; urgency=low
813
914
=== modified file 'debian/control'
--- debian/control 2012-07-27 21:28:55 +0000
+++ debian/control 2012-11-09 12:26:39 +0000
@@ -15,7 +15,7 @@
15Vcs-Bzr: https://code.launchpad.net/~oif-packaging/grail/packaging15Vcs-Bzr: https://code.launchpad.net/~oif-packaging/grail/packaging
16Vcs-Browser: http://bazaar.launchpad.net/~oif-packaging/grail/packaging/files16Vcs-Browser: http://bazaar.launchpad.net/~oif-packaging/grail/packaging/files
1717
18Package: libgrail518Package: libgrail6
19Architecture: any19Architecture: any
20Pre-Depends: ${misc:Pre-Depends}20Pre-Depends: ${misc:Pre-Depends}
21Depends: ${misc:Depends},21Depends: ${misc:Depends},
@@ -31,7 +31,7 @@
31Architecture: any31Architecture: any
32Pre-Depends: ${misc:Pre-Depends}32Pre-Depends: ${misc:Pre-Depends}
33Depends: libframe-dev,33Depends: libframe-dev,
34 libgrail5 (= ${binary:Version}),34 libgrail6 (= ${binary:Version}),
35 ${misc:Depends}35 ${misc:Depends}
36Replaces: libutouch-grail-dev36Replaces: libutouch-grail-dev
37Conflicts: libutouch-grail-dev37Conflicts: libutouch-grail-dev
@@ -47,7 +47,7 @@
47Section: libdevel47Section: libdevel
48Architecture: any48Architecture: any
49Pre-Depends: ${misc:Pre-Depends}49Pre-Depends: ${misc:Pre-Depends}
50Depends: libgrail5 (= ${binary:Version}),50Depends: libgrail6 (= ${binary:Version}),
51 ${misc:Depends},51 ${misc:Depends},
52 ${shlibs:Depends}52 ${shlibs:Depends}
53Replaces: utouch-grail-tools53Replaces: utouch-grail-tools
5454
=== renamed file 'debian/libgrail5.install' => 'debian/libgrail6.install'
--- debian/libgrail5.install 2012-07-27 19:24:34 +0000
+++ debian/libgrail6.install 2012-11-09 12:26:39 +0000
@@ -1,1 +1,1 @@
1usr/lib/*/libgrail.so.5*1usr/lib/*/libgrail.so.6*
22
=== renamed file 'debian/libgrail5.symbols' => 'debian/libgrail6.symbols'
--- debian/libgrail5.symbols 2012-07-27 19:24:34 +0000
+++ debian/libgrail6.symbols 2012-11-09 12:26:39 +0000
@@ -1,38 +1,38 @@
1libgrail.so.5 libgrail5 #MINVER#1libgrail.so.6 libgrail6 #MINVER#
2 (symver)GRAIL_3.0 3.0.62 (symver)GRAIL_3.1 3.0.8
3 grail_accept_gesture@GRAIL_3.0 3.0.63 grail_accept_gesture@GRAIL_3.1 3.0.8
4 grail_delete_v3@GRAIL_3.0 3.0.64 grail_delete@GRAIL_3.1 3.0.8
5 grail_event_get_property@GRAIL_3.0 3.0.65 grail_event_get_property@GRAIL_3.1 3.0.8
6 grail_event_get_time@GRAIL_3.0 3.0.66 grail_event_get_time@GRAIL_3.1 3.0.8
7 grail_event_get_type@GRAIL_3.0 3.0.67 grail_event_get_type@GRAIL_3.1 3.0.8
8 grail_event_ref@GRAIL_3.0 3.0.68 grail_event_ref@GRAIL_3.1 3.0.8
9 grail_event_unref@GRAIL_3.0 3.0.69 grail_event_unref@GRAIL_3.1 3.0.8
10 grail_get_event@GRAIL_3.0 3.0.610 grail_get_event@GRAIL_3.1 3.0.8
11 grail_get_fd@GRAIL_3.0 3.0.611 grail_get_fd@GRAIL_3.1 3.0.8
12 grail_new@GRAIL_3.0 3.0.612 grail_new@GRAIL_3.1 3.0.8
13 grail_next_timeout@GRAIL_3.0 3.0.613 grail_next_timeout@GRAIL_3.1 3.0.8
14 grail_process_frame_event@GRAIL_3.0 3.0.614 grail_process_frame_event@GRAIL_3.1 3.0.8
15 grail_reject_gesture@GRAIL_3.0 3.0.615 grail_reject_gesture@GRAIL_3.1 3.0.8
16 grail_slice_get_center_of_rotation_x@GRAIL_3.0 3.0.616 grail_slice_get_center_of_rotation_x@GRAIL_3.1 3.0.8
17 grail_slice_get_center_of_rotation_y@GRAIL_3.0 3.0.617 grail_slice_get_center_of_rotation_y@GRAIL_3.1 3.0.8
18 grail_slice_get_construction_finished@GRAIL_3.0 3.0.618 grail_slice_get_construction_finished@GRAIL_3.1 3.0.8
19 grail_slice_get_cumulative_transform@GRAIL_3.0 3.0.619 grail_slice_get_cumulative_transform@GRAIL_3.1 3.0.8
20 grail_slice_get_frame@GRAIL_3.0 3.0.620 grail_slice_get_frame@GRAIL_3.1 3.0.8
21 grail_slice_get_id@GRAIL_3.0 3.0.621 grail_slice_get_id@GRAIL_3.1 3.0.8
22 grail_slice_get_num_touches@GRAIL_3.0 3.0.622 grail_slice_get_num_touches@GRAIL_3.1 3.0.8
23 grail_slice_get_original_center_x@GRAIL_3.0 3.0.623 grail_slice_get_original_center_x@GRAIL_3.1 3.0.8
24 grail_slice_get_original_center_y@GRAIL_3.0 3.0.624 grail_slice_get_original_center_y@GRAIL_3.1 3.0.8
25 grail_slice_get_original_radius@GRAIL_3.0 3.0.625 grail_slice_get_original_radius@GRAIL_3.1 3.0.8
26 grail_slice_get_property@GRAIL_3.0 3.0.626 grail_slice_get_property@GRAIL_3.1 3.0.8
27 grail_slice_get_recognized@GRAIL_3.0 3.0.627 grail_slice_get_recognized@GRAIL_3.1 3.0.8
28 grail_slice_get_state@GRAIL_3.0 3.0.628 grail_slice_get_state@GRAIL_3.1 3.0.8
29 grail_slice_get_subscription@GRAIL_3.0 3.0.629 grail_slice_get_subscription@GRAIL_3.1 3.0.8
30 grail_slice_get_touch_id@GRAIL_3.0 3.0.630 grail_slice_get_touch_id@GRAIL_3.1 3.0.8
31 grail_slice_get_transform@GRAIL_3.0 3.0.631 grail_slice_get_transform@GRAIL_3.1 3.0.8
32 grail_subscription_activate@GRAIL_3.0 3.0.632 grail_subscription_activate@GRAIL_3.1 3.0.8
33 grail_subscription_deactivate@GRAIL_3.0 3.0.633 grail_subscription_deactivate@GRAIL_3.1 3.0.8
34 grail_subscription_delete@GRAIL_3.0 3.0.634 grail_subscription_delete@GRAIL_3.1 3.0.8
35 grail_subscription_get_property@GRAIL_3.0 3.0.635 grail_subscription_get_property@GRAIL_3.1 3.0.8
36 grail_subscription_new@GRAIL_3.0 3.0.636 grail_subscription_new@GRAIL_3.1 3.0.8
37 grail_subscription_set_property@GRAIL_3.0 3.0.637 grail_subscription_set_property@GRAIL_3.1 3.0.8
38 grail_update_time@GRAIL_3.0 3.0.638 grail_update_time@GRAIL_3.1 3.0.8
3939
=== modified file 'include/oif/grail.h'
--- include/oif/grail.h 2012-06-21 20:30:14 +0000
+++ include/oif/grail.h 2012-11-09 12:26:39 +0000
@@ -397,12 +397,11 @@
397/**397/**
398 * Create a new grail context398 * Create a new grail context
399 *399 *
400 * @param [in] frame_handle The frame context object
401 * @param [out] handle The new grail context object400 * @param [out] handle The new grail context object
402 * @return UGStatusSuccess or UGStatusErrorResources401 * @return UGStatusSuccess or UGStatusErrorResources
403 */402 */
404GRAIL_PUBLIC403GRAIL_PUBLIC
405UGStatus grail_new(UFHandle frame_handle, UGHandle *handle);404UGStatus grail_new(UGHandle *handle);
406405
407/**406/**
408 * Delete a grail context407 * Delete a grail context
@@ -410,7 +409,7 @@
410 * @param [in] handle The grail context object409 * @param [in] handle The grail context object
411 */410 */
412GRAIL_PUBLIC411GRAIL_PUBLIC
413void grail_delete_v3(UGHandle handle);412void grail_delete(UGHandle handle);
414413
415/**414/**
416 * Get the event file descriptor for the frame context415 * Get the event file descriptor for the frame context
417416
=== modified file 'src/Makefile.am'
--- src/Makefile.am 2012-06-21 20:30:14 +0000
+++ src/Makefile.am 2012-11-09 12:26:39 +0000
@@ -12,8 +12,6 @@
12 -Wl,--version-script=$(version_script)12 -Wl,--version-script=$(version_script)
1313
14libgrail_la_LIBADD = \14libgrail_la_LIBADD = \
15 $(MTDEV_LIBS) \
16 $(EVEMU_LIBS) \
17 $(FRAME_LIBS) \15 $(FRAME_LIBS) \
18 $(COVERAGE_LIBS) \16 $(COVERAGE_LIBS) \
19 -lm17 -lm
2018
=== modified file 'src/Makefile.in'
--- src/Makefile.in 2012-07-26 19:20:06 +0000
+++ src/Makefile.in 2012-11-09 12:26:39 +0000
@@ -1,4 +1,4 @@
1# Makefile.in generated by automake 1.11.5 from Makefile.am.1# Makefile.in generated by automake 1.11.6 from Makefile.am.
2# @configure_input@2# @configure_input@
33
4# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,4# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -99,8 +99,7 @@
99 "$(DESTDIR)$(libgrail_includedir)"99 "$(DESTDIR)$(libgrail_includedir)"
100LTLIBRARIES = $(lib_LTLIBRARIES)100LTLIBRARIES = $(lib_LTLIBRARIES)
101am__DEPENDENCIES_1 =101am__DEPENDENCIES_1 =
102libgrail_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \102libgrail_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
103 $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
104am_libgrail_la_OBJECTS = atomic-recognizer.lo event.lo gesture.lo \103am_libgrail_la_OBJECTS = atomic-recognizer.lo event.lo gesture.lo \
105 handle.lo log.lo recognizer.lo regular-recognizer.lo slice.lo \104 handle.lo log.lo recognizer.lo regular-recognizer.lo slice.lo \
106 subscription.lo touch.lo105 subscription.lo touch.lo
@@ -228,8 +227,6 @@
228MAKEINFO = @MAKEINFO@227MAKEINFO = @MAKEINFO@
229MANIFEST_TOOL = @MANIFEST_TOOL@228MANIFEST_TOOL = @MANIFEST_TOOL@
230MKDIR_P = @MKDIR_P@229MKDIR_P = @MKDIR_P@
231MTDEV_CFLAGS = @MTDEV_CFLAGS@
232MTDEV_LIBS = @MTDEV_LIBS@
233NM = @NM@230NM = @NM@
234NMEDIT = @NMEDIT@231NMEDIT = @NMEDIT@
235OBJDUMP = @OBJDUMP@232OBJDUMP = @OBJDUMP@
@@ -327,8 +324,6 @@
327 -Wl,--version-script=$(version_script)324 -Wl,--version-script=$(version_script)
328325
329libgrail_la_LIBADD = \326libgrail_la_LIBADD = \
330 $(MTDEV_LIBS) \
331 $(EVEMU_LIBS) \
332 $(FRAME_LIBS) \327 $(FRAME_LIBS) \
333 $(COVERAGE_LIBS) \328 $(COVERAGE_LIBS) \
334 -lm329 -lm
335330
=== modified file 'src/handle.cpp'
--- src/handle.cpp 2012-07-24 21:52:37 +0000
+++ src/handle.cpp 2012-11-09 12:26:39 +0000
@@ -40,9 +40,8 @@
40namespace oif {40namespace oif {
41namespace grail {41namespace grail {
4242
43UGHandle::UGHandle(UFHandle frame_handle)43UGHandle::UGHandle()
44 : frame_handle_(frame_handle),44 : event_fd_(eventfd(0, EFD_NONBLOCK)),
45 event_fd_(eventfd(0, EFD_NONBLOCK)),
46 next_id_(0) {45 next_id_(0) {
47 if (event_fd_ == -1) {46 if (event_fd_ == -1) {
48 throw std::runtime_error("Error: failed to create eventfd instance\n");47 throw std::runtime_error("Error: failed to create eventfd instance\n");
@@ -292,9 +291,9 @@
292291
293extern "C" {292extern "C" {
294293
295UGStatus grail_new(UFHandle frame_handle, UGHandle* handle) {294UGStatus grail_new(UGHandle* handle) {
296 try {295 try {
297 *handle = new oif::grail::UGHandle(frame_handle);296 *handle = new oif::grail::UGHandle;
298 } catch(const std::exception&) {297 } catch(const std::exception&) {
299 return UGStatusErrorResources;298 return UGStatusErrorResources;
300 }299 }
@@ -302,7 +301,7 @@
302 return UGStatusSuccess;301 return UGStatusSuccess;
303}302}
304303
305void grail_delete_v3(UGHandle handle) {304void grail_delete(UGHandle handle) {
306 delete static_cast<oif::grail::UGHandle*>(handle);305 delete static_cast<oif::grail::UGHandle*>(handle);
307}306}
308307
309308
=== modified file 'src/handle.h'
--- src/handle.h 2012-06-21 20:30:14 +0000
+++ src/handle.h 2012-11-09 12:26:39 +0000
@@ -38,7 +38,7 @@
3838
39class UGHandle : public UGHandle_ {39class UGHandle : public UGHandle_ {
40 public:40 public:
41 explicit UGHandle(UFHandle frame_handle);41 UGHandle();
42 ~UGHandle();42 ~UGHandle();
4343
44 int event_fd() const { return event_fd_; }44 int event_fd() const { return event_fd_; }
@@ -61,7 +61,6 @@
61 private:61 private:
62 typedef std::unique_ptr<Recognizer> UniqueRecognizer;62 typedef std::unique_ptr<Recognizer> UniqueRecognizer;
6363
64 const UFHandle frame_handle_;
65 int event_fd_;64 int event_fd_;
66 unsigned int next_id_;65 unsigned int next_id_;
67 std::map<UFDevice, std::map<UFWindowId, UniqueRecognizer>> recognizers_;66 std::map<UFDevice, std::map<UFWindowId, UniqueRecognizer>> recognizers_;
6867
=== modified file 'src/libgrail.ver'
--- src/libgrail.ver 2012-06-21 20:30:14 +0000
+++ src/libgrail.ver 2012-11-09 12:26:39 +0000
@@ -1,7 +1,7 @@
1GRAIL_3.0 {1GRAIL_3.1 {
2 global:2 global:
3 grail_accept_gesture;3 grail_accept_gesture;
4 grail_delete_v3;4 grail_delete;
5 grail_event_get_property;5 grail_event_get_property;
6 grail_event_get_time;6 grail_event_get_time;
7 grail_event_get_type;7 grail_event_get_type;
88
=== modified file 'test/Makefile.in'
--- test/Makefile.in 2012-07-26 19:20:06 +0000
+++ test/Makefile.in 2012-11-09 12:26:39 +0000
@@ -1,4 +1,4 @@
1# Makefile.in generated by automake 1.11.5 from Makefile.am.1# Makefile.in generated by automake 1.11.6 from Makefile.am.
2# @configure_input@2# @configure_input@
33
4# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,4# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -184,8 +184,6 @@
184MAKEINFO = @MAKEINFO@184MAKEINFO = @MAKEINFO@
185MANIFEST_TOOL = @MANIFEST_TOOL@185MANIFEST_TOOL = @MANIFEST_TOOL@
186MKDIR_P = @MKDIR_P@186MKDIR_P = @MKDIR_P@
187MTDEV_CFLAGS = @MTDEV_CFLAGS@
188MTDEV_LIBS = @MTDEV_LIBS@
189NM = @NM@187NM = @NM@
190NMEDIT = @NMEDIT@188NMEDIT = @NMEDIT@
191OBJDUMP = @OBJDUMP@189OBJDUMP = @OBJDUMP@
192190
=== modified file 'test/gtest/Makefile.in'
--- test/gtest/Makefile.in 2012-07-26 19:20:06 +0000
+++ test/gtest/Makefile.in 2012-11-09 12:26:39 +0000
@@ -1,4 +1,4 @@
1# Makefile.in generated by automake 1.11.5 from Makefile.am.1# Makefile.in generated by automake 1.11.6 from Makefile.am.
2# @configure_input@2# @configure_input@
33
4# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,4# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -187,8 +187,6 @@
187MAKEINFO = @MAKEINFO@187MAKEINFO = @MAKEINFO@
188MANIFEST_TOOL = @MANIFEST_TOOL@188MANIFEST_TOOL = @MANIFEST_TOOL@
189MKDIR_P = @MKDIR_P@189MKDIR_P = @MKDIR_P@
190MTDEV_CFLAGS = @MTDEV_CFLAGS@
191MTDEV_LIBS = @MTDEV_LIBS@
192NM = @NM@190NM = @NM@
193NMEDIT = @NMEDIT@191NMEDIT = @NMEDIT@
194OBJDUMP = @OBJDUMP@192OBJDUMP = @OBJDUMP@
195193
=== modified file 'test/integration/Makefile.am'
--- test/integration/Makefile.am 2012-07-24 21:52:37 +0000
+++ test/integration/Makefile.am 2012-11-09 12:26:39 +0000
@@ -57,7 +57,6 @@
57 $(top_builddir)/test/gtest/libgtest_grail.a \57 $(top_builddir)/test/gtest/libgtest_grail.a \
58 $(EVEMU_LIBS) \58 $(EVEMU_LIBS) \
59 $(FRAME_LIBS) \59 $(FRAME_LIBS) \
60 $(MTDEV_LIBS) \
61 $(COVERAGE_LIBS) \60 $(COVERAGE_LIBS) \
62 $(GTEST_LIBS) \61 $(GTEST_LIBS) \
63 $(XORG_GTEST_LIBS) \62 $(XORG_GTEST_LIBS) \
6463
=== modified file 'test/integration/Makefile.in'
--- test/integration/Makefile.in 2012-07-26 19:20:06 +0000
+++ test/integration/Makefile.in 2012-11-09 12:26:39 +0000
@@ -1,4 +1,4 @@
1# Makefile.in generated by automake 1.11.5 from Makefile.am.1# Makefile.in generated by automake 1.11.6 from Makefile.am.
2# @configure_input@2# @configure_input@
33
4# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,4# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -90,8 +90,7 @@
90 $(top_builddir)/test/gtest/libgtest_grail.a \90 $(top_builddir)/test/gtest/libgtest_grail.a \
91 $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \91 $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
92 $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \92 $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
93 $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \93 $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
94 $(am__DEPENDENCIES_1)
95AM_V_lt = $(am__v_lt_@AM_V@)94AM_V_lt = $(am__v_lt_@AM_V@)
96am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)95am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
97am__v_lt_0 = --silent96am__v_lt_0 = --silent
@@ -218,8 +217,6 @@
218MAKEINFO = @MAKEINFO@217MAKEINFO = @MAKEINFO@
219MANIFEST_TOOL = @MANIFEST_TOOL@218MANIFEST_TOOL = @MANIFEST_TOOL@
220MKDIR_P = @MKDIR_P@219MKDIR_P = @MKDIR_P@
221MTDEV_CFLAGS = @MTDEV_CFLAGS@
222MTDEV_LIBS = @MTDEV_LIBS@
223NM = @NM@220NM = @NM@
224NMEDIT = @NMEDIT@221NMEDIT = @NMEDIT@
225OBJDUMP = @OBJDUMP@222OBJDUMP = @OBJDUMP@
@@ -363,7 +360,6 @@
363 $(top_builddir)/test/gtest/libgtest_grail.a \360 $(top_builddir)/test/gtest/libgtest_grail.a \
364 $(EVEMU_LIBS) \361 $(EVEMU_LIBS) \
365 $(FRAME_LIBS) \362 $(FRAME_LIBS) \
366 $(MTDEV_LIBS) \
367 $(COVERAGE_LIBS) \363 $(COVERAGE_LIBS) \
368 $(GTEST_LIBS) \364 $(GTEST_LIBS) \
369 $(XORG_GTEST_LIBS) \365 $(XORG_GTEST_LIBS) \
370366
=== modified file 'test/integration/x11/fixture.cpp'
--- test/integration/x11/fixture.cpp 2012-06-21 20:30:14 +0000
+++ test/integration/x11/fixture.cpp 2012-11-09 12:26:39 +0000
@@ -103,7 +103,7 @@
103 UFStatus frame_status = frame_x11_new(Display(), &frame_handle_);103 UFStatus frame_status = frame_x11_new(Display(), &frame_handle_);
104 ASSERT_EQ(UFStatusSuccess, frame_status);104 ASSERT_EQ(UFStatusSuccess, frame_status);
105105
106 UGStatus grail_status = grail_new(frame_handle_, &grail_handle_);106 UGStatus grail_status = grail_new(&grail_handle_);
107 ASSERT_EQ(UGStatusSuccess, grail_status);107 ASSERT_EQ(UGStatusSuccess, grail_status);
108 ASSERT_NE(grail_handle_, nullptr);108 ASSERT_NE(grail_handle_, nullptr);
109}109}
@@ -223,7 +223,7 @@
223223
224void oif::grail::x11::testing::Test::TearDown() {224void oif::grail::x11::testing::Test::TearDown() {
225 XSyncDestroyAlarm(Display(), alarm_);225 XSyncDestroyAlarm(Display(), alarm_);
226 grail_delete_v3(grail_handle_);226 grail_delete(grail_handle_);
227 frame_x11_delete(frame_handle_);227 frame_x11_delete(frame_handle_);
228 xorg::testing::Test::TearDown();228 xorg::testing::Test::TearDown();
229}229}
230230
=== modified file 'test/regular/Makefile.am'
--- test/regular/Makefile.am 2012-07-24 21:52:37 +0000
+++ test/regular/Makefile.am 2012-11-09 12:26:39 +0000
@@ -10,16 +10,14 @@
10test_c_compile_SOURCES = test-c-compile.c10test_c_compile_SOURCES = test-c-compile.c
11test_c_compile_LDADD = \11test_c_compile_LDADD = \
12 $(top_builddir)/src/libgrail.la \12 $(top_builddir)/src/libgrail.la \
13 $(FRAME_LIBS) \13 $(FRAME_LIBS)
14 $(MTDEV_LIBS)
15test_c_compile_CFLAGS = \14test_c_compile_CFLAGS = \
16 -I$(top_srcdir)/include15 -I$(top_srcdir)/include
1716
18test_cxx_compile_SOURCES = test-cxx-compile.cpp17test_cxx_compile_SOURCES = test-cxx-compile.cpp
19test_cxx_compile_LDADD = \18test_cxx_compile_LDADD = \
20 $(top_builddir)/src/libgrail.la \19 $(top_builddir)/src/libgrail.la \
21 $(FRAME_LIBS) \20 $(FRAME_LIBS)
22 $(MTDEV_LIBS)
23test_cxx_compile_CPPFLAGS = \21test_cxx_compile_CPPFLAGS = \
24 -I$(top_srcdir)/include22 -I$(top_srcdir)/include
2523
2624
=== modified file 'test/regular/Makefile.in'
--- test/regular/Makefile.in 2012-07-26 19:20:06 +0000
+++ test/regular/Makefile.in 2012-11-09 12:26:39 +0000
@@ -1,4 +1,4 @@
1# Makefile.in generated by automake 1.11.5 from Makefile.am.1# Makefile.in generated by automake 1.11.6 from Makefile.am.
2# @configure_input@2# @configure_input@
33
4# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,4# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -90,7 +90,7 @@
90am_test_c_compile_OBJECTS = test_c_compile-test-c-compile.$(OBJEXT)90am_test_c_compile_OBJECTS = test_c_compile-test-c-compile.$(OBJEXT)
91test_c_compile_OBJECTS = $(am_test_c_compile_OBJECTS)91test_c_compile_OBJECTS = $(am_test_c_compile_OBJECTS)
92test_c_compile_DEPENDENCIES = $(top_builddir)/src/libgrail.la \92test_c_compile_DEPENDENCIES = $(top_builddir)/src/libgrail.la \
93 $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)93 $(am__DEPENDENCIES_1)
94test_c_compile_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \94test_c_compile_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
95 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \95 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
96 $(test_c_compile_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o \96 $(test_c_compile_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o \
@@ -99,7 +99,7 @@
99 test_cxx_compile-test-cxx-compile.$(OBJEXT)99 test_cxx_compile-test-cxx-compile.$(OBJEXT)
100test_cxx_compile_OBJECTS = $(am_test_cxx_compile_OBJECTS)100test_cxx_compile_OBJECTS = $(am_test_cxx_compile_OBJECTS)
101test_cxx_compile_DEPENDENCIES = $(top_builddir)/src/libgrail.la \101test_cxx_compile_DEPENDENCIES = $(top_builddir)/src/libgrail.la \
102 $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)102 $(am__DEPENDENCIES_1)
103DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)103DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
104depcomp = $(SHELL) $(top_srcdir)/config-aux/depcomp104depcomp = $(SHELL) $(top_srcdir)/config-aux/depcomp
105am__depfiles_maybe = depfiles105am__depfiles_maybe = depfiles
@@ -220,8 +220,6 @@
220MAKEINFO = @MAKEINFO@220MAKEINFO = @MAKEINFO@
221MANIFEST_TOOL = @MANIFEST_TOOL@221MANIFEST_TOOL = @MANIFEST_TOOL@
222MKDIR_P = @MKDIR_P@222MKDIR_P = @MKDIR_P@
223MTDEV_CFLAGS = @MTDEV_CFLAGS@
224MTDEV_LIBS = @MTDEV_LIBS@
225NM = @NM@223NM = @NM@
226NMEDIT = @NMEDIT@224NMEDIT = @NMEDIT@
227OBJDUMP = @OBJDUMP@225OBJDUMP = @OBJDUMP@
@@ -313,8 +311,7 @@
313test_c_compile_SOURCES = test-c-compile.c311test_c_compile_SOURCES = test-c-compile.c
314test_c_compile_LDADD = \312test_c_compile_LDADD = \
315 $(top_builddir)/src/libgrail.la \313 $(top_builddir)/src/libgrail.la \
316 $(FRAME_LIBS) \314 $(FRAME_LIBS)
317 $(MTDEV_LIBS)
318315
319test_c_compile_CFLAGS = \316test_c_compile_CFLAGS = \
320 -I$(top_srcdir)/include317 -I$(top_srcdir)/include
@@ -322,8 +319,7 @@
322test_cxx_compile_SOURCES = test-cxx-compile.cpp319test_cxx_compile_SOURCES = test-cxx-compile.cpp
323test_cxx_compile_LDADD = \320test_cxx_compile_LDADD = \
324 $(top_builddir)/src/libgrail.la \321 $(top_builddir)/src/libgrail.la \
325 $(FRAME_LIBS) \322 $(FRAME_LIBS)
326 $(MTDEV_LIBS)
327323
328test_cxx_compile_CPPFLAGS = \324test_cxx_compile_CPPFLAGS = \
329 -I$(top_srcdir)/include325 -I$(top_srcdir)/include
330326
=== modified file 'test/regular/grail-fixture.h'
--- test/regular/grail-fixture.h 2012-07-24 21:52:37 +0000
+++ test/regular/grail-fixture.h 2012-11-09 12:26:39 +0000
@@ -33,7 +33,7 @@
33 virtual void TearDown()33 virtual void TearDown()
34 {34 {
35 if (grail_handle)35 if (grail_handle)
36 grail_delete_v3(grail_handle);36 grail_delete(grail_handle);
37 }37 }
3838
39 protected:39 protected:
4040
=== modified file 'test/regular/grail.cpp'
--- test/regular/grail.cpp 2012-07-24 21:52:37 +0000
+++ test/regular/grail.cpp 2012-11-09 12:26:39 +0000
@@ -3,10 +3,9 @@
3#include "oif/grail.h"3#include "oif/grail.h"
44
5TEST(grail, grail) {5TEST(grail, grail) {
6 UFHandle frame_handle = NULL;
7 UGHandle grail_handle = NULL;6 UGHandle grail_handle = NULL;
87
9 ASSERT_EQ(UGStatusSuccess, grail_new(frame_handle, &grail_handle));8 ASSERT_EQ(UGStatusSuccess, grail_new(&grail_handle));
109
11 int fd = grail_get_fd(grail_handle);10 int fd = grail_get_fd(grail_handle);
1211
@@ -63,5 +62,5 @@
63 grail_accept_gesture(grail_handle, 0));*/62 grail_accept_gesture(grail_handle, 0));*/
6463
65 grail_subscription_delete(subscription);64 grail_subscription_delete(subscription);
66 grail_delete_v3(grail_handle);65 grail_delete(grail_handle);
67}66}
6867
=== modified file 'test/regular/intermittent_3touch.cpp'
--- test/regular/intermittent_3touch.cpp 2012-07-24 21:52:37 +0000
+++ test/regular/intermittent_3touch.cpp 2012-11-09 12:26:39 +0000
@@ -17,10 +17,9 @@
17TEST_F(Intermittent3TouchTest, Test)17TEST_F(Intermittent3TouchTest, Test)
18{18{
19 UGStatus status;19 UGStatus status;
20 struct UFHandle_ frame_handle_struct;
21 fake_window_id = 321;20 fake_window_id = 321;
2221
23 status = grail_new(&frame_handle_struct, &grail_handle);22 status = grail_new(&grail_handle);
24 ASSERT_EQ(UGStatusSuccess, status);23 ASSERT_EQ(UGStatusSuccess, status);
2524
26 SendDeviceAddedEvent(time);25 SendDeviceAddedEvent(time);
2726
=== modified file 'test/regular/one-touch-gest-finished.cpp'
--- test/regular/one-touch-gest-finished.cpp 2012-07-24 21:52:37 +0000
+++ test/regular/one-touch-gest-finished.cpp 2012-11-09 12:26:39 +0000
@@ -10,11 +10,10 @@
10TEST_F(SingleTouchGestureTest, QuickTapEndsWithConstructionFinished)10TEST_F(SingleTouchGestureTest, QuickTapEndsWithConstructionFinished)
11{11{
12 UGStatus status;12 UGStatus status;
13 struct UFHandle_ frame_handle_struct;
14 UFWindowId fake_window_id = 321;13 UFWindowId fake_window_id = 321;
15 uint64_t time = 1234;14 uint64_t time = 1234;
1615
17 status = grail_new(&frame_handle_struct, &grail_handle);16 status = grail_new(&grail_handle);
18 ASSERT_EQ(UGStatusSuccess, status);17 ASSERT_EQ(UGStatusSuccess, status);
1918
20 SendDeviceAddedEvent(time);19 SendDeviceAddedEvent(time);
2120
=== modified file 'test/regular/pending-end.cpp'
--- test/regular/pending-end.cpp 2012-07-24 21:52:37 +0000
+++ test/regular/pending-end.cpp 2012-11-09 12:26:39 +0000
@@ -9,10 +9,9 @@
9TEST_F(GrailTest, PendingEndImpedesGestures)9TEST_F(GrailTest, PendingEndImpedesGestures)
10{10{
11 UGStatus status;11 UGStatus status;
12 struct UFHandle_ frame_handle_struct;
13 fake_window_id = 321;12 fake_window_id = 321;
1413
15 status = grail_new(&frame_handle_struct, &grail_handle);14 status = grail_new(&grail_handle);
16 ASSERT_EQ(UGStatusSuccess, status);15 ASSERT_EQ(UGStatusSuccess, status);
1716
18 SendDeviceAddedEvent(time);17 SendDeviceAddedEvent(time);
1918
=== modified file 'test/regular/still-gest-finishes.cpp'
--- test/regular/still-gest-finishes.cpp 2012-07-03 22:12:48 +0000
+++ test/regular/still-gest-finishes.cpp 2012-11-09 12:26:39 +0000
@@ -10,11 +10,10 @@
10TEST_F(GrailTest, StillGestureFinishesConstruction)10TEST_F(GrailTest, StillGestureFinishesConstruction)
11{11{
12 UGStatus status;12 UGStatus status;
13 struct UFHandle_ frame_handle_struct;
14 UFWindowId fake_window_id = 321;13 UFWindowId fake_window_id = 321;
15 uint64_t time = 1234;14 uint64_t time = 1234;
1615
17 status = grail_new(&frame_handle_struct, &grail_handle);16 status = grail_new(&grail_handle);
18 ASSERT_EQ(UGStatusSuccess, status);17 ASSERT_EQ(UGStatusSuccess, status);
1918
20 SendDeviceAddedEvent(time);19 SendDeviceAddedEvent(time);
2120
=== modified file 'tools/Makefile.am'
--- tools/Makefile.am 2012-06-21 20:30:14 +0000
+++ tools/Makefile.am 2012-11-09 12:26:39 +0000
@@ -51,8 +51,6 @@
51LDADD = \51LDADD = \
52 $(top_builddir)/src/libgrail.la \52 $(top_builddir)/src/libgrail.la \
53 $(FRAME_LIBS) \53 $(FRAME_LIBS) \
54 $(EVEMU_LIBS) \
55 $(MTDEV_LIBS) \
56 $(X11_LIBS) \54 $(X11_LIBS) \
57 $(XINPUT_LIBS) \55 $(XINPUT_LIBS) \
58 $(COVERAGE_LIBS) \56 $(COVERAGE_LIBS) \
5957
=== modified file 'tools/Makefile.in'
--- tools/Makefile.in 2012-07-26 19:20:06 +0000
+++ tools/Makefile.in 2012-11-09 12:26:39 +0000
@@ -1,4 +1,4 @@
1# Makefile.in generated by automake 1.11.5 from Makefile.am.1# Makefile.in generated by automake 1.11.6 from Makefile.am.
2# @configure_input@2# @configure_input@
33
4# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,4# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -79,7 +79,6 @@
79am__DEPENDENCIES_1 =79am__DEPENDENCIES_1 =
80grail_test_3_1_DEPENDENCIES = $(top_builddir)/src/libgrail.la \80grail_test_3_1_DEPENDENCIES = $(top_builddir)/src/libgrail.la \
81 $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \81 $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
82 $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
83 $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)82 $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
84AM_V_lt = $(am__v_lt_@AM_V@)83AM_V_lt = $(am__v_lt_@AM_V@)
85am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)84am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@@ -90,7 +89,6 @@
90grail_test_atomic_LDADD = $(LDADD)89grail_test_atomic_LDADD = $(LDADD)
91grail_test_atomic_DEPENDENCIES = $(top_builddir)/src/libgrail.la \90grail_test_atomic_DEPENDENCIES = $(top_builddir)/src/libgrail.la \
92 $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \91 $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
93 $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
94 $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)92 $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
95am_grail_test_edge_OBJECTS = grail-test-edge.$(OBJEXT) \93am_grail_test_edge_OBJECTS = grail-test-edge.$(OBJEXT) \
96 device.$(OBJEXT) servertime.$(OBJEXT) slice.$(OBJEXT)94 device.$(OBJEXT) servertime.$(OBJEXT) slice.$(OBJEXT)
@@ -98,7 +96,6 @@
98grail_test_edge_LDADD = $(LDADD)96grail_test_edge_LDADD = $(LDADD)
99grail_test_edge_DEPENDENCIES = $(top_builddir)/src/libgrail.la \97grail_test_edge_DEPENDENCIES = $(top_builddir)/src/libgrail.la \
100 $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \98 $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
101 $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
102 $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)99 $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
103am_grail_test_propagation_OBJECTS = grail-test-propagation.$(OBJEXT) \100am_grail_test_propagation_OBJECTS = grail-test-propagation.$(OBJEXT) \
104 device.$(OBJEXT) servertime.$(OBJEXT) slice.$(OBJEXT)101 device.$(OBJEXT) servertime.$(OBJEXT) slice.$(OBJEXT)
@@ -106,7 +103,6 @@
106grail_test_propagation_LDADD = $(LDADD)103grail_test_propagation_LDADD = $(LDADD)
107grail_test_propagation_DEPENDENCIES = $(top_builddir)/src/libgrail.la \104grail_test_propagation_DEPENDENCIES = $(top_builddir)/src/libgrail.la \
108 $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \105 $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
109 $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
110 $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)106 $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
111DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)107DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
112depcomp = $(SHELL) $(top_srcdir)/config-aux/depcomp108depcomp = $(SHELL) $(top_srcdir)/config-aux/depcomp
@@ -240,8 +236,6 @@
240MAKEINFO = @MAKEINFO@236MAKEINFO = @MAKEINFO@
241MANIFEST_TOOL = @MANIFEST_TOOL@237MANIFEST_TOOL = @MANIFEST_TOOL@
242MKDIR_P = @MKDIR_P@238MKDIR_P = @MKDIR_P@
243MTDEV_CFLAGS = @MTDEV_CFLAGS@
244MTDEV_LIBS = @MTDEV_LIBS@
245NM = @NM@239NM = @NM@
246NMEDIT = @NMEDIT@240NMEDIT = @NMEDIT@
247OBJDUMP = @OBJDUMP@241OBJDUMP = @OBJDUMP@
@@ -373,8 +367,6 @@
373LDADD = \367LDADD = \
374 $(top_builddir)/src/libgrail.la \368 $(top_builddir)/src/libgrail.la \
375 $(FRAME_LIBS) \369 $(FRAME_LIBS) \
376 $(EVEMU_LIBS) \
377 $(MTDEV_LIBS) \
378 $(X11_LIBS) \370 $(X11_LIBS) \
379 $(XINPUT_LIBS) \371 $(XINPUT_LIBS) \
380 $(COVERAGE_LIBS) \372 $(COVERAGE_LIBS) \
381373
=== modified file 'tools/grail-test-3-1.c'
--- tools/grail-test-3-1.c 2012-06-21 20:30:14 +0000
+++ tools/grail-test-3-1.c 2012-11-09 12:26:39 +0000
@@ -281,7 +281,7 @@
281281
282 nfds = frame_fd + 1 > nfds ? frame_fd + 1 : nfds;282 nfds = frame_fd + 1 > nfds ? frame_fd + 1 : nfds;
283283
284 grail_status = grail_new(frame_handle, &grail_handle);284 grail_status = grail_new(&grail_handle);
285 if (grail_status != UGStatusSuccess) {285 if (grail_status != UGStatusSuccess) {
286 fprintf(stderr, "Error: failed to create grail instance\n");286 fprintf(stderr, "Error: failed to create grail instance\n");
287 frame_x11_delete(frame_handle);287 frame_x11_delete(frame_handle);
@@ -365,7 +365,7 @@
365 }365 }
366366
367 destroy_alarm(display, alarm);367 destroy_alarm(display, alarm);
368 grail_delete_v3(grail_handle);368 grail_delete(grail_handle);
369 frame_x11_delete(frame_handle);369 frame_x11_delete(frame_handle);
370 XCloseDisplay(display);370 XCloseDisplay(display);
371371
372372
=== modified file 'tools/grail-test-atomic.c'
--- tools/grail-test-atomic.c 2012-06-21 20:30:14 +0000
+++ tools/grail-test-atomic.c 2012-11-09 12:26:39 +0000
@@ -296,7 +296,7 @@
296296
297 nfds = frame_fd + 1 > nfds ? frame_fd + 1 : nfds;297 nfds = frame_fd + 1 > nfds ? frame_fd + 1 : nfds;
298298
299 grail_status = grail_new(frame_handle, &grail_handle);299 grail_status = grail_new(&grail_handle);
300 if (grail_status != UGStatusSuccess) {300 if (grail_status != UGStatusSuccess) {
301 fprintf(stderr, "Error: failed to create grail instance\n");301 fprintf(stderr, "Error: failed to create grail instance\n");
302 frame_x11_delete(frame_handle);302 frame_x11_delete(frame_handle);
@@ -380,7 +380,7 @@
380 }380 }
381381
382 destroy_alarm(display, alarm);382 destroy_alarm(display, alarm);
383 grail_delete_v3(grail_handle);383 grail_delete(grail_handle);
384 frame_x11_delete(frame_handle);384 frame_x11_delete(frame_handle);
385 XCloseDisplay(display);385 XCloseDisplay(display);
386386
387387
=== modified file 'tools/grail-test-edge.c'
--- tools/grail-test-edge.c 2012-06-21 20:30:14 +0000
+++ tools/grail-test-edge.c 2012-11-09 12:26:39 +0000
@@ -295,7 +295,7 @@
295295
296 nfds = frame_fd + 1 > nfds ? frame_fd + 1 : nfds;296 nfds = frame_fd + 1 > nfds ? frame_fd + 1 : nfds;
297297
298 grail_status = grail_new(frame_handle, &grail_handle);298 grail_status = grail_new(&grail_handle);
299 if (grail_status != UGStatusSuccess) {299 if (grail_status != UGStatusSuccess) {
300 fprintf(stderr, "Error: failed to create grail instance\n");300 fprintf(stderr, "Error: failed to create grail instance\n");
301 frame_x11_delete(frame_handle);301 frame_x11_delete(frame_handle);
@@ -379,7 +379,7 @@
379 }379 }
380380
381 destroy_alarm(display, alarm);381 destroy_alarm(display, alarm);
382 grail_delete_v3(grail_handle);382 grail_delete(grail_handle);
383 frame_x11_delete(frame_handle);383 frame_x11_delete(frame_handle);
384 XCloseDisplay(display);384 XCloseDisplay(display);
385385
386386
=== modified file 'tools/grail-test-propagation.c'
--- tools/grail-test-propagation.c 2012-06-21 20:30:14 +0000
+++ tools/grail-test-propagation.c 2012-11-09 12:26:39 +0000
@@ -263,7 +263,7 @@
263263
264 nfds = frame_fd + 1 > nfds ? frame_fd + 1 : nfds;264 nfds = frame_fd + 1 > nfds ? frame_fd + 1 : nfds;
265265
266 grail_status = grail_new(frame_handle, &grail_handle);266 grail_status = grail_new(&grail_handle);
267 if (grail_status != UGStatusSuccess) {267 if (grail_status != UGStatusSuccess) {
268 fprintf(stderr, "Error: failed to create grail instance\n");268 fprintf(stderr, "Error: failed to create grail instance\n");
269 frame_x11_delete(frame_handle);269 frame_x11_delete(frame_handle);
@@ -347,7 +347,7 @@
347 }347 }
348348
349 destroy_alarm(display, alarm);349 destroy_alarm(display, alarm);
350 grail_delete_v3(grail_handle);350 grail_delete(grail_handle);
351 frame_x11_delete(frame_handle);351 frame_x11_delete(frame_handle);
352 XCloseDisplay(display);352 XCloseDisplay(display);
353353

Subscribers

People subscribed via source and target branches