Grail

Merge lp:~fginther/grail/grail-2.0.1.1-oneiric into lp:grail/oneiric

  1. grail-2.0.1.1-oneiric
  2. Merge into oneiric
Proposed by Francis Ginther
Status: Merged
Approved by: Daniel d'Andrada
Approved revision: 89
Merged at revision: 87
Proposed branch: lp:~fginther/grail/grail-2.0.1.1-oneiric
Merge into: lp:grail/oneiric
Diff against target: 2252 lines (+275/-449)
44 files modified
ChangeLog (+15/-22)
INSTALL (+1/-1)
Makefile.am (+1/-1)
Makefile.in (+5/-5)
configure (+33/-33)
configure.ac (+5/-5)
debian/changelog (+11/-182)
debian/control (+17/-12)
debian/copyright (+2/-2)
debian/libgrail-dev.install (+1/-1)
debian/libgrail1-udeb.install (+1/-1)
debian/libgrail1.install (+1/-1)
debian/libgrail1.symbols (+1/-1)
debian/rules (+1/-1)
debian/watch (+1/-1)
grail.pc.in (+2/-2)
include/grail.h (+8/-8)
src/Makefile.am (+5/-5)
src/Makefile.in (+31/-31)
src/gebuf.h (+1/-1)
src/gestures-drag.c (+3/-3)
src/gestures-pinch.c (+3/-3)
src/gestures-rotate.c (+3/-3)
src/gestures-tapping.c (+2/-2)
src/gestures-touch.c (+2/-2)
src/grail-api.c (+11/-11)
src/grail-event.c (+5/-5)
src/grail-frame.c (+16/-16)
src/grail-gestures.c (+10/-10)
src/grail-gestures.h (+10/-10)
src/grail-impl.h (+4/-4)
src/grail-init.c (+4/-4)
src/grail-inserter.c (+5/-5)
src/grail-inserter.h (+6/-6)
src/grail-legacy.c (+2/-2)
src/grail-recognizer.c (+1/-1)
src/grail-recognizer.h (+1/-1)
test/Makefile.am (+2/-2)
test/Makefile.in (+3/-4)
test/check-transform.c (+7/-7)
tools/Makefile.am (+1/-1)
tools/Makefile.in (+1/-1)
tools/grail-test-mtdev.c (+13/-13)
tools/grail-transform.c (+17/-17)
To merge this branch: bzr merge lp:~fginther/grail/grail-2.0.1.1-oneiric
Reviewer Review Type Date Requested Status
Daniel d'Andrada (community) Approve
Review via email: mp+120860@code.launchpad.net

Commit message

  * New upstream microrelease, bug fixes only
    - Rename project to simply 'grail' (LP: #1040218)
  * Updated debian/watch file for project rename
  * Rename package and update packaging
    - Added Conflicts and Replaces clauses for libgrail-dev, grail-tools and
      libgrail1-udeb

Description of the change

The primary rationale for this change is to repackage grail for the project rename.
  * New upstream microrelease, bug fixes only
    - Rename project to simply 'grail' (LP: #1040218)
  * Updated debian/watch file for project rename
  * Rename package and update packaging
    - Added Conflicts and Replaces clauses for libgrail-dev, grail-tools and
      libgrail1-udeb

To post a comment you must log in.
Revision history for this message
Daniel d'Andrada (dandrader) wrote :

Looks ok. Builds fine.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ChangeLog'
2--- ChangeLog 2011-08-09 22:00:48 +0000
3+++ ChangeLog 2012-08-22 19:30:25 +0000
4@@ -1,4 +1,19 @@
5 ------------------------------------------------------------
6+revno: 166
7+tags: v2.0.1.1
8+committer: Chase Douglas <chase.douglas@canonical.com>
9+branch nick: 2.0.1
10+timestamp: Wed 2012-08-15 19:37:38 +0000
11+message:
12+ Release version 2.0.1.1
13+------------------------------------------------------------
14+revno: 165
15+committer: Chase Douglas <chase.douglas@canonical.com>
16+branch nick: 2.0.1
17+timestamp: Wed 2012-08-15 19:25:17 +0000
18+message:
19+ Rename project to simply 'grail'
20+------------------------------------------------------------
21 revno: 164
22 tags: v2.0.1
23 committer: Chase Douglas <chase.douglas@ubuntu.com>
24@@ -1461,14 +1476,12 @@
25 ------------------------------------------------------------
26 revno: 22
27 tags: v1.0.1
28-git commit: 4af2240c46ea401ce259f1c4c1401b335b397987
29 committer: Henrik Rydberg <rydberg@euromail.se>
30 timestamp: Fri 2010-08-06 14:39:27 +0200
31 message:
32 grail v1.0.1
33 ------------------------------------------------------------
34 revno: 21
35-git commit: 3b6bc1a7dc5871aef2c47426f87bb409a622de29
36 author: Henrik Rydberg <rydberg@bitmath.org>
37 committer: Henrik Rydberg <rydberg@euromail.se>
38 timestamp: Fri 2010-08-06 14:33:32 +0200
39@@ -1484,7 +1497,6 @@
40 ------------------------------------------------------------
41 revno: 20
42 tags: v1.0.0
43-git commit: 40d6c7304cf431f13bfe81600656b268c881a4a2
44 author: Henrik Rydberg <rydberg@bitmath.org>
45 committer: Henrik Rydberg <rydberg@euromail.se>
46 timestamp: Thu 2010-08-05 22:48:38 +0200
47@@ -1496,7 +1508,6 @@
48 Signed-off-by: Henrik Rydberg <rydberg@bitmath.org>
49 ------------------------------------------------------------
50 revno: 19
51-git commit: 41be604bacf259d8dbcd6d5641fc3e6bb113dafc
52 author: Henrik Rydberg <rydberg@bitmath.org>
53 committer: Henrik Rydberg <rydberg@euromail.se>
54 timestamp: Thu 2010-08-05 22:48:38 +0200
55@@ -1510,7 +1521,6 @@
56 Signed-off-by: Henrik Rydberg <rydberg@bitmath.org>
57 ------------------------------------------------------------
58 revno: 18
59-git commit: 7559b3d7aa725cd75ee4e6746246205392fe1c0f
60 author: Henrik Rydberg <rydberg@bitmath.org>
61 committer: Henrik Rydberg <rydberg@euromail.se>
62 timestamp: Thu 2010-08-05 22:48:38 +0200
63@@ -1522,7 +1532,6 @@
64 Signed-off-by: Henrik Rydberg <rydberg@bitmath.org>
65 ------------------------------------------------------------
66 revno: 17
67-git commit: 8bbf06f8d0056ae30fdfaf260000e763fad2345c
68 author: Henrik Rydberg <rydberg@bitmath.org>
69 committer: Henrik Rydberg <rydberg@euromail.se>
70 timestamp: Thu 2010-08-05 22:48:38 +0200
71@@ -1535,7 +1544,6 @@
72 Signed-off-by: Henrik Rydberg <rydberg@bitmath.org>
73 ------------------------------------------------------------
74 revno: 16
75-git commit: d5f810a0d3e0013a76136750eaff825ceec099a2
76 author: Henrik Rydberg <rydberg@bitmath.org>
77 committer: Henrik Rydberg <rydberg@euromail.se>
78 timestamp: Thu 2010-08-05 22:48:38 +0200
79@@ -1548,7 +1556,6 @@
80 Signed-off-by: Henrik Rydberg <rydberg@bitmath.org>
81 ------------------------------------------------------------
82 revno: 15
83-git commit: d8e8d112aa907f8021ae99e6d7cd7856f1d90b70
84 author: Henrik Rydberg <rydberg@bitmath.org>
85 committer: Henrik Rydberg <rydberg@euromail.se>
86 timestamp: Thu 2010-08-05 22:48:38 +0200
87@@ -1561,7 +1568,6 @@
88 Signed-off-by: Henrik Rydberg <rydberg@bitmath.org>
89 ------------------------------------------------------------
90 revno: 14
91-git commit: 00f7895d101de2703dbcea3600a68c4f653a0378
92 author: Henrik Rydberg <rydberg@bitmath.org>
93 committer: Henrik Rydberg <rydberg@euromail.se>
94 timestamp: Thu 2010-08-05 22:48:38 +0200
95@@ -1576,7 +1582,6 @@
96 Signed-off-by: Henrik Rydberg <rydberg@bitmath.org>
97 ------------------------------------------------------------
98 revno: 13
99-git commit: d7d89e2afae9151f4d16aa71a99eedbf920ecc1a
100 author: Henrik Rydberg <rydberg@bitmath.org>
101 committer: Henrik Rydberg <rydberg@euromail.se>
102 timestamp: Thu 2010-08-05 22:48:38 +0200
103@@ -1586,7 +1591,6 @@
104 Signed-off-by: Henrik Rydberg <rydberg@bitmath.org>
105 ------------------------------------------------------------
106 revno: 12
107-git commit: 88dada465e0fad35b5a535a042e0a93046ffff7c
108 author: Henrik Rydberg <rydberg@bitmath.org>
109 committer: Henrik Rydberg <rydberg@euromail.se>
110 timestamp: Thu 2010-08-05 22:48:38 +0200
111@@ -1598,7 +1602,6 @@
112 Signed-off-by: Henrik Rydberg <rydberg@bitmath.org>
113 ------------------------------------------------------------
114 revno: 11
115-git commit: 697b5b5c7d2b1c46387061fcbed24cbee51d98ce
116 author: Henrik Rydberg <rydberg@bitmath.org>
117 committer: Henrik Rydberg <rydberg@euromail.se>
118 timestamp: Thu 2010-08-05 22:48:38 +0200
119@@ -1611,7 +1614,6 @@
120 Signed-off-by: Henrik Rydberg <rydberg@bitmath.org>
121 ------------------------------------------------------------
122 revno: 10
123-git commit: 642d7ee26f347152a106d48ddad37a8059d36fb1
124 author: Henrik Rydberg <rydberg@bitmath.org>
125 committer: Henrik Rydberg <rydberg@euromail.se>
126 timestamp: Thu 2010-08-05 22:48:38 +0200
127@@ -1626,7 +1628,6 @@
128 Signed-off-by: Henrik Rydberg <rydberg@bitmath.org>
129 ------------------------------------------------------------
130 revno: 9
131-git commit: d07c43f9f19dc0ee38aaf44947cfc396f437490e
132 author: Henrik Rydberg <rydberg@bitmath.org>
133 committer: Henrik Rydberg <rydberg@euromail.se>
134 timestamp: Thu 2010-08-05 22:48:38 +0200
135@@ -1639,7 +1640,6 @@
136 Signed-off-by: Henrik Rydberg <rydberg@bitmath.org>
137 ------------------------------------------------------------
138 revno: 8
139-git commit: 342a43e7b2ceec1dd200bffa24b052fec33f5bdc
140 author: Henrik Rydberg <rydberg@bitmath.org>
141 committer: Henrik Rydberg <rydberg@euromail.se>
142 timestamp: Thu 2010-08-05 22:48:38 +0200
143@@ -1653,7 +1653,6 @@
144 Signed-off-by: Henrik Rydberg <rydberg@bitmath.org>
145 ------------------------------------------------------------
146 revno: 7
147-git commit: e0eb1015bf30fd0913db571b000ba6a83ea22660
148 author: Henrik Rydberg <rydberg@bitmath.org>
149 committer: Henrik Rydberg <rydberg@euromail.se>
150 timestamp: Thu 2010-08-05 22:48:38 +0200
151@@ -1666,7 +1665,6 @@
152 Signed-off-by: Henrik Rydberg <rydberg@bitmath.org>
153 ------------------------------------------------------------
154 revno: 6
155-git commit: b76660d71e2ea77752025089bd71deffad64e325
156 author: Henrik Rydberg <rydberg@bitmath.org>
157 committer: Henrik Rydberg <rydberg@euromail.se>
158 timestamp: Thu 2010-08-05 22:48:38 +0200
159@@ -1678,7 +1676,6 @@
160 Signed-off-by: Henrik Rydberg <rydberg@bitmath.org>
161 ------------------------------------------------------------
162 revno: 5
163-git commit: eb896e11aacab5f53e3915a8d19ffffd92ce8e10
164 author: Henrik Rydberg <rydberg@bitmath.org>
165 committer: Henrik Rydberg <rydberg@euromail.se>
166 timestamp: Thu 2010-08-05 22:48:38 +0200
167@@ -1692,7 +1689,6 @@
168 Signed-off-by: Henrik Rydberg <rydberg@bitmath.org>
169 ------------------------------------------------------------
170 revno: 4
171-git commit: 3b9c20f869a2f55bd9953665c9e7fd713db4ff43
172 author: Henrik Rydberg <rydberg@bitmath.org>
173 committer: Henrik Rydberg <rydberg@euromail.se>
174 timestamp: Thu 2010-08-05 22:48:37 +0200
175@@ -1702,7 +1698,6 @@
176 Signed-off-by: Henrik Rydberg <rydberg@bitmath.org>
177 ------------------------------------------------------------
178 revno: 3
179-git commit: 49922aacc4e6361e2a11dd2ce8460c80b41ab493
180 author: Henrik Rydberg <rydberg@bitmath.org>
181 committer: Henrik Rydberg <rydberg@euromail.se>
182 timestamp: Thu 2010-08-05 22:48:37 +0200
183@@ -1712,7 +1707,6 @@
184 Signed-off-by: Henrik Rydberg <rydberg@bitmath.org>
185 ------------------------------------------------------------
186 revno: 2
187-git commit: 7c277ee54e7d0ea0c44b304897049a01e2d1a44a
188 author: Stephen M. Webb <stephen.webb@bregmasoft.ca>
189 committer: Henrik Rydberg <rydberg@euromail.se>
190 timestamp: Thu 2010-08-05 22:48:37 +0200
191@@ -1725,7 +1719,6 @@
192 Signed-off-by: Henrik Rydberg <rydberg@bitmath.org>
193 ------------------------------------------------------------
194 revno: 1
195-git commit: 3b837806891de6cf77d4d74d04567e7e68c82fc0
196 committer: Henrik Rydberg <rydberg@bitmath.org>
197 timestamp: Tue 2010-07-13 11:26:46 +0200
198 message:
199
200=== modified file 'INSTALL'
201--- INSTALL 2011-01-02 12:08:08 +0000
202+++ INSTALL 2012-08-22 19:30:25 +0000
203@@ -1,7 +1,7 @@
204 grail - Gesture Recognition And Instantiation Library
205
206 To build, you need to have the autoconf, libtool, mtdev-dev,
207-libutouch-evemu-dev and libutouch-frame packages installed. Then, do
208+libevemu-dev and libframe-dev packages installed. Then, do
209
210 ./autogen.sh
211 ./configure
212
213=== modified file 'Makefile.am'
214--- Makefile.am 2011-01-02 12:06:04 +0000
215+++ Makefile.am 2012-08-22 19:30:25 +0000
216@@ -1,7 +1,7 @@
217 SUBDIRS = src test tools
218
219 pkgconfigdir = $(libdir)/pkgconfig
220-pkgconfig_DATA = utouch-grail.pc
221+pkgconfig_DATA = grail.pc
222
223 INCLUDES = $(top_srcdir)/include/
224
225
226=== modified file 'Makefile.in'
227--- Makefile.in 2011-08-09 21:58:43 +0000
228+++ Makefile.in 2012-08-22 19:30:25 +0000
229@@ -37,8 +37,8 @@
230 subdir = .
231 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
232 $(srcdir)/Makefile.in $(srcdir)/config.h.in \
233- $(srcdir)/utouch-grail.pc.in $(top_srcdir)/configure AUTHORS \
234- COPYING ChangeLog INSTALL config-aux/config.guess \
235+ $(srcdir)/grail.pc.in $(top_srcdir)/configure AUTHORS COPYING \
236+ ChangeLog INSTALL config-aux/config.guess \
237 config-aux/config.sub config-aux/depcomp config-aux/install-sh \
238 config-aux/ltmain.sh config-aux/missing
239 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
240@@ -49,7 +49,7 @@
241 configure.lineno config.status.lineno
242 mkinstalldirs = $(install_sh) -d
243 CONFIG_HEADER = config.h
244-CONFIG_CLEAN_FILES = utouch-grail.pc
245+CONFIG_CLEAN_FILES = grail.pc
246 CONFIG_CLEAN_VPATH_FILES =
247 SOURCES =
248 DIST_SOURCES =
249@@ -257,7 +257,7 @@
250 top_srcdir = @top_srcdir@
251 SUBDIRS = src test tools
252 pkgconfigdir = $(libdir)/pkgconfig
253-pkgconfig_DATA = utouch-grail.pc
254+pkgconfig_DATA = grail.pc
255 INCLUDES = $(top_srcdir)/include/
256 all: config.h
257 $(MAKE) $(AM_MAKEFLAGS) all-recursive
258@@ -314,7 +314,7 @@
259
260 distclean-hdr:
261 -rm -f config.h stamp-h1
262-utouch-grail.pc: $(top_builddir)/config.status $(srcdir)/utouch-grail.pc.in
263+grail.pc: $(top_builddir)/config.status $(srcdir)/grail.pc.in
264 cd $(top_builddir) && $(SHELL) ./config.status $@
265
266 mostlyclean-libtool:
267
268=== modified file 'configure'
269--- configure 2011-08-09 21:58:43 +0000
270+++ configure 2012-08-22 19:30:25 +0000
271@@ -1,6 +1,6 @@
272 #! /bin/sh
273 # Guess values for system-dependent variables and create Makefiles.
274-# Generated by GNU Autoconf 2.68 for Gesture Recognition And Instantiation Library 2.0.1.
275+# Generated by GNU Autoconf 2.68 for Gesture Recognition And Instantiation Library 2.0.1.1.
276 #
277 #
278 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
279@@ -566,9 +566,9 @@
280
281 # Identity of this package.
282 PACKAGE_NAME='Gesture Recognition And Instantiation Library'
283-PACKAGE_TARNAME='utouch-grail'
284-PACKAGE_VERSION='2.0.1'
285-PACKAGE_STRING='Gesture Recognition And Instantiation Library 2.0.1'
286+PACKAGE_TARNAME='grail'
287+PACKAGE_VERSION='2.0.1.1'
288+PACKAGE_STRING='Gesture Recognition And Instantiation Library 2.0.1.1'
289 PACKAGE_BUGREPORT=''
290 PACKAGE_URL=''
291
292@@ -1319,7 +1319,7 @@
293 # Omit some internal or obsolete options to make the list less imposing.
294 # This message is too long to be a string in the A/UX 3.1 sh.
295 cat <<_ACEOF
296-\`configure' configures Gesture Recognition And Instantiation Library 2.0.1 to adapt to many kinds of systems.
297+\`configure' configures Gesture Recognition And Instantiation Library 2.0.1.1 to adapt to many kinds of systems.
298
299 Usage: $0 [OPTION]... [VAR=VALUE]...
300
301@@ -1367,7 +1367,7 @@
302 --infodir=DIR info documentation [DATAROOTDIR/info]
303 --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
304 --mandir=DIR man documentation [DATAROOTDIR/man]
305- --docdir=DIR documentation root [DATAROOTDIR/doc/utouch-grail]
306+ --docdir=DIR documentation root [DATAROOTDIR/doc/grail]
307 --htmldir=DIR html documentation [DOCDIR]
308 --dvidir=DIR dvi documentation [DOCDIR]
309 --pdfdir=DIR pdf documentation [DOCDIR]
310@@ -1389,7 +1389,7 @@
311
312 if test -n "$ac_init_help"; then
313 case $ac_init_help in
314- short | recursive ) echo "Configuration of Gesture Recognition And Instantiation Library 2.0.1:";;
315+ short | recursive ) echo "Configuration of Gesture Recognition And Instantiation Library 2.0.1.1:";;
316 esac
317 cat <<\_ACEOF
318
319@@ -1513,7 +1513,7 @@
320 test -n "$ac_init_help" && exit $ac_status
321 if $ac_init_version; then
322 cat <<\_ACEOF
323-Gesture Recognition And Instantiation Library configure 2.0.1
324+Gesture Recognition And Instantiation Library configure 2.0.1.1
325 generated by GNU Autoconf 2.68
326
327 Copyright (C) 2010 Free Software Foundation, Inc.
328@@ -1791,7 +1791,7 @@
329 This file contains any messages produced by compilers while
330 running configure, to aid debugging if configure makes a mistake.
331
332-It was created by Gesture Recognition And Instantiation Library $as_me 2.0.1, which was
333+It was created by Gesture Recognition And Instantiation Library $as_me 2.0.1.1, which was
334 generated by GNU Autoconf 2.68. Invocation command line was
335
336 $ $0 $@
337@@ -2610,8 +2610,8 @@
338
339
340 # Define the identity of the package.
341- PACKAGE='utouch-grail'
342- VERSION='2.0.1'
343+ PACKAGE='grail'
344+ VERSION='2.0.1.1'
345
346
347 cat >>confdefs.h <<_ACEOF
348@@ -12090,12 +12090,12 @@
349 pkg_cv_EVEMU_CFLAGS="$EVEMU_CFLAGS"
350 elif test -n "$PKG_CONFIG"; then
351 if test -n "$PKG_CONFIG" && \
352- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"utouch-evemu >= 1.0.5\""; } >&5
353- ($PKG_CONFIG --exists --print-errors "utouch-evemu >= 1.0.5") 2>&5
354+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evemu >= 1.0.5\""; } >&5
355+ ($PKG_CONFIG --exists --print-errors "evemu >= 1.0.5") 2>&5
356 ac_status=$?
357 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
358 test $ac_status = 0; }; then
359- pkg_cv_EVEMU_CFLAGS=`$PKG_CONFIG --cflags "utouch-evemu >= 1.0.5" 2>/dev/null`
360+ pkg_cv_EVEMU_CFLAGS=`$PKG_CONFIG --cflags "evemu >= 1.0.5" 2>/dev/null`
361 test "x$?" != "x0" && pkg_failed=yes
362 else
363 pkg_failed=yes
364@@ -12107,12 +12107,12 @@
365 pkg_cv_EVEMU_LIBS="$EVEMU_LIBS"
366 elif test -n "$PKG_CONFIG"; then
367 if test -n "$PKG_CONFIG" && \
368- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"utouch-evemu >= 1.0.5\""; } >&5
369- ($PKG_CONFIG --exists --print-errors "utouch-evemu >= 1.0.5") 2>&5
370+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evemu >= 1.0.5\""; } >&5
371+ ($PKG_CONFIG --exists --print-errors "evemu >= 1.0.5") 2>&5
372 ac_status=$?
373 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
374 test $ac_status = 0; }; then
375- pkg_cv_EVEMU_LIBS=`$PKG_CONFIG --libs "utouch-evemu >= 1.0.5" 2>/dev/null`
376+ pkg_cv_EVEMU_LIBS=`$PKG_CONFIG --libs "evemu >= 1.0.5" 2>/dev/null`
377 test "x$?" != "x0" && pkg_failed=yes
378 else
379 pkg_failed=yes
380@@ -12133,14 +12133,14 @@
381 _pkg_short_errors_supported=no
382 fi
383 if test $_pkg_short_errors_supported = yes; then
384- EVEMU_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "utouch-evemu >= 1.0.5" 2>&1`
385+ EVEMU_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "evemu >= 1.0.5" 2>&1`
386 else
387- EVEMU_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "utouch-evemu >= 1.0.5" 2>&1`
388+ EVEMU_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "evemu >= 1.0.5" 2>&1`
389 fi
390 # Put the nasty error message in config.log where it belongs
391 echo "$EVEMU_PKG_ERRORS" >&5
392
393- as_fn_error $? "Package requirements (utouch-evemu >= 1.0.5) were not met:
394+ as_fn_error $? "Package requirements (evemu >= 1.0.5) were not met:
395
396 $EVEMU_PKG_ERRORS
397
398@@ -12181,12 +12181,12 @@
399 pkg_cv_FRAME_CFLAGS="$FRAME_CFLAGS"
400 elif test -n "$PKG_CONFIG"; then
401 if test -n "$PKG_CONFIG" && \
402- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"utouch-frame >= 1.0\""; } >&5
403- ($PKG_CONFIG --exists --print-errors "utouch-frame >= 1.0") 2>&5
404+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"frame >= 1.0\""; } >&5
405+ ($PKG_CONFIG --exists --print-errors "frame >= 1.0") 2>&5
406 ac_status=$?
407 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
408 test $ac_status = 0; }; then
409- pkg_cv_FRAME_CFLAGS=`$PKG_CONFIG --cflags "utouch-frame >= 1.0" 2>/dev/null`
410+ pkg_cv_FRAME_CFLAGS=`$PKG_CONFIG --cflags "frame >= 1.0" 2>/dev/null`
411 test "x$?" != "x0" && pkg_failed=yes
412 else
413 pkg_failed=yes
414@@ -12198,12 +12198,12 @@
415 pkg_cv_FRAME_LIBS="$FRAME_LIBS"
416 elif test -n "$PKG_CONFIG"; then
417 if test -n "$PKG_CONFIG" && \
418- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"utouch-frame >= 1.0\""; } >&5
419- ($PKG_CONFIG --exists --print-errors "utouch-frame >= 1.0") 2>&5
420+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"frame >= 1.0\""; } >&5
421+ ($PKG_CONFIG --exists --print-errors "frame >= 1.0") 2>&5
422 ac_status=$?
423 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
424 test $ac_status = 0; }; then
425- pkg_cv_FRAME_LIBS=`$PKG_CONFIG --libs "utouch-frame >= 1.0" 2>/dev/null`
426+ pkg_cv_FRAME_LIBS=`$PKG_CONFIG --libs "frame >= 1.0" 2>/dev/null`
427 test "x$?" != "x0" && pkg_failed=yes
428 else
429 pkg_failed=yes
430@@ -12224,14 +12224,14 @@
431 _pkg_short_errors_supported=no
432 fi
433 if test $_pkg_short_errors_supported = yes; then
434- FRAME_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "utouch-frame >= 1.0" 2>&1`
435+ FRAME_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "frame >= 1.0" 2>&1`
436 else
437- FRAME_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "utouch-frame >= 1.0" 2>&1`
438+ FRAME_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "frame >= 1.0" 2>&1`
439 fi
440 # Put the nasty error message in config.log where it belongs
441 echo "$FRAME_PKG_ERRORS" >&5
442
443- as_fn_error $? "Package requirements (utouch-frame >= 1.0) were not met:
444+ as_fn_error $? "Package requirements (frame >= 1.0) were not met:
445
446 $FRAME_PKG_ERRORS
447
448@@ -12460,7 +12460,7 @@
449 fi
450
451
452-ac_config_files="$ac_config_files Makefile src/Makefile tools/Makefile test/Makefile utouch-grail.pc"
453+ac_config_files="$ac_config_files Makefile src/Makefile tools/Makefile test/Makefile grail.pc"
454
455 cat >confcache <<\_ACEOF
456 # This file is a shell script that caches the results of configure
457@@ -13012,7 +13012,7 @@
458 # report actual input values of CONFIG_FILES etc. instead of their
459 # values after options handling.
460 ac_log="
461-This file was extended by Gesture Recognition And Instantiation Library $as_me 2.0.1, which was
462+This file was extended by Gesture Recognition And Instantiation Library $as_me 2.0.1.1, which was
463 generated by GNU Autoconf 2.68. Invocation command line was
464
465 CONFIG_FILES = $CONFIG_FILES
466@@ -13078,7 +13078,7 @@
467 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
468 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
469 ac_cs_version="\\
470-Gesture Recognition And Instantiation Library config.status 2.0.1
471+Gesture Recognition And Instantiation Library config.status 2.0.1.1
472 configured by $0, generated by GNU Autoconf 2.68,
473 with options \\"\$ac_cs_config\\"
474
475@@ -13491,7 +13491,7 @@
476 "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
477 "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
478 "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
479- "utouch-grail.pc") CONFIG_FILES="$CONFIG_FILES utouch-grail.pc" ;;
480+ "grail.pc") CONFIG_FILES="$CONFIG_FILES grail.pc" ;;
481
482 *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
483 esac
484
485=== modified file 'configure.ac'
486--- configure.ac 2011-08-09 21:58:43 +0000
487+++ configure.ac 2012-08-22 19:30:25 +0000
488@@ -1,9 +1,9 @@
489 # Initialize Autoconf
490 AC_PREREQ([2.60])
491 AC_INIT([Gesture Recognition And Instantiation Library],
492- [2.0.1],
493+ [2.0.1.1],
494 [],
495- [utouch-grail])
496+ [grail])
497 AC_CONFIG_SRCDIR([Makefile.am])
498 AC_CONFIG_HEADERS([config.h])
499 AC_CONFIG_AUX_DIR([config-aux])
500@@ -23,8 +23,8 @@
501 AC_PROG_INSTALL
502
503 PKG_CHECK_MODULES([MTDEV], [mtdev >= 1.1])
504-PKG_CHECK_MODULES([EVEMU], [utouch-evemu >= 1.0.5])
505-PKG_CHECK_MODULES([FRAME], [utouch-frame >= 1.0])
506+PKG_CHECK_MODULES([EVEMU], [evemu >= 1.0.5])
507+PKG_CHECK_MODULES([FRAME], [frame >= 1.0])
508
509 AC_ARG_WITH([xi], AS_HELP_STRING([--with-xi], [Build with XI2.1 support]))
510 AM_CONDITIONAL([HAVE_XI], [test "x$with_xi" != "x"])
511@@ -43,6 +43,6 @@
512 src/Makefile
513 tools/Makefile
514 test/Makefile
515- utouch-grail.pc])
516+ grail.pc])
517 AC_OUTPUT
518
519
520=== modified file 'debian/changelog'
521--- debian/changelog 2011-08-09 22:04:08 +0000
522+++ debian/changelog 2012-08-22 19:30:25 +0000
523@@ -1,182 +1,11 @@
524-utouch-grail (2.0.1-0ubuntu1) oneiric; urgency=low
525-
526- * New upstream release.
527- - Use physical dimensions instead of device dimensions for thresholds
528- (LP: #823457)
529- * Bump lintian standards version to 3.9.2
530-
531- -- Chase Douglas <chase.douglas@ubuntu.com> Tue, 09 Aug 2011 15:03:44 -0700
532-
533-utouch-grail (2.0.0-0ubuntu1) oneiric; urgency=low
534-
535- [ Chase Douglas ]
536- * Remove unnecessary cdbs rules and build-depends.
537- * Added pivot disambiguation.
538-
539- [ Jussi Pakkanen ]
540- * Added rotation and pinch center coordinates.
541- * Added XInput device autodetection.
542-
543- [ Stephen M. Webb ]
544- * Added libutouch-grail-dev dependency on libutouch-frame-dev
545- * New upstream release v2.0.0.
546-
547- -- Chase Douglas <chase.douglas@ubuntu.com> Fri, 17 Jun 2011 12:17:36 +0200
548-
549-utouch-grail (1.0.20-0ubuntu1) natty; urgency=low
550-
551- [ Henrik Rydberg ]
552- * New upstream release.
553- * Fixes bug LP: #637106
554-
555- -- Chase Douglas <chase.douglas@ubuntu.com> Wed, 09 Mar 2011 12:14:40 -0500
556-
557-utouch-grail (1.0.19-0ubuntu2) natty; urgency=low
558-
559- * Rebuild against utouch-frame 1.0.0-0ubuntu3 to fix udeb dependencies.
560-
561- -- Colin Watson <cjwatson@ubuntu.com> Tue, 22 Feb 2011 20:17:07 +0000
562-
563-utouch-grail (1.0.19-0ubuntu1) natty; urgency=low
564-
565- * New upstream release. (LP: #722780)
566- * Integrates with XInput 2.1 multitouch.
567-
568- -- Chase Douglas <chase.douglas@ubuntu.com> Mon, 21 Feb 2011 17:30:23 -0500
569-
570-utouch-grail (1.0.18-0ubuntu1) natty; urgency=low
571-
572- * New upstream release. (LP: #702637)
573- * Remove symbols unintentionally included in grail-1.0
574- * Update package dependencies
575-
576- -- Henrik Rydberg <rydberg@bitmath.org> Mon, 03 Jan 2011 21:21:34 +0100
577-
578-utouch-grail (1.0.16-0ubuntu2) natty; urgency=low
579-
580- * rebuild the -updates maverick version with natty toolchain (LP: #667802)
581-
582- -- Didier Roche <didrocks@ubuntu.com> Tue, 23 Nov 2010 13:04:23 +0100
583-
584-utouch-grail (1.0.16-0ubuntu1) maverick-proposed; urgency=low
585-
586- * Report touch down on one-finger entry (LP: #667802)
587- * New upstream release.
588-
589- -- Henrik Rydberg <rydberg@bitmath.org> Mon, 08 Nov 2010 21:02:29 +0100
590-
591-utouch-grail (1.0.15-0ubuntu1) maverick-proposed; urgency=low
592-
593- * New upstream release.
594- - Fix one Finger tap as mouse click is confusing LP: #647761
595-
596- -- Henrik Rydberg <rydberg@bitmath.org> Tue, 28 Sep 2010 13:55:19 +0200
597-
598-utouch-grail (1.0.14-0ubuntu1) maverick; urgency=low
599-
600- [ Henrik Rydberg ]
601- * New upstream release.
602-
603- [ Stephen M. Webb ]
604- * Ubuntu feature freeze exception (LP: #644385 ).
605-
606- -- Stephen M. Webb <stephen.webb@canonical.com> Wed, 22 Sep 2010 07:20:16 -0400
607-
608-utouch-grail (1.0.13-0ubuntu1) maverick; urgency=low
609-
610- [ Henrik Rydberg ]
611- * New upstream release.
612- - LP: #635011
613-
614- -- Chase Douglas <chase.douglas@ubuntu.com> Fri, 10 Sep 2010 11:25:44 -0400
615-
616-utouch-grail (1.0.12-0ubuntu1) maverick; urgency=low
617-
618- * New upstream release.
619-
620- -- Henrik Rydberg <rydberg@bitmath.org> Tue, 07 Sep 2010 20:55:38 +0200
621-
622-utouch-grail (1.0.11-0ubuntu1) maverick; urgency=low
623-
624- * New upstream release.
625- - LP: #624856
626-
627- -- Chase Douglas <chase.douglas@ubuntu.com> Thu, 26 Aug 2010 15:16:10 -0400
628-
629-utouch-grail (1.0.10-0ubuntu1) maverick; urgency=low
630-
631- [ Chase Douglas ]
632- * Add udeb for debian installer
633- * Update package descriptions
634-
635- [ Henrik Rydberg ]
636- * New upstream release.
637- * Modified symbols file.
638- * Added break clause for geis and gevdev.
639- * Added newer dependency on mtdev.
640-
641- [ Chase Douglas ]
642- * Upload package to Ubuntu
643- - LP: #623005
644-
645- -- Chase Douglas <chase.douglas@ubuntu.com> Mon, 23 Aug 2010 16:57:54 -0400
646-
647-utouch-grail (1.0.8-0ubuntu3) maverick; urgency=low
648-
649- * Add src/evbuf.h copyright to debian/copyright
650-
651- -- Chase Douglas <chase.douglas@ubuntu.com> Fri, 13 Aug 2010 09:38:58 +0100
652-
653-utouch-grail (1.0.8-0ubuntu2) maverick; urgency=low
654-
655- * Fix utouch-grail-tools install file
656-
657- -- Chase Douglas <chase.douglas@ubuntu.com> Thu, 12 Aug 2010 17:46:41 +0100
658-
659-utouch-grail (1.0.8-0ubuntu1) maverick; urgency=low
660-
661- * New upstream release.
662- * Update library names
663- * Close packaging bug (LP: #616897)
664-
665- -- Henrik Rydberg <rydberg@bitmath.org> Thu, 12 Aug 2010 17:25:03 +0100
666-
667-grail (1.0.7-0ubuntu1) maverick; urgency=low
668-
669- * New upstream release.
670- * Update symbols file
671-
672- -- Henrik Rydberg <rydberg@bitmath.org> Wed, 11 Aug 2010 18:17:26 +0100
673-
674-grail (1.0.6-0ubuntu1) maverick; urgency=low
675-
676- * New upstream release.
677-
678- -- Henrik Rydberg <rydberg@bitmath.org> Tue, 10 Aug 2010 19:15:37 +0100
679-
680-grail (1.0.5-0ubuntu1) maverick; urgency=low
681-
682- * New upstream release.
683- * Update symbols file
684-
685- -- Henrik Rydberg <rydberg@bitmath.org> Tue, 10 Aug 2010 18:01:15 +0100
686-
687-grail (1.0.4-0ubuntu1) maverick; urgency=low
688-
689- * New upstream release.
690- * Update symbols file
691-
692- -- Henrik Rydberg <rydberg@bitmath.org> Sun, 08 Aug 2010 13:13:22 +0200
693-
694-grail (1.0.3-0ubuntu1) maverick; urgency=low
695-
696- * New upstream release.
697- * Update symbols file
698-
699- -- Chase Douglas <chase.douglas@ubuntu.com> Fri, 06 Aug 2010 17:47:37 +0000
700-
701-grail (1.0.0-0ubuntu1) maverick; urgency=low
702-
703- * Initial package
704-
705- -- Chase Douglas <chase.douglas@ubuntu.com> Fri, 06 Aug 2010 16:26:37 +0000
706+grail (2.0.1.1-0ubuntu1) UNRELEASED; urgency=low
707+
708+ * New upstream microrelease, bug fixes only
709+ - Rename project to simply 'grail' (LP: #1040218)
710+ * Updated debian/watch file for project rename
711+ * Rename package and update packaging
712+ - Added Conflicts and Replaces clauses for libgrail-dev, grail-tools and
713+ libgrail1-udeb
714+
715+ -- Francis Ginther <francis.ginther@canonical.com> Wed, 22 Aug 2012 13:02:46 -0500
716+
717
718=== modified file 'debian/control'
719--- debian/control 2011-08-09 22:02:41 +0000
720+++ debian/control 2012-08-22 19:30:25 +0000
721@@ -1,4 +1,4 @@
722-Source: utouch-grail
723+Source: grail
724 Section: libs
725 Priority: optional
726 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
727@@ -6,28 +6,29 @@
728 pkg-config,
729 cdbs,
730 libmtdev-dev (>= 1.1),
731- libutouch-evemu-dev (>= 1.0),
732- libutouch-frame-dev (>= 1.0)
733+ libevemu-dev,
734+ libframe-dev
735 Standards-Version: 3.9.2
736
737-Package: libutouch-grail1
738+Package: libgrail1
739 Architecture: any
740 Depends: ${shlibs:Depends},
741 ${misc:Depends}
742-Breaks: xserver-xorg-input-gevdev (<= 1:2.3.2-6ubuntu1),
743- libutouch-geis1 (<= 1.0.8)
744+Breaks: xserver-xorg-input-gevdev (<= 1:2.3.2-6ubuntu1)
745 Description: Gesture Recognition And Instantiation Library
746 This library consists of an interface and tools for handling gesture
747 recognition and gesture instantiation. Applications can use the grail
748 callbacks to receive gesture primitives and raw input events from the
749 underlying kernel device.
750
751-Package: libutouch-grail-dev
752+Package: libgrail-dev
753 Section: libdevel
754 Architecture: any
755-Depends: libutouch-grail1 (= ${binary:Version}),
756- libutouch-frame-dev,
757+Depends: libgrail1 (= ${binary:Version}),
758+ libframe-dev,
759 ${misc:Depends}
760+Replaces: libutouch-grail-dev
761+Conflicts: libutouch-grail-dev
762 Description: Gesture Recognition And Instantiation Library - dev files
763 This library consists of an interface and tools for handling gesture
764 recognition and gesture instantiation. Applications can use the grail
765@@ -36,12 +37,14 @@
766 .
767 This package contains files that are needed to build applications.
768
769-Package: utouch-grail-tools
770+Package: grail-tools
771 Section: libdevel
772 Architecture: any
773-Depends: libutouch-grail1 (= ${binary:Version}),
774+Depends: libgrail1 (= ${binary:Version}),
775 ${shlibs:Depends},
776 ${misc:Depends}
777+Replaces: utouch-grail-tools
778+Conflicts: utouch-grail-tools
779 Description: Gesture Recognition And Instantiation Library - test tools
780 This library consists of an interface and tools for handling gesture
781 recognition and gesture instantiation. Applications can use the grail
782@@ -50,12 +53,14 @@
783 .
784 This package provides some test tools for the grail library.
785
786-Package: libutouch-grail1-udeb
787+Package: libgrail1-udeb
788 Section: debian-installer
789 Architecture: any
790 XC-Package-Type: udeb
791 Depends: ${shlibs:Depends},
792 ${misc:Depends}
793+Replaces: libutouch-grail1-udeb
794+Conflicts: libutouch-grail1-udeb
795 Description: Gesture Recognition And Instantiation Library
796 This library consists of an interface and tools for handling gesture
797 recognition and gesture instantiation. Applications can use the grail
798
799=== modified file 'debian/copyright'
800--- debian/copyright 2010-08-13 08:38:54 +0000
801+++ debian/copyright 2012-08-22 19:30:25 +0000
802@@ -1,7 +1,7 @@
803 Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=REVISION
804-Name: utouch-grail
805+Name: grail
806 Maintainer: Henrik Rydberg <rydberg@euromail.se>
807-Source: http://launchpad.net/utouch-grail
808+Source: http://launchpad.net/grail
809
810 Files: * (unless noted below)
811 Copyright: 2010, Canonical Ltd.
812
813=== renamed file 'debian/utouch-grail-tools.install' => 'debian/grail-tools.install'
814=== renamed file 'debian/libutouch-grail-dev.install' => 'debian/libgrail-dev.install'
815--- debian/libutouch-grail-dev.install 2010-08-12 16:15:57 +0000
816+++ debian/libgrail-dev.install 2012-08-22 19:30:25 +0000
817@@ -1,3 +1,3 @@
818 usr/include
819-usr/lib/libutouch-grail.so
820+usr/lib/libgrail.so
821 usr/lib/pkgconfig
822
823=== renamed file 'debian/libutouch-grail1-udeb.install' => 'debian/libgrail1-udeb.install'
824--- debian/libutouch-grail1-udeb.install 2010-08-19 15:04:08 +0000
825+++ debian/libgrail1-udeb.install 2012-08-22 19:30:25 +0000
826@@ -1,1 +1,1 @@
827-usr/lib/libutouch-grail.so.1*
828+usr/lib/libgrail.so.1*
829
830=== renamed file 'debian/libutouch-grail1.install' => 'debian/libgrail1.install'
831--- debian/libutouch-grail1.install 2010-08-12 16:15:57 +0000
832+++ debian/libgrail1.install 2012-08-22 19:30:25 +0000
833@@ -1,1 +1,1 @@
834-usr/lib/libutouch-grail.so.1*
835+usr/lib/libgrail.so.1*
836
837=== renamed file 'debian/libutouch-grail1.symbols' => 'debian/libgrail1.symbols'
838--- debian/libutouch-grail1.symbols 2011-06-16 17:36:34 +0000
839+++ debian/libgrail1.symbols 2012-08-22 19:30:25 +0000
840@@ -1,4 +1,4 @@
841-libutouch-grail.so.1 libutouch-grail1 #MINVER#
842+libgrail.so.1 libgrail1 #MINVER#
843 grail_close@Base 1.0.4
844 grail_delete@Base 2.0.0
845 grail_filter_abs_events@Base 1.0.5
846
847=== modified file 'debian/rules'
848--- debian/rules 2011-04-12 18:49:24 +0000
849+++ debian/rules 2012-08-22 19:30:25 +0000
850@@ -6,7 +6,7 @@
851
852 LDFLAGS += -Wl,-z,defs -Wl,--as-needed
853
854-DEB_DH_MAKESHLIBS_ARGS_libutouch-grail1 = --add-udeb=libutouch-grail1-udeb
855+DEB_DH_MAKESHLIBS_ARGS_libgrail1 = --add-udeb=libgrail1-udeb
856
857 common-binary-post-install-arch::
858 find debian/tmp/usr/lib -name \*.la -exec rm {} \;
859
860=== modified file 'debian/watch'
861--- debian/watch 2010-08-12 16:15:57 +0000
862+++ debian/watch 2012-08-22 19:30:25 +0000
863@@ -1,2 +1,2 @@
864 version=3
865-https://launchpad.net/utouch-grail/+download http://launchpad.net/utouch-grail/.*/utouch-grail-(.+).tar.gz
866+https://launchpad.net/grail/2.0.1 .*/2.0.1/.*/grail-(.+).tar.(?:bz2|gz)
867
868=== renamed file 'utouch-grail.pc.in' => 'grail.pc.in'
869--- utouch-grail.pc.in 2011-04-27 08:56:48 +0000
870+++ grail.pc.in 2012-08-22 19:30:25 +0000
871@@ -3,8 +3,8 @@
872 libdir=@libdir@
873 includedir=@includedir@
874
875-Name: utouch-grail
876+Name: grail
877 Description: Gesture Recognition And Instantiation Library
878 Version: @PACKAGE_VERSION@
879 Cflags: -I${includedir}
880-Libs: -L${libdir} -lutouch-grail
881+Libs: -L${libdir} -lgrail
882
883=== modified file 'include/grail.h'
884--- include/grail.h 2011-06-16 17:28:51 +0000
885+++ include/grail.h 2012-08-22 19:30:25 +0000
886@@ -25,7 +25,7 @@
887 #include <linux/input.h>
888 #include <grail-bits.h>
889 #include <grail-types.h>
890-#include <utouch/frame.h>
891+#include <oif/frame.h>
892
893 #ifdef __cplusplus
894 extern "C" {
895@@ -50,7 +50,7 @@
896 #define GRAIL_EXPECT_MASK 0x000f
897
898 typedef float grail_prop_t; /* gesture properties */
899-typedef utouch_frame_time_t grail_time_t; /* time in milliseconds */
900+typedef oif_frame_time_t grail_time_t; /* time in milliseconds */
901 typedef struct grail *grail_handle; /* the grail instance handle */
902
903 /**
904@@ -75,7 +75,7 @@
905 float x, y;
906 };
907
908-grail_handle GRAIL_PUBLIC grail_new_raw(utouch_frame_handle fh,
909+grail_handle GRAIL_PUBLIC grail_new_raw(oif_frame_handle fh,
910 unsigned int num_frames,
911 void *select,
912 unsigned int version,
913@@ -85,7 +85,7 @@
914
915 /**
916 * grail_new - allocate and initialize a new grail instance
917- * @fh: utouch frame handle to use
918+ * @fh: oif frame handle to use
919 * @num_frames: number of frames in cyclic buffer
920 * @select: client selection callback
921 *
922@@ -131,7 +131,7 @@
923 * has grail scope.
924 */
925 const struct grail_frame GRAIL_PUBLIC *
926-grail_pump_frame(grail_handle ge, const struct utouch_frame *frame);
927+grail_pump_frame(grail_handle ge, const struct oif_frame *frame);
928
929 /**
930 * struct grail_client_id - Gesture client information
931@@ -209,7 +209,7 @@
932 */
933 struct grail_frame {
934 const struct grail_frame *prev;
935- const struct utouch_frame *touch;
936+ const struct oif_frame *touch;
937 unsigned int num_ongoing;
938 struct grail_element **ongoing;
939 struct grail_element **slots;
940@@ -254,7 +254,7 @@
941 int slot;
942 int id;
943 int num_touches;
944- const struct utouch_contact **touches;
945+ const struct oif_contact **touches;
946 grail_time_t start_time;
947 unsigned int expect_mask;
948 unsigned int active_mask;
949@@ -444,7 +444,7 @@
950 * The frame pointer is ABI agnostic, owned by the grail instance, and
951 * has grail scope.
952 */
953-const struct utouch_frame GRAIL_PUBLIC *
954+const struct oif_frame GRAIL_PUBLIC *
955 grail_get_contact_frame(const struct grail *ge);
956
957 #ifndef GRAIL_NO_LEGACY_API
958
959=== modified file 'src/Makefile.am'
960--- src/Makefile.am 2011-04-28 16:53:41 +0000
961+++ src/Makefile.am 2012-08-22 19:30:25 +0000
962@@ -1,13 +1,13 @@
963-lib_LTLIBRARIES = libutouch-grail.la
964+lib_LTLIBRARIES = libgrail.la
965
966-libutouch_grail_la_LDFLAGS = \
967+libgrail_la_LDFLAGS = \
968 -version-info @LIB_VERSION@ \
969 -lm \
970 $(MTDEV_LIBS) \
971 $(EVEMU_LIBS) \
972 $(FRAME_LIBS)
973
974-libutouch_grail_la_SOURCES = \
975+libgrail_la_SOURCES = \
976 evbuf.h \
977 gebuf.h \
978 grailbuf.h \
979@@ -36,8 +36,8 @@
980
981 INCLUDES = -I$(top_srcdir)/include/
982
983-libutouch_grailincludedir = $(includedir)
984-libutouch_grailinclude_HEADERS = \
985+libgrailincludedir = $(includedir)
986+libgrailinclude_HEADERS = \
987 $(top_srcdir)/include/grail-bits.h \
988 $(top_srcdir)/include/grail-types.h \
989 $(top_srcdir)/include/grail.h
990
991=== modified file 'src/Makefile.in'
992--- src/Makefile.in 2011-08-09 21:58:43 +0000
993+++ src/Makefile.in 2012-08-22 19:30:25 +0000
994@@ -36,7 +36,7 @@
995 build_triplet = @build@
996 host_triplet = @host@
997 subdir = src
998-DIST_COMMON = $(libutouch_grailinclude_HEADERS) $(srcdir)/Makefile.am \
999+DIST_COMMON = $(libgrailinclude_HEADERS) $(srcdir)/Makefile.am \
1000 $(srcdir)/Makefile.in
1001 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
1002 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
1003@@ -68,18 +68,18 @@
1004 sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
1005 sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
1006 am__installdirs = "$(DESTDIR)$(libdir)" \
1007- "$(DESTDIR)$(libutouch_grailincludedir)"
1008+ "$(DESTDIR)$(libgrailincludedir)"
1009 LTLIBRARIES = $(lib_LTLIBRARIES)
1010-libutouch_grail_la_LIBADD =
1011-am_libutouch_grail_la_OBJECTS = grail-bits.lo grail-inserter.lo \
1012+libgrail_la_LIBADD =
1013+am_libgrail_la_OBJECTS = grail-bits.lo grail-inserter.lo \
1014 grail-gestures.lo gestures-touch.lo gestures-drag.lo \
1015 gestures-pinch.lo gestures-rotate.lo gestures-tapping.lo \
1016 grail-recognizer.lo grail-event.lo grail-api.lo \
1017 grail-legacy.lo grail-init.lo grail-frame.lo
1018-libutouch_grail_la_OBJECTS = $(am_libutouch_grail_la_OBJECTS)
1019-libutouch_grail_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
1020+libgrail_la_OBJECTS = $(am_libgrail_la_OBJECTS)
1021+libgrail_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
1022 $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
1023- $(libutouch_grail_la_LDFLAGS) $(LDFLAGS) -o $@
1024+ $(libgrail_la_LDFLAGS) $(LDFLAGS) -o $@
1025 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
1026 depcomp = $(SHELL) $(top_srcdir)/config-aux/depcomp
1027 am__depfiles_maybe = depfiles
1028@@ -93,9 +93,9 @@
1029 LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
1030 --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
1031 $(LDFLAGS) -o $@
1032-SOURCES = $(libutouch_grail_la_SOURCES)
1033-DIST_SOURCES = $(libutouch_grail_la_SOURCES)
1034-HEADERS = $(libutouch_grailinclude_HEADERS)
1035+SOURCES = $(libgrail_la_SOURCES)
1036+DIST_SOURCES = $(libgrail_la_SOURCES)
1037+HEADERS = $(libgrailinclude_HEADERS)
1038 ETAGS = etags
1039 CTAGS = ctags
1040 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
1041@@ -227,15 +227,15 @@
1042 top_build_prefix = @top_build_prefix@
1043 top_builddir = @top_builddir@
1044 top_srcdir = @top_srcdir@
1045-lib_LTLIBRARIES = libutouch-grail.la
1046-libutouch_grail_la_LDFLAGS = \
1047+lib_LTLIBRARIES = libgrail.la
1048+libgrail_la_LDFLAGS = \
1049 -version-info @LIB_VERSION@ \
1050 -lm \
1051 $(MTDEV_LIBS) \
1052 $(EVEMU_LIBS) \
1053 $(FRAME_LIBS)
1054
1055-libutouch_grail_la_SOURCES = \
1056+libgrail_la_SOURCES = \
1057 evbuf.h \
1058 gebuf.h \
1059 grailbuf.h \
1060@@ -263,8 +263,8 @@
1061 # the build. -fvisibility requires GCC > 4 (or clang)
1062 AM_CFLAGS = $(CWARNFLAGS) -DBUILDING_GRAIL -fvisibility=hidden
1063 INCLUDES = -I$(top_srcdir)/include/
1064-libutouch_grailincludedir = $(includedir)
1065-libutouch_grailinclude_HEADERS = \
1066+libgrailincludedir = $(includedir)
1067+libgrailinclude_HEADERS = \
1068 $(top_srcdir)/include/grail-bits.h \
1069 $(top_srcdir)/include/grail-types.h \
1070 $(top_srcdir)/include/grail.h
1071@@ -334,8 +334,8 @@
1072 echo "rm -f \"$${dir}/so_locations\""; \
1073 rm -f "$${dir}/so_locations"; \
1074 done
1075-libutouch-grail.la: $(libutouch_grail_la_OBJECTS) $(libutouch_grail_la_DEPENDENCIES)
1076- $(libutouch_grail_la_LINK) -rpath $(libdir) $(libutouch_grail_la_OBJECTS) $(libutouch_grail_la_LIBADD) $(LIBS)
1077+libgrail.la: $(libgrail_la_OBJECTS) $(libgrail_la_DEPENDENCIES)
1078+ $(libgrail_la_LINK) -rpath $(libdir) $(libgrail_la_OBJECTS) $(libgrail_la_LIBADD) $(LIBS)
1079
1080 mostlyclean-compile:
1081 -rm -f *.$(OBJEXT)
1082@@ -384,26 +384,26 @@
1083
1084 clean-libtool:
1085 -rm -rf .libs _libs
1086-install-libutouch_grailincludeHEADERS: $(libutouch_grailinclude_HEADERS)
1087+install-libgrailincludeHEADERS: $(libgrailinclude_HEADERS)
1088 @$(NORMAL_INSTALL)
1089- test -z "$(libutouch_grailincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libutouch_grailincludedir)"
1090- @list='$(libutouch_grailinclude_HEADERS)'; test -n "$(libutouch_grailincludedir)" || list=; \
1091+ test -z "$(libgrailincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libgrailincludedir)"
1092+ @list='$(libgrailinclude_HEADERS)'; test -n "$(libgrailincludedir)" || list=; \
1093 for p in $$list; do \
1094 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
1095 echo "$$d$$p"; \
1096 done | $(am__base_list) | \
1097 while read files; do \
1098- echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libutouch_grailincludedir)'"; \
1099- $(INSTALL_HEADER) $$files "$(DESTDIR)$(libutouch_grailincludedir)" || exit $$?; \
1100+ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libgrailincludedir)'"; \
1101+ $(INSTALL_HEADER) $$files "$(DESTDIR)$(libgrailincludedir)" || exit $$?; \
1102 done
1103
1104-uninstall-libutouch_grailincludeHEADERS:
1105+uninstall-libgrailincludeHEADERS:
1106 @$(NORMAL_UNINSTALL)
1107- @list='$(libutouch_grailinclude_HEADERS)'; test -n "$(libutouch_grailincludedir)" || list=; \
1108+ @list='$(libgrailinclude_HEADERS)'; test -n "$(libgrailincludedir)" || list=; \
1109 files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
1110 test -n "$$files" || exit 0; \
1111- echo " ( cd '$(DESTDIR)$(libutouch_grailincludedir)' && rm -f" $$files ")"; \
1112- cd "$(DESTDIR)$(libutouch_grailincludedir)" && rm -f $$files
1113+ echo " ( cd '$(DESTDIR)$(libgrailincludedir)' && rm -f" $$files ")"; \
1114+ cd "$(DESTDIR)$(libgrailincludedir)" && rm -f $$files
1115
1116 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
1117 list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
1118@@ -491,7 +491,7 @@
1119 check: check-am
1120 all-am: Makefile $(LTLIBRARIES) $(HEADERS)
1121 installdirs:
1122- for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libutouch_grailincludedir)"; do \
1123+ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libgrailincludedir)"; do \
1124 test -z "$$dir" || $(MKDIR_P) "$$dir"; \
1125 done
1126 install: install-am
1127@@ -542,7 +542,7 @@
1128
1129 info-am:
1130
1131-install-data-am: install-libutouch_grailincludeHEADERS
1132+install-data-am: install-libgrailincludeHEADERS
1133
1134 install-dvi: install-dvi-am
1135
1136@@ -589,7 +589,7 @@
1137 ps-am:
1138
1139 uninstall-am: uninstall-libLTLIBRARIES \
1140- uninstall-libutouch_grailincludeHEADERS
1141+ uninstall-libgrailincludeHEADERS
1142
1143 .MAKE: install-am install-strip
1144
1145@@ -600,14 +600,14 @@
1146 install install-am install-data install-data-am install-dvi \
1147 install-dvi-am install-exec install-exec-am install-html \
1148 install-html-am install-info install-info-am \
1149- install-libLTLIBRARIES install-libutouch_grailincludeHEADERS \
1150+ install-libLTLIBRARIES install-libgrailincludeHEADERS \
1151 install-man install-pdf install-pdf-am install-ps \
1152 install-ps-am install-strip installcheck installcheck-am \
1153 installdirs maintainer-clean maintainer-clean-generic \
1154 mostlyclean mostlyclean-compile mostlyclean-generic \
1155 mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
1156 uninstall-am uninstall-libLTLIBRARIES \
1157- uninstall-libutouch_grailincludeHEADERS
1158+ uninstall-libgrailincludeHEADERS
1159
1160
1161 # Tell versions [3.59,3.63) of GNU make to not export all variables.
1162
1163=== modified file 'src/gebuf.h'
1164--- src/gebuf.h 2011-06-16 17:28:51 +0000
1165+++ src/gebuf.h 2012-08-22 19:30:25 +0000
1166@@ -30,7 +30,7 @@
1167 int status;
1168 int ntouch;
1169 int nprop;
1170- utouch_frame_time_t time;
1171+ oif_frame_time_t time;
1172 struct grail_coord pos;
1173 grail_prop_t prop[DIM_GRAIL_PROP];
1174 };
1175
1176=== modified file 'src/gestures-drag.c'
1177--- src/gestures-drag.c 2011-06-16 17:28:51 +0000
1178+++ src/gestures-drag.c 2012-08-22 19:30:25 +0000
1179@@ -34,7 +34,7 @@
1180
1181 static void set_props(const struct gesture_inserter *gin,
1182 struct combo_model *s, const struct move_model *m,
1183- const struct utouch_frame *frame)
1184+ const struct oif_frame *frame)
1185 {
1186 if (m->single) {
1187 s->prop[GRAIL_PROP_DRAG_DX] = m->fm[FM_X].raw_delta;
1188@@ -54,7 +54,7 @@
1189 static const int fm_mask = 0x03;
1190
1191 int gru_drag(struct grail *ge,
1192- const struct utouch_frame *frame)
1193+ const struct oif_frame *frame)
1194 {
1195 struct gesture_recognizer *gru = ge->gru;
1196 struct combo_model *state = &gru->drag;
1197@@ -89,7 +89,7 @@
1198 }
1199
1200 int gru_windrag(struct grail *ge,
1201- const struct utouch_frame *frame)
1202+ const struct oif_frame *frame)
1203 {
1204 struct gesture_recognizer *gru = ge->gru;
1205 struct combo_model *state = &gru->windrag;
1206
1207=== modified file 'src/gestures-pinch.c'
1208--- src/gestures-pinch.c 2011-06-16 17:28:51 +0000
1209+++ src/gestures-pinch.c 2012-08-22 19:30:25 +0000
1210@@ -37,7 +37,7 @@
1211 static void set_props(const struct gesture_inserter *gin,
1212 struct combo_model *s,
1213 const struct move_model *m,
1214- const struct utouch_frame *frame)
1215+ const struct oif_frame *frame)
1216 {
1217 s->prop[GRAIL_PROP_PINCH_DR] = m->fm[FM_R].action_delta;
1218 s->prop[GRAIL_PROP_PINCH_VR] = m->fm[FM_R].velocity;
1219@@ -49,7 +49,7 @@
1220 }
1221
1222 int gru_pinch(struct grail *ge,
1223- const struct utouch_frame *frame)
1224+ const struct oif_frame *frame)
1225 {
1226 struct gesture_recognizer *gru = ge->gru;
1227 struct combo_model *state = &gru->pinch;
1228@@ -85,7 +85,7 @@
1229 }
1230
1231 int gru_winpinch(struct grail *ge,
1232- const struct utouch_frame *frame)
1233+ const struct oif_frame *frame)
1234 {
1235 struct gesture_recognizer *gru = ge->gru;
1236 struct combo_model *state = &gru->winpinch;
1237
1238=== modified file 'src/gestures-rotate.c'
1239--- src/gestures-rotate.c 2011-06-16 17:28:51 +0000
1240+++ src/gestures-rotate.c 2012-08-22 19:30:25 +0000
1241@@ -36,7 +36,7 @@
1242
1243 static void set_props(const struct gesture_inserter *gin,
1244 struct combo_model *s, const struct move_model *m,
1245- const struct utouch_frame *frame)
1246+ const struct oif_frame *frame)
1247 {
1248 s->prop[GRAIL_PROP_ROTATE_DA] = m->fm[FM_A].action_delta;
1249 s->prop[GRAIL_PROP_ROTATE_VA] = m->fm[FM_A].velocity;
1250@@ -48,7 +48,7 @@
1251 }
1252
1253 int gru_rotate(struct grail *ge,
1254- const struct utouch_frame *frame)
1255+ const struct oif_frame *frame)
1256 {
1257 struct gesture_recognizer *gru = ge->gru;
1258 struct combo_model *state = &gru->rotate;
1259@@ -84,7 +84,7 @@
1260 }
1261
1262 int gru_winrotate(struct grail *ge,
1263- const struct utouch_frame *frame)
1264+ const struct oif_frame *frame)
1265 {
1266 struct gesture_recognizer *gru = ge->gru;
1267 struct combo_model *state = &gru->winrotate;
1268
1269=== modified file 'src/gestures-tapping.c'
1270--- src/gestures-tapping.c 2011-06-16 17:28:51 +0000
1271+++ src/gestures-tapping.c 2012-08-22 19:30:25 +0000
1272@@ -26,7 +26,7 @@
1273
1274 static void set_props(const struct gesture_inserter *gin,
1275 struct tapping_model *s, const struct move_model *m,
1276- const struct utouch_frame *frame)
1277+ const struct oif_frame *frame)
1278 {
1279 s->prop[GRAIL_PROP_TAP_DT] = m->time - s->start;
1280 s->prop[GRAIL_PROP_TAP_X] = m->fm[FM_X].value;
1281@@ -36,7 +36,7 @@
1282 }
1283
1284 int gru_tapping(struct grail *ge,
1285- const struct utouch_frame *frame)
1286+ const struct oif_frame *frame)
1287 {
1288 struct gesture_recognizer *gru = ge->gru;
1289 struct tapping_model *state = &gru->tapping;
1290
1291=== modified file 'src/gestures-touch.c'
1292--- src/gestures-touch.c 2011-04-04 17:27:38 +0000
1293+++ src/gestures-touch.c 2012-08-22 19:30:25 +0000
1294@@ -34,7 +34,7 @@
1295 };
1296
1297 int gru_touch(struct grail *ge,
1298- const struct utouch_frame *frame)
1299+ const struct oif_frame *frame)
1300 {
1301 struct gesture_recognizer *gru = ge->gru;
1302 struct combo_model *state = &gru->touch;
1303@@ -61,7 +61,7 @@
1304 }
1305
1306 int gru_wintouch(struct grail *ge,
1307- const struct utouch_frame *frame)
1308+ const struct oif_frame *frame)
1309 {
1310 struct gesture_recognizer *gru = ge->gru;
1311 struct combo_model *state = &gru->wintouch;
1312
1313=== modified file 'src/grail-api.c'
1314--- src/grail-api.c 2011-06-16 17:28:51 +0000
1315+++ src/grail-api.c 2012-08-22 19:30:25 +0000
1316@@ -67,7 +67,7 @@
1317 ret = evemu_extract(x->evemu, fd);
1318 if (ret)
1319 goto freemem;
1320- if (!utouch_frame_is_supported_mtdev(x->evemu)) {
1321+ if (!oif_frame_is_supported_mtdev(x->evemu)) {
1322 ret = -ENODEV;
1323 goto freemem;
1324 }
1325@@ -79,12 +79,12 @@
1326 goto freemem;
1327 }
1328 }
1329- x->fh = utouch_frame_new_engine(DIM_FRAMES, DIM_TOUCH, FRAME_RATE);
1330+ x->fh = oif_frame_new_engine(DIM_FRAMES, DIM_TOUCH, FRAME_RATE);
1331 if (!x->fh) {
1332 ret = -ENOMEM;
1333 goto freedev;
1334 }
1335- ret = utouch_frame_init_mtdev(x->fh, x->evemu);
1336+ ret = oif_frame_init_mtdev(x->fh, x->evemu);
1337 if (ret)
1338 goto freeframe;
1339
1340@@ -102,7 +102,7 @@
1341 freegin:
1342 gin_destroy(ge);
1343 freeframe:
1344- utouch_frame_delete_engine(x->fh);
1345+ oif_frame_delete_engine(x->fh);
1346 freedev:
1347 if (x->mtdev)
1348 mtdev_close_delete(x->mtdev);
1349@@ -120,7 +120,7 @@
1350 struct grail_impl *x = ge->impl;
1351 gru_destroy(ge);
1352 gin_destroy(ge);
1353- utouch_frame_delete_engine(x->fh);
1354+ oif_frame_delete_engine(x->fh);
1355 if (x->mtdev)
1356 mtdev_close_delete(x->mtdev);
1357 evemu_delete(x->evemu);
1358@@ -143,14 +143,14 @@
1359 void GRAIL_PUBLIC grail_get_units(const struct grail *ge,
1360 struct grail_coord *min, struct grail_coord *max)
1361 {
1362- struct utouch_surface *s = utouch_frame_get_surface(ge->impl->fh);
1363+ struct oif_surface *s = oif_frame_get_surface(ge->impl->fh);
1364 min->x = s->min_x;
1365 min->y = s->min_y;
1366 max->x = s->max_x;
1367 max->y = s->max_y;
1368 }
1369
1370-const struct utouch_frame GRAIL_PUBLIC *
1371+const struct oif_frame GRAIL_PUBLIC *
1372 grail_get_contact_frame(const struct grail *ge)
1373 {
1374 return ge->impl->touch;
1375@@ -215,7 +215,7 @@
1376 }
1377 }
1378
1379-static int gesture_timeout(struct grail *ge, const struct utouch_frame *frame)
1380+static int gesture_timeout(struct grail *ge, const struct oif_frame *frame)
1381 {
1382 struct gesture_recognizer *gru = ge->gru;
1383 struct gesture_inserter *gin = ge->gin;
1384@@ -225,7 +225,7 @@
1385 }
1386
1387 static void report_frame(struct grail *ge,
1388- const struct utouch_frame *touch,
1389+ const struct oif_frame *touch,
1390 const struct input_event *syn)
1391 {
1392 struct grail_impl *impl = ge->impl;
1393@@ -255,12 +255,12 @@
1394 static void grail_pump_mtdev(struct grail *ge, const struct input_event *ev)
1395 {
1396 struct grail_impl *impl = ge->impl;
1397- const struct utouch_frame *frame;
1398+ const struct oif_frame *frame;
1399
1400 evbuf_put(&impl->evbuf, ev);
1401
1402 if (ev->type == EV_SYN || ev->type == EV_ABS || ev->type == EV_KEY) {
1403- frame = utouch_frame_pump_mtdev(impl->fh, ev);
1404+ frame = oif_frame_pump_mtdev(impl->fh, ev);
1405 if (frame)
1406 report_frame(ge, frame, ev);
1407 }
1408
1409=== modified file 'src/grail-event.c'
1410--- src/grail-event.c 2011-06-16 17:28:51 +0000
1411+++ src/grail-event.c 2012-08-22 19:30:25 +0000
1412@@ -27,7 +27,7 @@
1413 #include <math.h>
1414
1415 static void compute_bbox(struct grail_coord *min, struct grail_coord *max,
1416- const struct utouch_frame *frame)
1417+ const struct oif_frame *frame)
1418 {
1419 float x, y;
1420 int i;
1421@@ -52,7 +52,7 @@
1422 }
1423
1424 int gin_add_contact_props(const struct gesture_inserter *gin,
1425- grail_prop_t *prop, const struct utouch_frame *frame)
1426+ grail_prop_t *prop, const struct oif_frame *frame)
1427 {
1428 struct grail_coord min, max;
1429 int i, n = 0, ntouch = frame->num_active;
1430@@ -66,7 +66,7 @@
1431 prop[n++] = max.x;
1432 prop[n++] = max.y;
1433 for (i = 0; i < ntouch; i++) {
1434- const struct utouch_contact *ct = frame->active[i];
1435+ const struct oif_contact *ct = frame->active[i];
1436 prop[n++] = ct->id;
1437 prop[n++] = ct->x;
1438 prop[n++] = ct->y;
1439@@ -78,7 +78,7 @@
1440 struct grail_client_info *info, int maxinfo,
1441 const grail_mask_t* types, int btypes,
1442 const grail_mask_t* span, int bspan,
1443- const struct utouch_frame *frame)
1444+ const struct oif_frame *frame)
1445 {
1446 struct grail_coord pos[DIM_TOUCH];
1447 int i, npos = 0;
1448@@ -94,7 +94,7 @@
1449
1450 void gin_send_event(struct grail *ge, struct slot_state *s,
1451 const struct gesture_event *ev,
1452- const struct utouch_frame *frame)
1453+ const struct oif_frame *frame)
1454 {
1455 struct grail_impl *impl = ge->impl;
1456 const struct gesture_inserter *gin = ge->gin;
1457
1458=== modified file 'src/grail-frame.c'
1459--- src/grail-frame.c 2011-05-20 14:35:18 +0000
1460+++ src/grail-frame.c 2012-08-22 19:30:25 +0000
1461@@ -27,7 +27,7 @@
1462 static void set_center_velocity_and_radius(struct grail_impl *impl,
1463 struct grail_element *slot)
1464 {
1465- const struct utouch_contact **tc = slot->touches;
1466+ const struct oif_contact **tc = slot->touches;
1467 double x, y, vx, vy, r2, dx, dy;
1468 int i;
1469
1470@@ -98,7 +98,7 @@
1471
1472 static void start_slot(struct grail_impl *impl,
1473 struct grail_element *slot,
1474- const struct utouch_frame *touch)
1475+ const struct oif_frame *touch)
1476 {
1477 float *T = slot->transform;
1478
1479@@ -156,11 +156,11 @@
1480
1481 static void set_slot_one(struct grail_impl *impl,
1482 struct grail_element *slot,
1483- const struct utouch_frame *touch,
1484- const struct utouch_contact *t1)
1485+ const struct oif_frame *touch,
1486+ const struct oif_contact *t1)
1487 {
1488 const struct grail_element *pslot = slot->prev;
1489- const struct utouch_contact *p1 = pslot->touches[0];
1490+ const struct oif_contact *p1 = pslot->touches[0];
1491
1492 if (!t1->active) {
1493 stop_slot(impl, slot);
1494@@ -180,13 +180,13 @@
1495
1496 static void set_slot_two(struct grail_impl *impl,
1497 struct grail_element *slot,
1498- const struct utouch_frame *touch,
1499- const struct utouch_contact *t1,
1500- const struct utouch_contact *t2)
1501+ const struct oif_frame *touch,
1502+ const struct oif_contact *t1,
1503+ const struct oif_contact *t2)
1504 {
1505 const struct grail_element *pslot = slot->prev;
1506- const struct utouch_contact *p1 = pslot->touches[0];
1507- const struct utouch_contact *p2 = pslot->touches[1];
1508+ const struct oif_contact *p1 = pslot->touches[0];
1509+ const struct oif_contact *p2 = pslot->touches[1];
1510 double tx, ty, px, py, d2;
1511
1512 if (!t1->active || !t2->active) {
1513@@ -221,7 +221,7 @@
1514 static void set_slot_multi(struct grail_impl *impl,
1515 struct grail_element *slot,
1516 struct grail_frame *frame,
1517- const struct utouch_frame *touch)
1518+ const struct oif_frame *touch)
1519 {
1520 const struct grail_element *pslot = slot->prev;
1521 struct grail_element **slots = frame->slots;
1522@@ -318,10 +318,10 @@
1523
1524 static void set_slots(struct grail_impl *impl,
1525 struct grail_frame *frame,
1526- const struct utouch_frame *touch)
1527+ const struct oif_frame *touch)
1528 {
1529 struct grail_element **slots = frame->slots;
1530- struct utouch_contact *const *tc = touch->slots;
1531+ struct oif_contact *const *tc = touch->slots;
1532 int i, j, n = 0;
1533
1534 for (i = 0; i < impl->num_touches; i++)
1535@@ -336,9 +336,9 @@
1536
1537 static void collect_transforms(struct grail_impl *impl,
1538 struct grail_frame *frame,
1539- const struct utouch_frame *touch)
1540+ const struct oif_frame *touch)
1541 {
1542- const struct utouch_surface *s = utouch_frame_get_surface(impl->fh);
1543+ const struct oif_surface *s = oif_frame_get_surface(impl->fh);
1544 const struct grail_control *ctl = impl->ctl;
1545 float d_x = ctl->bar_drag_x * (s->mapped_max_x - s->mapped_min_x);
1546 float d_y = ctl->bar_drag_y * (s->mapped_max_y - s->mapped_min_y);
1547@@ -386,7 +386,7 @@
1548 }
1549
1550 const struct grail_frame GRAIL_PUBLIC *
1551-grail_pump_frame(grail_handle ge, const struct utouch_frame *touch)
1552+grail_pump_frame(grail_handle ge, const struct oif_frame *touch)
1553 {
1554 struct grail_impl *impl = ge->impl;
1555 struct grail_frame *frame = impl->frames[impl->nextframe];
1556
1557=== modified file 'src/grail-gestures.c'
1558--- src/grail-gestures.c 2011-08-09 21:58:43 +0000
1559+++ src/grail-gestures.c 2012-08-22 19:30:25 +0000
1560@@ -35,7 +35,7 @@
1561 static const float EPS = 1e-3;
1562
1563 static void compute_position(float *x, float *y,
1564- const struct utouch_frame *frame)
1565+ const struct oif_frame *frame)
1566 {
1567 int i, n = frame->num_active;
1568 *x = 0;
1569@@ -43,7 +43,7 @@
1570 if (n < 1)
1571 return;
1572 for (i = 0; i < n; i++) {
1573- const struct utouch_contact *t = frame->active[i];
1574+ const struct oif_contact *t = frame->active[i];
1575 *x += t->x;
1576 *y += t->y;
1577 }
1578@@ -52,14 +52,14 @@
1579 }
1580
1581 static float compute_radius(float x, float y,
1582- const struct utouch_frame *frame)
1583+ const struct oif_frame *frame)
1584 {
1585 int i, n = frame->num_active;
1586 float r = 0, r2 = 0;
1587 if (n < 2)
1588 return r;
1589 for (i = 0; i < n; i++) {
1590- const struct utouch_contact *t = frame->active[i];
1591+ const struct oif_contact *t = frame->active[i];
1592 float dx = t->x - x;
1593 float dy = t->y - y;
1594 r2 += dx * dx + dy * dy;
1595@@ -70,15 +70,15 @@
1596 }
1597
1598 static float compute_rotation(float x, float y, float r,
1599- const struct utouch_frame *frame)
1600+ const struct oif_frame *frame)
1601 {
1602 int i, n = frame->num_active;
1603 float da = 0, darc2 = 0;
1604 if (n < 2)
1605 return da;
1606 for (i = 0; i < n; i++) {
1607- const struct utouch_contact *t = frame->active[i];
1608- const struct utouch_contact *ot = t->prev;
1609+ const struct oif_contact *t = frame->active[i];
1610+ const struct oif_contact *ot = t->prev;
1611 float dx = t->x - x;
1612 float dy = t->y - y;
1613 float mx = t->x - ot->x;
1614@@ -137,7 +137,7 @@
1615
1616 void gru_init_motion(struct grail *ge)
1617 {
1618- struct utouch_surface *s = utouch_frame_get_surface(ge->impl->fh);
1619+ struct oif_surface *s = oif_frame_get_surface(ge->impl->fh);
1620 struct gesture_recognizer *gru = ge->gru;
1621 struct move_model *m = &gru->move;
1622 float U[DIM_FM]; /* Device unit dimensions */
1623@@ -160,9 +160,9 @@
1624 }
1625
1626 void gru_motion(struct grail *ge,
1627- const struct utouch_frame *frame)
1628+ const struct oif_frame *frame)
1629 {
1630- const struct utouch_surface *s = utouch_frame_get_surface(ge->impl->fh);
1631+ const struct oif_surface *s = oif_frame_get_surface(ge->impl->fh);
1632 struct gesture_recognizer *gru = ge->gru;
1633 struct move_model *m = &gru->move;
1634 grail_time_t t = frame->time;
1635
1636=== modified file 'src/grail-gestures.h'
1637--- src/grail-gestures.h 2011-06-16 17:28:51 +0000
1638+++ src/grail-gestures.h 2012-08-22 19:30:25 +0000
1639@@ -61,7 +61,7 @@
1640
1641 void gru_init_motion(struct grail *ge);
1642 void gru_motion(struct grail *ge,
1643- const struct utouch_frame *frame);
1644+ const struct oif_frame *frame);
1645 void gru_event(struct grail *ge, int gid,
1646 const struct move_model *move,
1647 const grail_prop_t *prop, int nprop);
1648@@ -77,13 +77,13 @@
1649 };
1650
1651 int gru_touch(struct grail *ge,
1652- const struct utouch_frame *frame);
1653+ const struct oif_frame *frame);
1654 int gru_drag(struct grail *ge,
1655- const struct utouch_frame *frame);
1656+ const struct oif_frame *frame);
1657 int gru_pinch(struct grail *ge,
1658- const struct utouch_frame *frame);
1659+ const struct oif_frame *frame);
1660 int gru_rotate(struct grail *ge,
1661- const struct utouch_frame *frame);
1662+ const struct oif_frame *frame);
1663
1664 static inline int out_of_bounds(const struct combo_model *s,
1665 const struct move_model *m)
1666@@ -92,13 +92,13 @@
1667 }
1668
1669 int gru_wintouch(struct grail *ge,
1670- const struct utouch_frame *frame);
1671+ const struct oif_frame *frame);
1672 int gru_windrag(struct grail *ge,
1673- const struct utouch_frame *frame);
1674+ const struct oif_frame *frame);
1675 int gru_winpinch(struct grail *ge,
1676- const struct utouch_frame *frame);
1677+ const struct oif_frame *frame);
1678 int gru_winrotate(struct grail *ge,
1679- const struct utouch_frame *frame);
1680+ const struct oif_frame *frame);
1681
1682 struct tapping_model {
1683 grail_time_t start;
1684@@ -109,7 +109,7 @@
1685 };
1686
1687 int gru_tapping(struct grail *ge,
1688- const struct utouch_frame *frame);
1689+ const struct oif_frame *frame);
1690
1691 #endif
1692
1693
1694=== modified file 'src/grail-impl.h'
1695--- src/grail-impl.h 2011-06-16 17:28:51 +0000
1696+++ src/grail-impl.h 2012-08-22 19:30:25 +0000
1697@@ -26,7 +26,7 @@
1698 #define GRAIL_NO_LEGACY_API
1699
1700 #include <grail.h>
1701-#include <utouch/frame-mtdev.h>
1702+#include <oif/frame-mtdev.h>
1703 #include "evbuf.h"
1704 #include "grailbuf.h"
1705
1706@@ -49,7 +49,7 @@
1707 }
1708
1709 int create_grail2(struct grail_impl *x,
1710- utouch_frame_handle fh,
1711+ oif_frame_handle fh,
1712 unsigned int num_frames,
1713 void *select,
1714 unsigned int version,
1715@@ -62,8 +62,8 @@
1716 struct grail_impl {
1717 struct evemu_device *evemu;
1718 struct mtdev *mtdev;
1719- utouch_frame_handle fh;
1720- const struct utouch_frame *touch;
1721+ oif_frame_handle fh;
1722+ const struct oif_frame *touch;
1723 struct evbuf evbuf;
1724 struct grailbuf gbuf;
1725 int filter_abs;
1726
1727=== modified file 'src/grail-init.c'
1728--- src/grail-init.c 2011-05-18 16:38:44 +0000
1729+++ src/grail-init.c 2012-08-22 19:30:25 +0000
1730@@ -147,7 +147,7 @@
1731 }
1732
1733 int create_grail2(struct grail_impl *x,
1734- utouch_frame_handle fh,
1735+ oif_frame_handle fh,
1736 unsigned int num_frames,
1737 grail_select_callback select,
1738 unsigned int version,
1739@@ -155,8 +155,8 @@
1740 unsigned int frame_size,
1741 unsigned int slot_size)
1742 {
1743- struct utouch_surface *s = utouch_frame_get_surface(fh);
1744- unsigned int ntouch = utouch_frame_get_num_slots(fh);
1745+ struct oif_surface *s = oif_frame_get_surface(fh);
1746+ unsigned int ntouch = oif_frame_get_num_slots(fh);
1747 unsigned int nslot = get_slot_count(ntouch);
1748 int i, j;
1749
1750@@ -194,7 +194,7 @@
1751 free(x->ctl);
1752 }
1753
1754-grail_handle GRAIL_PUBLIC grail_new_raw(utouch_frame_handle fh,
1755+grail_handle GRAIL_PUBLIC grail_new_raw(oif_frame_handle fh,
1756 unsigned int num_frames,
1757 grail_select_callback select,
1758 unsigned int version,
1759
1760=== modified file 'src/grail-inserter.c'
1761--- src/grail-inserter.c 2011-06-16 17:28:51 +0000
1762+++ src/grail-inserter.c 2012-08-22 19:30:25 +0000
1763@@ -52,7 +52,7 @@
1764
1765 // todo: spanning tree for multi-user case
1766 static void setup_new_gestures(struct grail *ge,
1767- const struct utouch_frame *frame)
1768+ const struct oif_frame *frame)
1769 {
1770 struct gesture_inserter *gin = ge->gin;
1771 grail_mask_t types[DIM_GRAIL_TYPE_BYTES];
1772@@ -114,7 +114,7 @@
1773 ge->gin = NULL;
1774 }
1775
1776-void gin_frame_begin(struct grail *ge, const struct utouch_frame *frame)
1777+void gin_frame_begin(struct grail *ge, const struct oif_frame *frame)
1778 {
1779 struct gesture_inserter *gin = ge->gin;
1780 memset(gin->types, 0, sizeof(gin->types));
1781@@ -123,7 +123,7 @@
1782 gin->grab_active = 0;
1783 }
1784
1785-void gin_frame_end(struct grail *ge, const struct utouch_frame *frame)
1786+void gin_frame_end(struct grail *ge, const struct oif_frame *frame)
1787 {
1788 struct gesture_inserter *gin = ge->gin;
1789 grail_mask_t keep[DIM_TOUCH_BYTES];
1790@@ -186,7 +186,7 @@
1791 }
1792
1793 int gin_gid_begin(struct grail *ge, int type, int priority,
1794- const struct utouch_frame *frame)
1795+ const struct oif_frame *frame)
1796 {
1797 struct gesture_inserter *gin = ge->gin;
1798 struct slot_state *s;
1799@@ -292,7 +292,7 @@
1800 const struct grail_coord *tmin,
1801 const struct grail_coord *tmax)
1802 {
1803- struct utouch_surface *s = utouch_frame_get_surface(ge->impl->fh);
1804+ struct oif_surface *s = oif_frame_get_surface(ge->impl->fh);
1805
1806 s->mapped_min_x = tmin->x;
1807 s->mapped_min_y = tmin->y;
1808
1809=== modified file 'src/grail-inserter.h'
1810--- src/grail-inserter.h 2011-06-16 17:28:51 +0000
1811+++ src/grail-inserter.h 2012-08-22 19:30:25 +0000
1812@@ -60,25 +60,25 @@
1813 };
1814
1815 int gin_add_contact_props(const struct gesture_inserter *gin,
1816- grail_prop_t *prop, const struct utouch_frame *frame);
1817+ grail_prop_t *prop, const struct oif_frame *frame);
1818
1819 int gin_get_clients(struct grail *ge,
1820 struct grail_client_info *info, int maxinfo,
1821 const grail_mask_t* types, int btypes,
1822 const grail_mask_t* span, int bspan,
1823- const struct utouch_frame *frame);
1824+ const struct oif_frame *frame);
1825 void gin_send_event(struct grail *ge, struct slot_state *s,
1826 const struct gesture_event *ev,
1827- const struct utouch_frame *frame);
1828+ const struct oif_frame *frame);
1829
1830 int gin_init(struct grail *ge);
1831 void gin_destroy(struct grail *ge);
1832
1833-void gin_frame_begin(struct grail *ge, const struct utouch_frame *frame);
1834-void gin_frame_end(struct grail *ge, const struct utouch_frame *frame);
1835+void gin_frame_begin(struct grail *ge, const struct oif_frame *frame);
1836+void gin_frame_end(struct grail *ge, const struct oif_frame *frame);
1837
1838 int gin_gid_begin(struct grail *ge, int type, int priority,
1839- const struct utouch_frame *frame);
1840+ const struct oif_frame *frame);
1841 void gin_gid_discard(struct grail *ge, int gid);
1842 void gin_gid_timeout(struct grail *ge, int gid);
1843
1844
1845=== modified file 'src/grail-legacy.c'
1846--- src/grail-legacy.c 2011-04-28 16:53:57 +0000
1847+++ src/grail-legacy.c 2012-08-22 19:30:25 +0000
1848@@ -41,13 +41,13 @@
1849 struct grail_contact *touch, int max_touch)
1850 {
1851 const struct gesture_inserter *gin = ge->gin;
1852- const struct utouch_frame *frame = ge->impl->touch;
1853+ const struct oif_frame *frame = ge->impl->touch;
1854 int i;
1855 if (frame->num_active < max_touch)
1856 max_touch = frame->num_active;
1857 for (i = 0; i < max_touch; i++) {
1858 struct grail_contact *t = &touch[i];
1859- const struct utouch_contact *ct = frame->active[i];
1860+ const struct oif_contact *ct = frame->active[i];
1861 t->id = ct->id;
1862 t->tool_type = ct->tool_type;
1863 t->pos.x = ct->x;
1864
1865=== modified file 'src/grail-recognizer.c'
1866--- src/grail-recognizer.c 2011-06-16 17:28:51 +0000
1867+++ src/grail-recognizer.c 2012-08-22 19:30:25 +0000
1868@@ -41,7 +41,7 @@
1869 ge->gru = NULL;
1870 }
1871
1872-void gru_recognize(struct grail *ge, const struct utouch_frame *frame)
1873+void gru_recognize(struct grail *ge, const struct oif_frame *frame)
1874 {
1875 if (!ge->gin || !ge->gru)
1876 return;
1877
1878=== modified file 'src/grail-recognizer.h'
1879--- src/grail-recognizer.h 2011-06-16 17:28:51 +0000
1880+++ src/grail-recognizer.h 2012-08-22 19:30:25 +0000
1881@@ -38,7 +38,7 @@
1882 };
1883
1884 int gru_init(struct grail *ge);
1885-void gru_recognize(struct grail *ge, const struct utouch_frame *frame);
1886+void gru_recognize(struct grail *ge, const struct oif_frame *frame);
1887 void gru_destroy(struct grail *ge);
1888
1889 #endif
1890
1891=== modified file 'test/Makefile.am'
1892--- test/Makefile.am 2011-04-28 16:53:46 +0000
1893+++ test/Makefile.am 2012-08-22 19:30:25 +0000
1894@@ -23,6 +23,6 @@
1895 # internal symbols.
1896 #
1897 check_grail_LDADD = \
1898- $(top_builddir)/src/.libs/libutouch-grail.a \
1899+ $(top_builddir)/src/.libs/libgrail.a \
1900 $(CHECK_LIBS) \
1901- -lutouch-frame -lutouch-evemu -lmtdev -lm
1902+ -lframe -levemu -lmtdev -lm
1903
1904=== modified file 'test/Makefile.in'
1905--- test/Makefile.in 2011-08-09 21:58:43 +0000
1906+++ test/Makefile.in 2012-08-22 19:30:25 +0000
1907@@ -53,8 +53,7 @@
1908 check_grail-check-grail.$(OBJEXT)
1909 check_grail_OBJECTS = $(am_check_grail_OBJECTS)
1910 am__DEPENDENCIES_1 =
1911-check_grail_DEPENDENCIES = \
1912- $(top_builddir)/src/.libs/libutouch-grail.a \
1913+check_grail_DEPENDENCIES = $(top_builddir)/src/.libs/libgrail.a \
1914 $(am__DEPENDENCIES_1)
1915 check_grail_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
1916 $(LIBTOOLFLAGS) --mode=link $(CCLD) $(check_grail_CFLAGS) \
1917@@ -226,9 +225,9 @@
1918 # internal symbols.
1919 #
1920 check_grail_LDADD = \
1921- $(top_builddir)/src/.libs/libutouch-grail.a \
1922+ $(top_builddir)/src/.libs/libgrail.a \
1923 $(CHECK_LIBS) \
1924- -lutouch-frame -lutouch-evemu -lmtdev -lm
1925+ -lframe -levemu -lmtdev -lm
1926
1927 all: all-am
1928
1929
1930=== modified file 'test/check-transform.c'
1931--- test/check-transform.c 2011-04-28 16:53:46 +0000
1932+++ test/check-transform.c 2012-08-22 19:30:25 +0000
1933@@ -1,5 +1,5 @@
1934 #include <check.h>
1935-#include <utouch/frame-mtdev.h>
1936+#include <oif/frame-mtdev.h>
1937 #include <grail.h>
1938 #include <string.h>
1939 #include <stdio.h>
1940@@ -11,7 +11,7 @@
1941
1942 struct test_data {
1943 struct evemu_device *evemu;
1944- utouch_frame_handle fh;
1945+ oif_frame_handle fh;
1946 grail_handle ge;
1947 FILE *fp;
1948 struct timeval evtime;
1949@@ -36,8 +36,8 @@
1950 if (!data->evemu || evemu_read(data->evemu, data->fp) <= 0)
1951 return -1;
1952
1953- data->fh = utouch_frame_new_engine(100, 32, 100);
1954- if (!data->fh || utouch_frame_init_mtdev(data->fh, data->evemu))
1955+ data->fh = oif_frame_new_engine(100, 32, 100);
1956+ if (!data->fh || oif_frame_init_mtdev(data->fh, data->evemu))
1957 return -1;
1958
1959 data->ge = grail_new(data->fh, 10, 0);
1960@@ -50,7 +50,7 @@
1961 static void term_test_data(struct test_data *data)
1962 {
1963 grail_delete(data->ge);
1964- utouch_frame_delete_engine(data->fh);
1965+ oif_frame_delete_engine(data->fh);
1966 evemu_delete(data->evemu);
1967 fclose(data->fp);
1968 }
1969@@ -63,10 +63,10 @@
1970 static const struct grail_element *get_element(struct test_data *data,
1971 const struct input_event *ev)
1972 {
1973- const struct utouch_frame *touch;
1974+ const struct oif_frame *touch;
1975 const struct grail_frame *frame;
1976
1977- touch = utouch_frame_pump_mtdev(data->fh, ev);
1978+ touch = oif_frame_pump_mtdev(data->fh, ev);
1979 if (!touch)
1980 return 0;
1981 frame = grail_pump_frame(data->ge, touch);
1982
1983=== modified file 'tools/Makefile.am'
1984--- tools/Makefile.am 2011-04-28 16:53:53 +0000
1985+++ tools/Makefile.am 2012-08-22 19:30:25 +0000
1986@@ -11,5 +11,5 @@
1987 AM_CFLAGS = $(X11_CFLAGS) $(XINPUT_CFLAGS)
1988
1989 AM_LDFLAGS = -L$(top_builddir)/src/.libs/ \
1990- -lutouch-grail -lutouch-frame -lutouch-evemu -lmtdev \
1991+ -lgrail -lframe -levemu -lmtdev \
1992 $(X11_LIBS) $(XINPUT_LIBS) -lm
1993
1994=== modified file 'tools/Makefile.in'
1995--- tools/Makefile.in 2011-08-09 21:58:43 +0000
1996+++ tools/Makefile.in 2012-08-22 19:30:25 +0000
1997@@ -208,7 +208,7 @@
1998 INCLUDES = -I$(top_srcdir)/include/
1999 AM_CFLAGS = $(X11_CFLAGS) $(XINPUT_CFLAGS)
2000 AM_LDFLAGS = -L$(top_builddir)/src/.libs/ \
2001- -lutouch-grail -lutouch-frame -lutouch-evemu -lmtdev \
2002+ -lgrail -lframe -levemu -lmtdev \
2003 $(X11_LIBS) $(XINPUT_LIBS) -lm
2004
2005 all: all-am
2006
2007=== modified file 'tools/grail-test-mtdev.c'
2008--- tools/grail-test-mtdev.c 2011-05-18 16:38:44 +0000
2009+++ tools/grail-test-mtdev.c 2012-08-22 19:30:25 +0000
2010@@ -21,7 +21,7 @@
2011
2012 #define MTDEV_NO_LEGACY_API
2013
2014-#include <utouch/frame-mtdev.h>
2015+#include <oif/frame-mtdev.h>
2016 #include <grail.h>
2017 #include <string.h>
2018 #include <stdio.h>
2019@@ -32,7 +32,7 @@
2020 struct frame_test {
2021 struct evemu_device *evemu;
2022 struct mtdev *mtdev;
2023- utouch_frame_handle fh;
2024+ oif_frame_handle fh;
2025 grail_handle ge;
2026 };
2027
2028@@ -57,10 +57,10 @@
2029
2030 static int init_frame(struct frame_test *test, int fd)
2031 {
2032- test->fh = utouch_frame_new_engine(100, 32, 100);
2033+ test->fh = oif_frame_new_engine(100, 32, 100);
2034 if (!test->fh)
2035 return -1;
2036- return utouch_frame_init_mtdev(test->fh, test->evemu);
2037+ return oif_frame_init_mtdev(test->fh, test->evemu);
2038 }
2039
2040 static int init_grail(struct frame_test *test)
2041@@ -77,7 +77,7 @@
2042 static void destroy_all(struct frame_test *test)
2043 {
2044 grail_delete(test->ge);
2045- utouch_frame_delete_engine(test->fh);
2046+ oif_frame_delete_engine(test->fh);
2047 if (test->mtdev)
2048 mtdev_close_delete(test->mtdev);
2049 evemu_delete(test->evemu);
2050@@ -85,7 +85,7 @@
2051 }
2052
2053 static void report_frame(grail_handle ge,
2054- const struct utouch_frame *touch)
2055+ const struct oif_frame *touch)
2056 {
2057 const struct grail_frame *frame = grail_pump_frame(ge, touch);
2058 int i;
2059@@ -131,21 +131,21 @@
2060
2061 static void loop_device(struct frame_test *test, FILE *fp, int fd)
2062 {
2063- const struct utouch_frame *frame;
2064+ const struct oif_frame *frame;
2065 struct input_event ev;
2066
2067 if (fp) {
2068 struct timeval evtime;
2069 memset(&evtime, 0, sizeof(evtime));
2070 while (evemu_read_event_realtime(fp, &ev, &evtime) > 0) {
2071- frame = utouch_frame_pump_mtdev(test->fh, &ev);
2072+ frame = oif_frame_pump_mtdev(test->fh, &ev);
2073 if (frame)
2074 report_frame(test->ge, frame);
2075 }
2076 } else {
2077 while (!mtdev_idle(test->mtdev, fd, 5000)) {
2078 while (mtdev_get(test->mtdev, fd, &ev, 1) > 0) {
2079- frame = utouch_frame_pump_mtdev(test->fh, &ev);
2080+ frame = oif_frame_pump_mtdev(test->fh, &ev);
2081 if (frame)
2082 report_frame(test->ge, frame);
2083 }
2084@@ -155,7 +155,7 @@
2085
2086 static void report_device_caps(struct frame_test *test)
2087 {
2088- const struct utouch_surface *s = utouch_frame_get_surface(test->fh);
2089+ const struct oif_surface *s = oif_frame_get_surface(test->fh);
2090
2091 fprintf(stderr, "device props:\n");
2092 if (s->needs_pointer)
2093@@ -183,9 +183,9 @@
2094 fprintf(stderr, "\tdistance\n");
2095
2096 fprintf(stderr, "touch frames: %d\n",
2097- utouch_frame_get_num_frames(test->fh));
2098+ oif_frame_get_num_frames(test->fh));
2099 fprintf(stderr, "touch slots: %d\n",
2100- utouch_frame_get_num_slots(test->fh));
2101+ oif_frame_get_num_slots(test->fh));
2102 }
2103
2104 int main(int argc, char *argv[])
2105@@ -223,7 +223,7 @@
2106 fprintf(stderr, "error: could not describe device\n");
2107 return -1;
2108 }
2109- if (!utouch_frame_is_supported_mtdev(test.evemu)) {
2110+ if (!oif_frame_is_supported_mtdev(test.evemu)) {
2111 fprintf(stderr, "error: unsupported device\n");
2112 return -1;
2113 }
2114
2115=== modified file 'tools/grail-transform.c'
2116--- tools/grail-transform.c 2011-05-24 08:16:15 +0000
2117+++ tools/grail-transform.c 2012-08-22 19:30:25 +0000
2118@@ -21,8 +21,8 @@
2119
2120 #include "config.h"
2121 #include <evemu.h>
2122-#include <utouch/frame-mtdev.h>
2123-#include <utouch/frame-xi2.h>
2124+#include <oif/frame-mtdev.h>
2125+#include <oif/frame-xi2.h>
2126 #include <grail.h>
2127 #include <stdio.h>
2128 #include <stdlib.h>
2129@@ -37,7 +37,7 @@
2130 int fd;
2131 struct evemu_device *evemu;
2132 struct mtdev *mtdev;
2133- utouch_frame_handle fh;
2134+ oif_frame_handle fh;
2135 struct grail *ge;
2136
2137 struct grail_coord pos[4];
2138@@ -59,7 +59,7 @@
2139
2140 static void clear_screen(struct appdata *w)
2141 {
2142- const struct utouch_surface *s = utouch_frame_get_surface(w->fh);
2143+ const struct oif_surface *s = oif_frame_get_surface(w->fh);
2144 int width = s->mapped_max_x - s->mapped_min_x;
2145 int height = s->mapped_max_y - s->mapped_min_y;
2146 int i;
2147@@ -80,7 +80,7 @@
2148 static void draw_object(struct appdata *w)
2149 {
2150 static const double frac = 0.04;
2151- const struct utouch_surface *s = utouch_frame_get_surface(w->fh);
2152+ const struct oif_surface *s = oif_frame_get_surface(w->fh);
2153 double d = frac * (s->mapped_max_x - s->mapped_min_x);
2154 int i;
2155
2156@@ -105,7 +105,7 @@
2157 }
2158
2159 static void report_frame(struct appdata *w,
2160- const struct utouch_frame *touch)
2161+ const struct oif_frame *touch)
2162 {
2163 const struct grail_frame *frame;
2164 const struct grail_element *slot;
2165@@ -201,7 +201,7 @@
2166
2167 static void set_screen_size_mtdev(struct appdata *w, XEvent *xev)
2168 {
2169- struct utouch_surface *s = utouch_frame_get_surface(w->fh);
2170+ struct oif_surface *s = oif_frame_get_surface(w->fh);
2171 XConfigureEvent *cev = (XConfigureEvent *)xev;
2172
2173 s->mapped_min_x = 0;
2174@@ -218,7 +218,7 @@
2175
2176 static void loop_device_mtdev(struct appdata *w)
2177 {
2178- const struct utouch_frame *tf;
2179+ const struct oif_frame *tf;
2180 struct input_event iev;
2181 XEvent xev;
2182
2183@@ -230,7 +230,7 @@
2184 while (1) {
2185 while (!mtdev_idle(w->mtdev, w->fd, 100)) {
2186 while (mtdev_get(w->mtdev, w->fd, &iev, 1) > 0) {
2187- tf = utouch_frame_pump_mtdev(w->fh, &iev);
2188+ tf = oif_frame_pump_mtdev(w->fh, &iev);
2189 report_frame(w, tf);
2190 }
2191 }
2192@@ -261,10 +261,10 @@
2193 w->mtdev = mtdev_new_open(w->fd);
2194 if (!w->mtdev)
2195 return -1;
2196- w->fh = utouch_frame_new_engine(500, 32, 100);
2197+ w->fh = oif_frame_new_engine(500, 32, 100);
2198 if (!w->fh)
2199 return -1;
2200- if (utouch_frame_init_mtdev(w->fh, w->evemu))
2201+ if (oif_frame_init_mtdev(w->fh, w->evemu))
2202 return -1;
2203 w->ge = grail_new(w->fh, 100, 0);
2204 if (!w->ge)
2205@@ -278,7 +278,7 @@
2206 loop_device_mtdev(w);
2207
2208 grail_delete(w->ge);
2209- utouch_frame_delete_engine(w->fh);
2210+ oif_frame_delete_engine(w->fh);
2211 mtdev_close_delete(w->mtdev);
2212 evemu_delete(w->evemu);
2213
2214@@ -322,7 +322,7 @@
2215
2216 static void loop_device_xi2(struct appdata *w, int id)
2217 {
2218- const struct utouch_frame *tf;
2219+ const struct oif_frame *tf;
2220 XIEventMask mask;
2221
2222 mask.deviceid = id;
2223@@ -346,7 +346,7 @@
2224 if (XGetEventData(w->dsp, cookie) &&
2225 cookie->type == GenericEvent &&
2226 cookie->extension == w->opcode) {
2227- tf = utouch_frame_pump_xi2(w->fh, cookie->data);
2228+ tf = oif_frame_pump_xi2(w->fh, cookie->data);
2229 report_frame(w, tf);
2230 }
2231 XFreeEventData(w->dsp, cookie);
2232@@ -373,10 +373,10 @@
2233 if (!dev)
2234 return -1;
2235
2236- w->fh = utouch_frame_new_engine(500, 32, 100);
2237+ w->fh = oif_frame_new_engine(500, 32, 100);
2238 if (!w->fh)
2239 return -1;
2240- if (utouch_frame_init_xi2(w->fh, w->dsp, dev))
2241+ if (oif_frame_init_xi2(w->fh, w->dsp, dev))
2242 return -1;
2243 w->ge = grail_new(w->fh, 100, 0);
2244 if (!w->ge)
2245@@ -385,7 +385,7 @@
2246 loop_device_xi2(w, id);
2247
2248 grail_delete(w->ge);
2249- utouch_frame_delete_engine(w->fh);
2250+ oif_frame_delete_engine(w->fh);
2251
2252 XIFreeDeviceInfo(info);
2253

Subscribers

People subscribed via source and target branches

to all changes: