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

[Francis Ginther]

  * 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

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

[Daniel d'Andrada (dandrader)]

Looks ok. Builds fine.

review: Approve

=== modified file 'ChangeLog'
--- ChangeLog	2011-08-09 22:00:48 +0000
+++ ChangeLog	2012-08-22 19:30:25 +0000
@@ -1,4 +1,19 @@
 ------------------------------------------------------------
+revno: 166
+tags: v2.0.1.1
+committer: Chase Douglas <[e-mail]>
+branch nick: 2.0.1
+timestamp: Wed 2012-08-15 19:37:38 +0000
+message:
+  Release version 2.0.1.1
+------------------------------------------------------------
+revno: 165
+committer: Chase Douglas <[e-mail]>
+branch nick: 2.0.1
+timestamp: Wed 2012-08-15 19:25:17 +0000
+message:
+  Rename project to simply 'grail'
+------------------------------------------------------------
 revno: 164
 tags: v2.0.1
 committer: Chase Douglas <[e-mail]>
@@ -1461,14 +1476,12 @@
 ------------------------------------------------------------
 revno: 22
 tags: v1.0.1
-git commit: 4af2240c46ea401ce259f1c4c1401b335b397987
 committer: Henrik Rydberg <[e-mail]>
 timestamp: Fri 2010-08-06 14:39:27 +0200
 message:
   grail v1.0.1
 ------------------------------------------------------------
 revno: 21
-git commit: 3b6bc1a7dc5871aef2c47426f87bb409a622de29
 author: Henrik Rydberg <[e-mail]>
 committer: Henrik Rydberg <[e-mail]>
 timestamp: Fri 2010-08-06 14:33:32 +0200
@@ -1484,7 +1497,6 @@
 ------------------------------------------------------------
 revno: 20
 tags: v1.0.0
-git commit: 40d6c7304cf431f13bfe81600656b268c881a4a2
 author: Henrik Rydberg <[e-mail]>
 committer: Henrik Rydberg <[e-mail]>
 timestamp: Thu 2010-08-05 22:48:38 +0200
@@ -1496,7 +1508,6 @@
   Signed-off-by: Henrik Rydberg <[e-mail]>
 ------------------------------------------------------------
 revno: 19
-git commit: 41be604bacf259d8dbcd6d5641fc3e6bb113dafc
 author: Henrik Rydberg <[e-mail]>
 committer: Henrik Rydberg <[e-mail]>
 timestamp: Thu 2010-08-05 22:48:38 +0200
@@ -1510,7 +1521,6 @@
   Signed-off-by: Henrik Rydberg <[e-mail]>
 ------------------------------------------------------------
 revno: 18
-git commit: 7559b3d7aa725cd75ee4e6746246205392fe1c0f
 author: Henrik Rydberg <[e-mail]>
 committer: Henrik Rydberg <[e-mail]>
 timestamp: Thu 2010-08-05 22:48:38 +0200
@@ -1522,7 +1532,6 @@
   Signed-off-by: Henrik Rydberg <[e-mail]>
 ------------------------------------------------------------
 revno: 17
-git commit: 8bbf06f8d0056ae30fdfaf260000e763fad2345c
 author: Henrik Rydberg <[e-mail]>
 committer: Henrik Rydberg <[e-mail]>
 timestamp: Thu 2010-08-05 22:48:38 +0200
@@ -1535,7 +1544,6 @@
   Signed-off-by: Henrik Rydberg <[e-mail]>
 ------------------------------------------------------------
 revno: 16
-git commit: d5f810a0d3e0013a76136750eaff825ceec099a2
 author: Henrik Rydberg <[e-mail]>
 committer: Henrik Rydberg <[e-mail]>
 timestamp: Thu 2010-08-05 22:48:38 +0200
@@ -1548,7 +1556,6 @@
   Signed-off-by: Henrik Rydberg <[e-mail]>
 ------------------------------------------------------------
 revno: 15
-git commit: d8e8d112aa907f8021ae99e6d7cd7856f1d90b70
 author: Henrik Rydberg <[e-mail]>
 committer: Henrik Rydberg <[e-mail]>
 timestamp: Thu 2010-08-05 22:48:38 +0200
@@ -1561,7 +1568,6 @@
   Signed-off-by: Henrik Rydberg <[e-mail]>
 ------------------------------------------------------------
 revno: 14
-git commit: 00f7895d101de2703dbcea3600a68c4f653a0378
 author: Henrik Rydberg <[e-mail]>
 committer: Henrik Rydberg <[e-mail]>
 timestamp: Thu 2010-08-05 22:48:38 +0200
@@ -1576,7 +1582,6 @@
   Signed-off-by: Henrik Rydberg <[e-mail]>
 ------------------------------------------------------------
 revno: 13
-git commit: d7d89e2afae9151f4d16aa71a99eedbf920ecc1a
 author: Henrik Rydberg <[e-mail]>
 committer: Henrik Rydberg <[e-mail]>
 timestamp: Thu 2010-08-05 22:48:38 +0200
@@ -1586,7 +1591,6 @@
   Signed-off-by: Henrik Rydberg <[e-mail]>
 ------------------------------------------------------------
 revno: 12
-git commit: 88dada465e0fad35b5a535a042e0a93046ffff7c
 author: Henrik Rydberg <[e-mail]>
 committer: Henrik Rydberg <[e-mail]>
 timestamp: Thu 2010-08-05 22:48:38 +0200
@@ -1598,7 +1602,6 @@
   Signed-off-by: Henrik Rydberg <[e-mail]>
 ------------------------------------------------------------
 revno: 11
-git commit: 697b5b5c7d2b1c46387061fcbed24cbee51d98ce
 author: Henrik Rydberg <[e-mail]>
 committer: Henrik Rydberg <[e-mail]>
 timestamp: Thu 2010-08-05 22:48:38 +0200
@@ -1611,7 +1614,6 @@
   Signed-off-by: Henrik Rydberg <[e-mail]>
 ------------------------------------------------------------
 revno: 10
-git commit: 642d7ee26f347152a106d48ddad37a8059d36fb1
 author: Henrik Rydberg <[e-mail]>
 committer: Henrik Rydberg <[e-mail]>
 timestamp: Thu 2010-08-05 22:48:38 +0200
@@ -1626,7 +1628,6 @@
   Signed-off-by: Henrik Rydberg <[e-mail]>
 ------------------------------------------------------------
 revno: 9
-git commit: d07c43f9f19dc0ee38aaf44947cfc396f437490e
 author: Henrik Rydberg <[e-mail]>
 committer: Henrik Rydberg <[e-mail]>
 timestamp: Thu 2010-08-05 22:48:38 +0200
@@ -1639,7 +1640,6 @@
   Signed-off-by: Henrik Rydberg <[e-mail]>
 ------------------------------------------------------------
 revno: 8
-git commit: 342a43e7b2ceec1dd200bffa24b052fec33f5bdc
 author: Henrik Rydberg <[e-mail]>
 committer: Henrik Rydberg <[e-mail]>
 timestamp: Thu 2010-08-05 22:48:38 +0200
@@ -1653,7 +1653,6 @@
   Signed-off-by: Henrik Rydberg <[e-mail]>
 ------------------------------------------------------------
 revno: 7
-git commit: e0eb1015bf30fd0913db571b000ba6a83ea22660
 author: Henrik Rydberg <[e-mail]>
 committer: Henrik Rydberg <[e-mail]>
 timestamp: Thu 2010-08-05 22:48:38 +0200
@@ -1666,7 +1665,6 @@
   Signed-off-by: Henrik Rydberg <[e-mail]>
 ------------------------------------------------------------
 revno: 6
-git commit: b76660d71e2ea77752025089bd71deffad64e325
 author: Henrik Rydberg <[e-mail]>
 committer: Henrik Rydberg <[e-mail]>
 timestamp: Thu 2010-08-05 22:48:38 +0200
@@ -1678,7 +1676,6 @@
   Signed-off-by: Henrik Rydberg <[e-mail]>
 ------------------------------------------------------------
 revno: 5
-git commit: eb896e11aacab5f53e3915a8d19ffffd92ce8e10
 author: Henrik Rydberg <[e-mail]>
 committer: Henrik Rydberg <[e-mail]>
 timestamp: Thu 2010-08-05 22:48:38 +0200
@@ -1692,7 +1689,6 @@
   Signed-off-by: Henrik Rydberg <[e-mail]>
 ------------------------------------------------------------
 revno: 4
-git commit: 3b9c20f869a2f55bd9953665c9e7fd713db4ff43
 author: Henrik Rydberg <[e-mail]>
 committer: Henrik Rydberg <[e-mail]>
 timestamp: Thu 2010-08-05 22:48:37 +0200
@@ -1702,7 +1698,6 @@
   Signed-off-by: Henrik Rydberg <[e-mail]>
 ------------------------------------------------------------
 revno: 3
-git commit: 49922aacc4e6361e2a11dd2ce8460c80b41ab493
 author: Henrik Rydberg <[e-mail]>
 committer: Henrik Rydberg <[e-mail]>
 timestamp: Thu 2010-08-05 22:48:37 +0200
@@ -1712,7 +1707,6 @@
   Signed-off-by: Henrik Rydberg <[e-mail]>
 ------------------------------------------------------------
 revno: 2
-git commit: 7c277ee54e7d0ea0c44b304897049a01e2d1a44a
 author: Stephen M. Webb <[e-mail]>
 committer: Henrik Rydberg <[e-mail]>
 timestamp: Thu 2010-08-05 22:48:37 +0200
@@ -1725,7 +1719,6 @@
   Signed-off-by: Henrik Rydberg <[e-mail]>
 ------------------------------------------------------------
 revno: 1
-git commit: 3b837806891de6cf77d4d74d04567e7e68c82fc0
 committer: Henrik Rydberg <[e-mail]>
 timestamp: Tue 2010-07-13 11:26:46 +0200
 message:
 
=== modified file 'INSTALL'
--- INSTALL	2011-01-02 12:08:08 +0000
+++ INSTALL	2012-08-22 19:30:25 +0000
@@ -1,7 +1,7 @@
 grail - Gesture Recognition And Instantiation Library
 
 To build, you need to have the autoconf, libtool, mtdev-dev,
-libutouch-evemu-dev and libutouch-frame packages installed. Then, do
+libevemu-dev and libframe-dev packages installed. Then, do
 
    ./autogen.sh
    ./configure
 
=== modified file 'Makefile.am'
--- Makefile.am	2011-01-02 12:06:04 +0000
+++ Makefile.am	2012-08-22 19:30:25 +0000
@@ -1,7 +1,7 @@
 SUBDIRS = src test tools
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = utouch-grail.pc
+pkgconfig_DATA = grail.pc
 
 INCLUDES = $(top_srcdir)/include/
 
 
=== modified file 'Makefile.in'
--- Makefile.in	2011-08-09 21:58:43 +0000
+++ Makefile.in	2012-08-22 19:30:25 +0000
@@ -37,8 +37,8 @@
 subdir = .
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
-	$(srcdir)/utouch-grail.pc.in $(top_srcdir)/configure AUTHORS \
-	COPYING ChangeLog INSTALL config-aux/config.guess \
+	$(srcdir)/grail.pc.in $(top_srcdir)/configure AUTHORS COPYING \
+	ChangeLog INSTALL config-aux/config.guess \
 	config-aux/config.sub config-aux/depcomp config-aux/install-sh \
 	config-aux/ltmain.sh config-aux/missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -49,7 +49,7 @@
  configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = utouch-grail.pc
+CONFIG_CLEAN_FILES = grail.pc
 CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
@@ -257,7 +257,7 @@
 top_srcdir = @top_srcdir@
 SUBDIRS = src test tools
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = utouch-grail.pc
+pkgconfig_DATA = grail.pc
 INCLUDES = $(top_srcdir)/include/
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -314,7 +314,7 @@
 
 distclean-hdr:
 	-rm -f config.h stamp-h1
-utouch-grail.pc: $(top_builddir)/config.status $(srcdir)/utouch-grail.pc.in
+grail.pc: $(top_builddir)/config.status $(srcdir)/grail.pc.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 
 mostlyclean-libtool:
 
=== modified file 'configure'
--- configure	2011-08-09 21:58:43 +0000
+++ configure	2012-08-22 19:30:25 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for Gesture Recognition And Instantiation Library 2.0.1.
+# Generated by GNU Autoconf 2.68 for Gesture Recognition And Instantiation Library 2.0.1.1.
 #
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -566,9 +566,9 @@
 
 # Identity of this package.
 PACKAGE_NAME='Gesture Recognition And Instantiation Library'
-PACKAGE_TARNAME='utouch-grail'
-PACKAGE_VERSION='2.0.1'
-PACKAGE_STRING='Gesture Recognition And Instantiation Library 2.0.1'
+PACKAGE_TARNAME='grail'
+PACKAGE_VERSION='2.0.1.1'
+PACKAGE_STRING='Gesture Recognition And Instantiation Library 2.0.1.1'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1319,7 +1319,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures Gesture Recognition And Instantiation Library 2.0.1 to adapt to many kinds of systems.
+\`configure' configures Gesture Recognition And Instantiation Library 2.0.1.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1367,7 +1367,7 @@
   --infodir=DIR           info documentation [DATAROOTDIR/info]
   --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
   --mandir=DIR            man documentation [DATAROOTDIR/man]
-  --docdir=DIR            documentation root [DATAROOTDIR/doc/utouch-grail]
+  --docdir=DIR            documentation root [DATAROOTDIR/doc/grail]
   --htmldir=DIR           html documentation [DOCDIR]
   --dvidir=DIR            dvi documentation [DOCDIR]
   --pdfdir=DIR            pdf documentation [DOCDIR]
@@ -1389,7 +1389,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Gesture Recognition And Instantiation Library 2.0.1:";;
+     short | recursive ) echo "Configuration of Gesture Recognition And Instantiation Library 2.0.1.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1513,7 +1513,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Gesture Recognition And Instantiation Library configure 2.0.1
+Gesture Recognition And Instantiation Library configure 2.0.1.1
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1791,7 +1791,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Gesture Recognition And Instantiation Library $as_me 2.0.1, which was
+It was created by Gesture Recognition And Instantiation Library $as_me 2.0.1.1, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2610,8 +2610,8 @@
 
 
 # Define the identity of the package.
- PACKAGE='utouch-grail'
- VERSION='2.0.1'
+ PACKAGE='grail'
+ VERSION='2.0.1.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -12090,12 +12090,12 @@
     pkg_cv_EVEMU_CFLAGS="$EVEMU_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"utouch-evemu >= 1.0.5\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "utouch-evemu >= 1.0.5") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evemu >= 1.0.5\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "evemu >= 1.0.5") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_EVEMU_CFLAGS=`$PKG_CONFIG --cflags "utouch-evemu >= 1.0.5" 2>/dev/null`
+  pkg_cv_EVEMU_CFLAGS=`$PKG_CONFIG --cflags "evemu >= 1.0.5" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -12107,12 +12107,12 @@
     pkg_cv_EVEMU_LIBS="$EVEMU_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"utouch-evemu >= 1.0.5\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "utouch-evemu >= 1.0.5") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"evemu >= 1.0.5\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "evemu >= 1.0.5") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_EVEMU_LIBS=`$PKG_CONFIG --libs "utouch-evemu >= 1.0.5" 2>/dev/null`
+  pkg_cv_EVEMU_LIBS=`$PKG_CONFIG --libs "evemu >= 1.0.5" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -12133,14 +12133,14 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        EVEMU_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "utouch-evemu >= 1.0.5" 2>&1`
+	        EVEMU_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "evemu >= 1.0.5" 2>&1`
         else
-	        EVEMU_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "utouch-evemu >= 1.0.5" 2>&1`
+	        EVEMU_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "evemu >= 1.0.5" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$EVEMU_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (utouch-evemu >= 1.0.5) were not met:
+	as_fn_error $? "Package requirements (evemu >= 1.0.5) were not met:
 
 $EVEMU_PKG_ERRORS
 
@@ -12181,12 +12181,12 @@
     pkg_cv_FRAME_CFLAGS="$FRAME_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"utouch-frame >= 1.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "utouch-frame >= 1.0") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"frame >= 1.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "frame >= 1.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_FRAME_CFLAGS=`$PKG_CONFIG --cflags "utouch-frame >= 1.0" 2>/dev/null`
+  pkg_cv_FRAME_CFLAGS=`$PKG_CONFIG --cflags "frame >= 1.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -12198,12 +12198,12 @@
     pkg_cv_FRAME_LIBS="$FRAME_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"utouch-frame >= 1.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "utouch-frame >= 1.0") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"frame >= 1.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "frame >= 1.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_FRAME_LIBS=`$PKG_CONFIG --libs "utouch-frame >= 1.0" 2>/dev/null`
+  pkg_cv_FRAME_LIBS=`$PKG_CONFIG --libs "frame >= 1.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -12224,14 +12224,14 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        FRAME_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "utouch-frame >= 1.0" 2>&1`
+	        FRAME_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "frame >= 1.0" 2>&1`
         else
-	        FRAME_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "utouch-frame >= 1.0" 2>&1`
+	        FRAME_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "frame >= 1.0" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$FRAME_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (utouch-frame >= 1.0) were not met:
+	as_fn_error $? "Package requirements (frame >= 1.0) were not met:
 
 $FRAME_PKG_ERRORS
 
@@ -12460,7 +12460,7 @@
 fi
 
 
-ac_config_files="$ac_config_files Makefile src/Makefile tools/Makefile test/Makefile utouch-grail.pc"
+ac_config_files="$ac_config_files Makefile src/Makefile tools/Makefile test/Makefile grail.pc"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -13012,7 +13012,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Gesture Recognition And Instantiation Library $as_me 2.0.1, which was
+This file was extended by Gesture Recognition And Instantiation Library $as_me 2.0.1.1, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -13078,7 +13078,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-Gesture Recognition And Instantiation Library config.status 2.0.1
+Gesture Recognition And Instantiation Library config.status 2.0.1.1
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
@@ -13491,7 +13491,7 @@
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
     "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
     "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
-    "utouch-grail.pc") CONFIG_FILES="$CONFIG_FILES utouch-grail.pc" ;;
+    "grail.pc") CONFIG_FILES="$CONFIG_FILES grail.pc" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
 
=== modified file 'configure.ac'
--- configure.ac	2011-08-09 21:58:43 +0000
+++ configure.ac	2012-08-22 19:30:25 +0000
@@ -1,9 +1,9 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([Gesture Recognition And Instantiation Library],
-        [2.0.1],
+        [2.0.1.1],
         [],
-        [utouch-grail])
+        [grail])
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_AUX_DIR([config-aux])
@@ -23,8 +23,8 @@
 AC_PROG_INSTALL
 
 PKG_CHECK_MODULES([MTDEV], [mtdev >= 1.1])
-PKG_CHECK_MODULES([EVEMU], [utouch-evemu >= 1.0.5])
-PKG_CHECK_MODULES([FRAME], [utouch-frame >= 1.0])
+PKG_CHECK_MODULES([EVEMU], [evemu >= 1.0.5])
+PKG_CHECK_MODULES([FRAME], [frame >= 1.0])
 
 AC_ARG_WITH([xi], AS_HELP_STRING([--with-xi], [Build with XI2.1 support]))
 AM_CONDITIONAL([HAVE_XI], [test "x$with_xi" != "x"])
@@ -43,6 +43,6 @@
                  src/Makefile
                  tools/Makefile
                  test/Makefile
-                 utouch-grail.pc])
+                 grail.pc])
 AC_OUTPUT
 
 
=== modified file 'debian/changelog'
--- debian/changelog	2011-08-09 22:04:08 +0000
+++ debian/changelog	2012-08-22 19:30:25 +0000
@@ -1,182 +1,11 @@
-utouch-grail (2.0.1-0ubuntu1) oneiric; urgency=low
-
-  * New upstream release.
-    - Use physical dimensions instead of device dimensions for thresholds
-      (LP: #823457)
-  * Bump lintian standards version to 3.9.2
-
- -- Chase Douglas <[e-mail]>  Tue, 09 Aug 2011 15:03:44 -0700
-
-utouch-grail (2.0.0-0ubuntu1) oneiric; urgency=low
-
-  [ Chase Douglas ]
-  * Remove unnecessary cdbs rules and build-depends.
-  * Added pivot disambiguation.
-
-  [ Jussi Pakkanen ]
-  * Added rotation and pinch center coordinates.
-  * Added XInput device autodetection.
-
-  [ Stephen M. Webb ]
-  * Added libutouch-grail-dev dependency on libutouch-frame-dev
-  * New upstream release v2.0.0.
-
- -- Chase Douglas <[e-mail]>  Fri, 17 Jun 2011 12:17:36 +0200
-
-utouch-grail (1.0.20-0ubuntu1) natty; urgency=low
-
-  [ Henrik Rydberg ]
-  * New upstream release.
-  * Fixes bug LP: #637106
-
- -- Chase Douglas <[e-mail]>  Wed, 09 Mar 2011 12:14:40 -0500
-
-utouch-grail (1.0.19-0ubuntu2) natty; urgency=low
-
-  * Rebuild against utouch-frame 1.0.0-0ubuntu3 to fix udeb dependencies.
-
- -- Colin Watson <[e-mail]>  Tue, 22 Feb 2011 20:17:07 +0000
-
-utouch-grail (1.0.19-0ubuntu1) natty; urgency=low
-
-  * New upstream release. (LP: #722780)
-  * Integrates with XInput 2.1 multitouch.
-
- -- Chase Douglas <[e-mail]>  Mon, 21 Feb 2011 17:30:23 -0500
-
-utouch-grail (1.0.18-0ubuntu1) natty; urgency=low
-
-  * New upstream release. (LP: #702637)
-  * Remove symbols unintentionally included in grail-1.0
-  * Update package dependencies
-
- -- Henrik Rydberg <[e-mail]>  Mon, 03 Jan 2011 21:21:34 +0100
-
-utouch-grail (1.0.16-0ubuntu2) natty; urgency=low
-
-  * rebuild the -updates maverick version with natty toolchain (LP: #667802)
-
- -- Didier Roche <[e-mail]>  Tue, 23 Nov 2010 13:04:23 +0100
-
-utouch-grail (1.0.16-0ubuntu1) maverick-proposed; urgency=low
-
-  * Report touch down on one-finger entry (LP: #667802)
-  * New upstream release.
-
- -- Henrik Rydberg <[e-mail]>  Mon, 08 Nov 2010 21:02:29 +0100
-
-utouch-grail (1.0.15-0ubuntu1) maverick-proposed; urgency=low
-
-  * New upstream release.
-    - Fix one Finger tap as mouse click is confusing LP: #647761
-
- -- Henrik Rydberg <[e-mail]>  Tue, 28 Sep 2010 13:55:19 +0200
-
-utouch-grail (1.0.14-0ubuntu1) maverick; urgency=low
-
-  [ Henrik Rydberg ]
-  * New upstream release.
-
-  [ Stephen M. Webb ]
-  * Ubuntu feature freeze exception (LP: #644385 ).
-
- -- Stephen M. Webb <[e-mail]>  Wed, 22 Sep 2010 07:20:16 -0400
-
-utouch-grail (1.0.13-0ubuntu1) maverick; urgency=low
-
-  [ Henrik Rydberg ]
-  * New upstream release.
-    - LP: #635011
-
- -- Chase Douglas <[e-mail]>  Fri, 10 Sep 2010 11:25:44 -0400
-
-utouch-grail (1.0.12-0ubuntu1) maverick; urgency=low
-
-  * New upstream release.
-
- -- Henrik Rydberg <[e-mail]>  Tue, 07 Sep 2010 20:55:38 +0200
-
-utouch-grail (1.0.11-0ubuntu1) maverick; urgency=low
-
-  * New upstream release.
-    - LP: #624856
-
- -- Chase Douglas <[e-mail]>  Thu, 26 Aug 2010 15:16:10 -0400
-
-utouch-grail (1.0.10-0ubuntu1) maverick; urgency=low
-
-  [ Chase Douglas ]
-  * Add udeb for debian installer
-  * Update package descriptions
-
-  [ Henrik Rydberg ]
-  * New upstream release.
-  * Modified symbols file.
-  * Added break clause for geis and gevdev.
-  * Added newer dependency on mtdev.
-
-  [ Chase Douglas ]
-  * Upload package to Ubuntu
-    - LP: #623005
-
- -- Chase Douglas <[e-mail]>  Mon, 23 Aug 2010 16:57:54 -0400
-
-utouch-grail (1.0.8-0ubuntu3) maverick; urgency=low
-
-  * Add src/evbuf.h copyright to debian/copyright
-
- -- Chase Douglas <[e-mail]>  Fri, 13 Aug 2010 09:38:58 +0100
-
-utouch-grail (1.0.8-0ubuntu2) maverick; urgency=low
-
-  * Fix utouch-grail-tools install file
-
- -- Chase Douglas <[e-mail]>  Thu, 12 Aug 2010 17:46:41 +0100
-
-utouch-grail (1.0.8-0ubuntu1) maverick; urgency=low
-
-  * New upstream release.
-  * Update library names
-  * Close packaging bug (LP: #616897)
-
- -- Henrik Rydberg <[e-mail]>  Thu, 12 Aug 2010 17:25:03 +0100
-
-grail (1.0.7-0ubuntu1) maverick; urgency=low
-
-  * New upstream release.
-  * Update symbols file
-
- -- Henrik Rydberg <[e-mail]>  Wed, 11 Aug 2010 18:17:26 +0100
-
-grail (1.0.6-0ubuntu1) maverick; urgency=low
-
-  * New upstream release.
-
- -- Henrik Rydberg <[e-mail]>  Tue, 10 Aug 2010 19:15:37 +0100
-
-grail (1.0.5-0ubuntu1) maverick; urgency=low
-
-  * New upstream release.
-  * Update symbols file
-
- -- Henrik Rydberg <[e-mail]>  Tue, 10 Aug 2010 18:01:15 +0100
-
-grail (1.0.4-0ubuntu1) maverick; urgency=low
-
-  * New upstream release.
-  * Update symbols file
-
- -- Henrik Rydberg <[e-mail]>  Sun, 08 Aug 2010 13:13:22 +0200
-
-grail (1.0.3-0ubuntu1) maverick; urgency=low
-
-  * New upstream release.
-  * Update symbols file
-
- -- Chase Douglas <[e-mail]>  Fri, 06 Aug 2010 17:47:37 +0000
-
-grail (1.0.0-0ubuntu1) maverick; urgency=low
-
-  * Initial package
-
- -- Chase Douglas <[e-mail]>  Fri, 06 Aug 2010 16:26:37 +0000
+grail (2.0.1.1-0ubuntu1) UNRELEASED; urgency=low
+
+  * 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
+
+ -- Francis Ginther <[e-mail]>  Wed, 22 Aug 2012 13:02:46 -0500
+
 
=== modified file 'debian/control'
--- debian/control	2011-08-09 22:02:41 +0000
+++ debian/control	2012-08-22 19:30:25 +0000
@@ -1,4 +1,4 @@
-Source: utouch-grail
+Source: grail
 Section: libs
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
@@ -6,28 +6,29 @@
                pkg-config,
                cdbs,
                libmtdev-dev (>= 1.1),
-               libutouch-evemu-dev (>= 1.0),
-               libutouch-frame-dev (>= 1.0)
+               libevemu-dev,
+               libframe-dev
 Standards-Version: 3.9.2
 
-Package: libutouch-grail1
+Package: libgrail1
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
-Breaks: xserver-xorg-input-gevdev (<= 1:2.3.2-6ubuntu1),
-        libutouch-geis1 (<= 1.0.8)
+Breaks: xserver-xorg-input-gevdev (<= 1:2.3.2-6ubuntu1)
 Description: Gesture Recognition And Instantiation Library
  This library consists of an interface and tools for handling gesture
  recognition and gesture instantiation. Applications can use the grail
  callbacks to receive gesture primitives and raw input events from the
  underlying kernel device.
 
-Package: libutouch-grail-dev
+Package: libgrail-dev
 Section: libdevel
 Architecture: any
-Depends: libutouch-grail1 (= ${binary:Version}),
-         libutouch-frame-dev,
+Depends: libgrail1 (= ${binary:Version}),
+         libframe-dev,
          ${misc:Depends}
+Replaces: libutouch-grail-dev
+Conflicts: libutouch-grail-dev
 Description: Gesture Recognition And Instantiation Library - dev files
  This library consists of an interface and tools for handling gesture
  recognition and gesture instantiation. Applications can use the grail
@@ -36,12 +37,14 @@
  .
  This package contains files that are needed to build applications.
 
-Package: utouch-grail-tools
+Package: grail-tools
 Section: libdevel
 Architecture: any
-Depends: libutouch-grail1 (= ${binary:Version}),
+Depends: libgrail1 (= ${binary:Version}),
          ${shlibs:Depends},
          ${misc:Depends}
+Replaces: utouch-grail-tools
+Conflicts: utouch-grail-tools
 Description: Gesture Recognition And Instantiation Library - test tools
  This library consists of an interface and tools for handling gesture
  recognition and gesture instantiation. Applications can use the grail
@@ -50,12 +53,14 @@
  .
  This package provides some test tools for the grail library.
 
-Package: libutouch-grail1-udeb
+Package: libgrail1-udeb
 Section: debian-installer
 Architecture: any
 XC-Package-Type: udeb
 Depends: ${shlibs:Depends},
          ${misc:Depends}
+Replaces: libutouch-grail1-udeb
+Conflicts: libutouch-grail1-udeb
 Description: Gesture Recognition And Instantiation Library
  This library consists of an interface and tools for handling gesture
  recognition and gesture instantiation. Applications can use the grail
 
=== modified file 'debian/copyright'
--- debian/copyright	2010-08-13 08:38:54 +0000
+++ debian/copyright	2012-08-22 19:30:25 +0000
@@ -1,7 +1,7 @@
 Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=REVISION
-Name: utouch-grail
+Name: grail
 Maintainer: Henrik Rydberg <[e-mail]>
-Source: http://launchpad.net/utouch-grail
+Source: http://launchpad.net/grail
 
 Files: * (unless noted below)
 Copyright: 2010, Canonical Ltd.
 
=== renamed file 'debian/utouch-grail-tools.install' => 'debian/grail-tools.install'
=== renamed file 'debian/libutouch-grail-dev.install' => 'debian/libgrail-dev.install'
--- debian/libutouch-grail-dev.install	2010-08-12 16:15:57 +0000
+++ debian/libgrail-dev.install	2012-08-22 19:30:25 +0000
@@ -1,3 +1,3 @@
 usr/include
-usr/lib/libutouch-grail.so
+usr/lib/libgrail.so
 usr/lib/pkgconfig
 
=== renamed file 'debian/libutouch-grail1-udeb.install' => 'debian/libgrail1-udeb.install'
--- debian/libutouch-grail1-udeb.install	2010-08-19 15:04:08 +0000
+++ debian/libgrail1-udeb.install	2012-08-22 19:30:25 +0000
@@ -1,1 +1,1 @@
-usr/lib/libutouch-grail.so.1*
+usr/lib/libgrail.so.1*
 
=== renamed file 'debian/libutouch-grail1.install' => 'debian/libgrail1.install'
--- debian/libutouch-grail1.install	2010-08-12 16:15:57 +0000
+++ debian/libgrail1.install	2012-08-22 19:30:25 +0000
@@ -1,1 +1,1 @@
-usr/lib/libutouch-grail.so.1*
+usr/lib/libgrail.so.1*
 
=== renamed file 'debian/libutouch-grail1.symbols' => 'debian/libgrail1.symbols'
--- debian/libutouch-grail1.symbols	2011-06-16 17:36:34 +0000
+++ debian/libgrail1.symbols	2012-08-22 19:30:25 +0000
@@ -1,4 +1,4 @@
-libutouch-grail.so.1 libutouch-grail1 #MINVER#
+libgrail.so.1 libgrail1 #MINVER#
  grail_close@Base 1.0.4
  grail_delete@Base 2.0.0
  grail_filter_abs_events@Base 1.0.5
 
=== modified file 'debian/rules'
--- debian/rules	2011-04-12 18:49:24 +0000
+++ debian/rules	2012-08-22 19:30:25 +0000
@@ -6,7 +6,7 @@
 
 LDFLAGS += -Wl,-z,defs -Wl,--as-needed
 
-DEB_DH_MAKESHLIBS_ARGS_libutouch-grail1 = --add-udeb=libutouch-grail1-udeb
+DEB_DH_MAKESHLIBS_ARGS_libgrail1 = --add-udeb=libgrail1-udeb
 
 common-binary-post-install-arch::
 	find debian/tmp/usr/lib -name \*.la -exec rm {} \;
 
=== modified file 'debian/watch'
--- debian/watch	2010-08-12 16:15:57 +0000
+++ debian/watch	2012-08-22 19:30:25 +0000
@@ -1,2 +1,2 @@
 version=3
-https://launchpad.net/utouch-grail/+download http://launchpad.net/utouch-grail/.*/utouch-grail-(.+).tar.gz
+https://launchpad.net/grail/2.0.1 .*/2.0.1/.*/grail-(.+).tar.(?:bz2|gz)
 
=== renamed file 'utouch-grail.pc.in' => 'grail.pc.in'
--- utouch-grail.pc.in	2011-04-27 08:56:48 +0000
+++ grail.pc.in	2012-08-22 19:30:25 +0000
@@ -3,8 +3,8 @@
 libdir=@libdir@
 includedir=@includedir@
 
-Name: utouch-grail
+Name: grail
 Description: Gesture Recognition And Instantiation Library
 Version: @PACKAGE_VERSION@
 Cflags: -I${includedir}
-Libs: -L${libdir} -lutouch-grail
+Libs: -L${libdir} -lgrail
 
=== modified file 'include/grail.h'
--- include/grail.h	2011-06-16 17:28:51 +0000
+++ include/grail.h	2012-08-22 19:30:25 +0000
@@ -25,7 +25,7 @@
 #include <linux/input.h>
 #include <grail-bits.h>
 #include <grail-types.h>
-#include <utouch/frame.h>
+#include <oif/frame.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -50,7 +50,7 @@
 #define GRAIL_EXPECT_MASK	0x000f
 
 typedef float grail_prop_t;			/* gesture properties */
-typedef utouch_frame_time_t grail_time_t;	/* time in milliseconds */
+typedef oif_frame_time_t grail_time_t;	/* time in milliseconds */
 typedef struct grail *grail_handle;		/* the grail instance handle */
 
 /**
@@ -75,7 +75,7 @@
 	float x, y;
 };
 
-grail_handle GRAIL_PUBLIC grail_new_raw(utouch_frame_handle fh,
+grail_handle GRAIL_PUBLIC grail_new_raw(oif_frame_handle fh,
 					unsigned int num_frames,
 					void *select,
 					unsigned int version,
@@ -85,7 +85,7 @@
 
 /**
  * grail_new - allocate and initialize a new grail instance
- * @fh: utouch frame handle to use
+ * @fh: oif frame handle to use
  * @num_frames: number of frames in cyclic buffer
  * @select: client selection callback
  *
@@ -131,7 +131,7 @@
  * has grail scope.
  */
 const struct grail_frame GRAIL_PUBLIC *
-grail_pump_frame(grail_handle ge, const struct utouch_frame *frame);
+grail_pump_frame(grail_handle ge, const struct oif_frame *frame);
 
 /**
  * struct grail_client_id - Gesture client information
@@ -209,7 +209,7 @@
  */
 struct grail_frame {
 	const struct grail_frame *prev;
-	const struct utouch_frame *touch;
+	const struct oif_frame *touch;
 	unsigned int num_ongoing;
 	struct grail_element **ongoing;
 	struct grail_element **slots;
@@ -254,7 +254,7 @@
 	int slot;
 	int id;
 	int num_touches;
-	const struct utouch_contact **touches;
+	const struct oif_contact **touches;
 	grail_time_t start_time;
 	unsigned int expect_mask;
 	unsigned int active_mask;
@@ -444,7 +444,7 @@
  * The frame pointer is ABI agnostic, owned by the grail instance, and
  * has grail scope.
  */
-const struct utouch_frame GRAIL_PUBLIC *
+const struct oif_frame GRAIL_PUBLIC *
 grail_get_contact_frame(const struct grail *ge);
 
 #ifndef GRAIL_NO_LEGACY_API
 
=== modified file 'src/Makefile.am'
--- src/Makefile.am	2011-04-28 16:53:41 +0000
+++ src/Makefile.am	2012-08-22 19:30:25 +0000
@@ -1,13 +1,13 @@
-lib_LTLIBRARIES = libutouch-grail.la
+lib_LTLIBRARIES = libgrail.la
 
-libutouch_grail_la_LDFLAGS = \
+libgrail_la_LDFLAGS = \
 	-version-info @LIB_VERSION@ \
 	-lm \
 	$(MTDEV_LIBS) \
 	$(EVEMU_LIBS) \
 	$(FRAME_LIBS)
 
-libutouch_grail_la_SOURCES = \
+libgrail_la_SOURCES = \
 	evbuf.h \
 	gebuf.h \
 	grailbuf.h \
@@ -36,8 +36,8 @@
 
 INCLUDES = -I$(top_srcdir)/include/
 
-libutouch_grailincludedir = $(includedir)
-libutouch_grailinclude_HEADERS = \
+libgrailincludedir = $(includedir)
+libgrailinclude_HEADERS = \
 	$(top_srcdir)/include/grail-bits.h \
 	$(top_srcdir)/include/grail-types.h \
 	$(top_srcdir)/include/grail.h
 
=== modified file 'src/Makefile.in'
--- src/Makefile.in	2011-08-09 21:58:43 +0000
+++ src/Makefile.in	2012-08-22 19:30:25 +0000
@@ -36,7 +36,7 @@
 build_triplet = @build@
 host_triplet = @host@
 subdir = src
-DIST_COMMON = $(libutouch_grailinclude_HEADERS) $(srcdir)/Makefile.am \
+DIST_COMMON = $(libgrailinclude_HEADERS) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -68,18 +68,18 @@
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(libdir)" \
-	"$(DESTDIR)$(libutouch_grailincludedir)"
+	"$(DESTDIR)$(libgrailincludedir)"
 LTLIBRARIES = $(lib_LTLIBRARIES)
-libutouch_grail_la_LIBADD =
-am_libutouch_grail_la_OBJECTS = grail-bits.lo grail-inserter.lo \
+libgrail_la_LIBADD =
+am_libgrail_la_OBJECTS = grail-bits.lo grail-inserter.lo \
 	grail-gestures.lo gestures-touch.lo gestures-drag.lo \
 	gestures-pinch.lo gestures-rotate.lo gestures-tapping.lo \
 	grail-recognizer.lo grail-event.lo grail-api.lo \
 	grail-legacy.lo grail-init.lo grail-frame.lo
-libutouch_grail_la_OBJECTS = $(am_libutouch_grail_la_OBJECTS)
-libutouch_grail_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+libgrail_la_OBJECTS = $(am_libgrail_la_OBJECTS)
+libgrail_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(libutouch_grail_la_LDFLAGS) $(LDFLAGS) -o $@
+	$(libgrail_la_LDFLAGS) $(LDFLAGS) -o $@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/config-aux/depcomp
 am__depfiles_maybe = depfiles
@@ -93,9 +93,9 @@
 LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
-SOURCES = $(libutouch_grail_la_SOURCES)
-DIST_SOURCES = $(libutouch_grail_la_SOURCES)
-HEADERS = $(libutouch_grailinclude_HEADERS)
+SOURCES = $(libgrail_la_SOURCES)
+DIST_SOURCES = $(libgrail_la_SOURCES)
+HEADERS = $(libgrailinclude_HEADERS)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -227,15 +227,15 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-lib_LTLIBRARIES = libutouch-grail.la
-libutouch_grail_la_LDFLAGS = \
+lib_LTLIBRARIES = libgrail.la
+libgrail_la_LDFLAGS = \
 	-version-info @LIB_VERSION@ \
 	-lm \
 	$(MTDEV_LIBS) \
 	$(EVEMU_LIBS) \
 	$(FRAME_LIBS)
 
-libutouch_grail_la_SOURCES = \
+libgrail_la_SOURCES = \
 	evbuf.h \
 	gebuf.h \
 	grailbuf.h \
@@ -263,8 +263,8 @@
 # the build. -fvisibility requires GCC > 4 (or clang)
 AM_CFLAGS = $(CWARNFLAGS) -DBUILDING_GRAIL -fvisibility=hidden
 INCLUDES = -I$(top_srcdir)/include/
-libutouch_grailincludedir = $(includedir)
-libutouch_grailinclude_HEADERS = \
+libgrailincludedir = $(includedir)
+libgrailinclude_HEADERS = \
 	$(top_srcdir)/include/grail-bits.h \
 	$(top_srcdir)/include/grail-types.h \
 	$(top_srcdir)/include/grail.h
@@ -334,8 +334,8 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-libutouch-grail.la: $(libutouch_grail_la_OBJECTS) $(libutouch_grail_la_DEPENDENCIES) 
-	$(libutouch_grail_la_LINK) -rpath $(libdir) $(libutouch_grail_la_OBJECTS) $(libutouch_grail_la_LIBADD) $(LIBS)
+libgrail.la: $(libgrail_la_OBJECTS) $(libgrail_la_DEPENDENCIES) 
+	$(libgrail_la_LINK) -rpath $(libdir) $(libgrail_la_OBJECTS) $(libgrail_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -384,26 +384,26 @@
 
 clean-libtool:
 	-rm -rf .libs _libs
-install-libutouch_grailincludeHEADERS: $(libutouch_grailinclude_HEADERS)
+install-libgrailincludeHEADERS: $(libgrailinclude_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(libutouch_grailincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libutouch_grailincludedir)"
-	@list='$(libutouch_grailinclude_HEADERS)'; test -n "$(libutouch_grailincludedir)" || list=; \
+	test -z "$(libgrailincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libgrailincludedir)"
+	@list='$(libgrailinclude_HEADERS)'; test -n "$(libgrailincludedir)" || list=; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
 	done | $(am__base_list) | \
 	while read files; do \
-	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libutouch_grailincludedir)'"; \
-	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(libutouch_grailincludedir)" || exit $$?; \
+	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libgrailincludedir)'"; \
+	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(libgrailincludedir)" || exit $$?; \
 	done
 
-uninstall-libutouch_grailincludeHEADERS:
+uninstall-libgrailincludeHEADERS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(libutouch_grailinclude_HEADERS)'; test -n "$(libutouch_grailincludedir)" || list=; \
+	@list='$(libgrailinclude_HEADERS)'; test -n "$(libgrailincludedir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(libutouch_grailincludedir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(libutouch_grailincludedir)" && rm -f $$files
+	echo " ( cd '$(DESTDIR)$(libgrailincludedir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(libgrailincludedir)" && rm -f $$files
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -491,7 +491,7 @@
 check: check-am
 all-am: Makefile $(LTLIBRARIES) $(HEADERS)
 installdirs:
-	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libutouch_grailincludedir)"; do \
+	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libgrailincludedir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -542,7 +542,7 @@
 
 info-am:
 
-install-data-am: install-libutouch_grailincludeHEADERS
+install-data-am: install-libgrailincludeHEADERS
 
 install-dvi: install-dvi-am
 
@@ -589,7 +589,7 @@
 ps-am:
 
 uninstall-am: uninstall-libLTLIBRARIES \
-	uninstall-libutouch_grailincludeHEADERS
+	uninstall-libgrailincludeHEADERS
 
 .MAKE: install-am install-strip
 
@@ -600,14 +600,14 @@
 	install install-am install-data install-data-am install-dvi \
 	install-dvi-am install-exec install-exec-am install-html \
 	install-html-am install-info install-info-am \
-	install-libLTLIBRARIES install-libutouch_grailincludeHEADERS \
+	install-libLTLIBRARIES install-libgrailincludeHEADERS \
 	install-man install-pdf install-pdf-am install-ps \
 	install-ps-am install-strip installcheck installcheck-am \
 	installdirs maintainer-clean maintainer-clean-generic \
 	mostlyclean mostlyclean-compile mostlyclean-generic \
 	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
 	uninstall-am uninstall-libLTLIBRARIES \
-	uninstall-libutouch_grailincludeHEADERS
+	uninstall-libgrailincludeHEADERS
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 
=== modified file 'src/gebuf.h'
--- src/gebuf.h	2011-06-16 17:28:51 +0000
+++ src/gebuf.h	2012-08-22 19:30:25 +0000
@@ -30,7 +30,7 @@
 	int status;
 	int ntouch;
 	int nprop;
-	utouch_frame_time_t time;
+	oif_frame_time_t time;
 	struct grail_coord pos;
 	grail_prop_t prop[DIM_GRAIL_PROP];
 };
 
=== modified file 'src/gestures-drag.c'
--- src/gestures-drag.c	2011-06-16 17:28:51 +0000
+++ src/gestures-drag.c	2012-08-22 19:30:25 +0000
@@ -34,7 +34,7 @@
 
 static void set_props(const struct gesture_inserter *gin,
 		      struct combo_model *s, const struct move_model *m,
-		      const struct utouch_frame *frame)
+		      const struct oif_frame *frame)
 {
 	if (m->single) {
 		s->prop[GRAIL_PROP_DRAG_DX] = m->fm[FM_X].raw_delta;
@@ -54,7 +54,7 @@
 static const int fm_mask = 0x03;
 
 int gru_drag(struct grail *ge,
-	    const struct utouch_frame *frame)
+	    const struct oif_frame *frame)
 {
 	struct gesture_recognizer *gru = ge->gru;
 	struct combo_model *state = &gru->drag;
@@ -89,7 +89,7 @@
 }
 
 int gru_windrag(struct grail *ge,
-		const struct utouch_frame *frame)
+		const struct oif_frame *frame)
 {
 	struct gesture_recognizer *gru = ge->gru;
 	struct combo_model *state = &gru->windrag;
 
=== modified file 'src/gestures-pinch.c'
--- src/gestures-pinch.c	2011-06-16 17:28:51 +0000
+++ src/gestures-pinch.c	2012-08-22 19:30:25 +0000
@@ -37,7 +37,7 @@
 static void set_props(const struct gesture_inserter *gin,
 		      struct combo_model *s,
 		      const struct move_model *m,
-		      const struct utouch_frame *frame)
+		      const struct oif_frame *frame)
 {
 	s->prop[GRAIL_PROP_PINCH_DR] = m->fm[FM_R].action_delta;
 	s->prop[GRAIL_PROP_PINCH_VR] = m->fm[FM_R].velocity;
@@ -49,7 +49,7 @@
 }
 
 int gru_pinch(struct grail *ge,
-	      const struct utouch_frame *frame)
+	      const struct oif_frame *frame)
 {
 	struct gesture_recognizer *gru = ge->gru;
 	struct combo_model *state = &gru->pinch;
@@ -85,7 +85,7 @@
 }
 
 int gru_winpinch(struct grail *ge,
-		 const struct utouch_frame *frame)
+		 const struct oif_frame *frame)
 {
 	struct gesture_recognizer *gru = ge->gru;
 	struct combo_model *state = &gru->winpinch;
 
=== modified file 'src/gestures-rotate.c'
--- src/gestures-rotate.c	2011-06-16 17:28:51 +0000
+++ src/gestures-rotate.c	2012-08-22 19:30:25 +0000
@@ -36,7 +36,7 @@
 
 static void set_props(const struct gesture_inserter *gin,
 		      struct combo_model *s, const struct move_model *m,
-		      const struct utouch_frame *frame)
+		      const struct oif_frame *frame)
 {
 	s->prop[GRAIL_PROP_ROTATE_DA] = m->fm[FM_A].action_delta;
 	s->prop[GRAIL_PROP_ROTATE_VA] = m->fm[FM_A].velocity;
@@ -48,7 +48,7 @@
 }
 
 int gru_rotate(struct grail *ge,
-	       const struct utouch_frame *frame)
+	       const struct oif_frame *frame)
 {
 	struct gesture_recognizer *gru = ge->gru;
 	struct combo_model *state = &gru->rotate;
@@ -84,7 +84,7 @@
 }
 
 int gru_winrotate(struct grail *ge,
-		  const struct utouch_frame *frame)
+		  const struct oif_frame *frame)
 {
 	struct gesture_recognizer *gru = ge->gru;
 	struct combo_model *state = &gru->winrotate;
 
=== modified file 'src/gestures-tapping.c'
--- src/gestures-tapping.c	2011-06-16 17:28:51 +0000
+++ src/gestures-tapping.c	2012-08-22 19:30:25 +0000
@@ -26,7 +26,7 @@
 
 static void set_props(const struct gesture_inserter *gin,
 		      struct tapping_model *s, const struct move_model *m,
-		      const struct utouch_frame *frame)
+		      const struct oif_frame *frame)
 {
 	s->prop[GRAIL_PROP_TAP_DT] = m->time - s->start;
 	s->prop[GRAIL_PROP_TAP_X] = m->fm[FM_X].value;
@@ -36,7 +36,7 @@
 }
 
 int gru_tapping(struct grail *ge,
-		const struct utouch_frame *frame)
+		const struct oif_frame *frame)
 {
 	struct gesture_recognizer *gru = ge->gru;
 	struct tapping_model *state = &gru->tapping;
 
=== modified file 'src/gestures-touch.c'
--- src/gestures-touch.c	2011-04-04 17:27:38 +0000
+++ src/gestures-touch.c	2012-08-22 19:30:25 +0000
@@ -34,7 +34,7 @@
 };
 
 int gru_touch(struct grail *ge,
-	      const struct utouch_frame *frame)
+	      const struct oif_frame *frame)
 {
 	struct gesture_recognizer *gru = ge->gru;
 	struct combo_model *state = &gru->touch;
@@ -61,7 +61,7 @@
 }
 
 int gru_wintouch(struct grail *ge,
-		 const struct utouch_frame *frame)
+		 const struct oif_frame *frame)
 {
 	struct gesture_recognizer *gru = ge->gru;
 	struct combo_model *state = &gru->wintouch;
 
=== modified file 'src/grail-api.c'
--- src/grail-api.c	2011-06-16 17:28:51 +0000
+++ src/grail-api.c	2012-08-22 19:30:25 +0000
@@ -67,7 +67,7 @@
 		ret = evemu_extract(x->evemu, fd);
 	if (ret)
 		goto freemem;
-	if (!utouch_frame_is_supported_mtdev(x->evemu)) {
+	if (!oif_frame_is_supported_mtdev(x->evemu)) {
 		ret = -ENODEV;
 		goto freemem;
 	}
@@ -79,12 +79,12 @@
 			goto freemem;
 		}
 	}
-	x->fh = utouch_frame_new_engine(DIM_FRAMES, DIM_TOUCH, FRAME_RATE);
+	x->fh = oif_frame_new_engine(DIM_FRAMES, DIM_TOUCH, FRAME_RATE);
 	if (!x->fh) {
 		ret = -ENOMEM;
 		goto freedev;
 	}
-	ret = utouch_frame_init_mtdev(x->fh, x->evemu);
+	ret = oif_frame_init_mtdev(x->fh, x->evemu);
 	if (ret)
 		goto freeframe;
 
@@ -102,7 +102,7 @@
  freegin:
 	gin_destroy(ge);
  freeframe:
-	utouch_frame_delete_engine(x->fh);
+	oif_frame_delete_engine(x->fh);
  freedev:
 	if (x->mtdev)
 		mtdev_close_delete(x->mtdev);
@@ -120,7 +120,7 @@
 	struct grail_impl *x = ge->impl;
 	gru_destroy(ge);
 	gin_destroy(ge);
-	utouch_frame_delete_engine(x->fh);
+	oif_frame_delete_engine(x->fh);
 	if (x->mtdev)
 		mtdev_close_delete(x->mtdev);
 	evemu_delete(x->evemu);
@@ -143,14 +143,14 @@
 void GRAIL_PUBLIC grail_get_units(const struct grail *ge,
 				  struct grail_coord *min, struct grail_coord *max)
 {
-	struct utouch_surface *s = utouch_frame_get_surface(ge->impl->fh);
+	struct oif_surface *s = oif_frame_get_surface(ge->impl->fh);
 	min->x = s->min_x;
 	min->y = s->min_y;
 	max->x = s->max_x;
 	max->y = s->max_y;
 }
 
-const struct utouch_frame GRAIL_PUBLIC *
+const struct oif_frame GRAIL_PUBLIC *
 grail_get_contact_frame(const struct grail *ge)
 {
 	return ge->impl->touch;
@@ -215,7 +215,7 @@
 	}
 }
 
-static int gesture_timeout(struct grail *ge, const struct utouch_frame *frame)
+static int gesture_timeout(struct grail *ge, const struct oif_frame *frame)
 {
 	struct gesture_recognizer *gru = ge->gru;
 	struct gesture_inserter *gin = ge->gin;
@@ -225,7 +225,7 @@
 }
 
 static void report_frame(struct grail *ge,
-			 const struct utouch_frame *touch,
+			 const struct oif_frame *touch,
 			 const struct input_event *syn)
 {
 	struct grail_impl *impl = ge->impl;
@@ -255,12 +255,12 @@
 static void grail_pump_mtdev(struct grail *ge, const struct input_event *ev)
 {
 	struct grail_impl *impl = ge->impl;
-	const struct utouch_frame *frame;
+	const struct oif_frame *frame;
 
 	evbuf_put(&impl->evbuf, ev);
 
 	if (ev->type == EV_SYN || ev->type == EV_ABS || ev->type == EV_KEY) {
-		frame = utouch_frame_pump_mtdev(impl->fh, ev);
+		frame = oif_frame_pump_mtdev(impl->fh, ev);
 		if (frame)
 			report_frame(ge, frame, ev);
 	}
 
=== modified file 'src/grail-event.c'
--- src/grail-event.c	2011-06-16 17:28:51 +0000
+++ src/grail-event.c	2012-08-22 19:30:25 +0000
@@ -27,7 +27,7 @@
 #include <math.h>
 
 static void compute_bbox(struct grail_coord *min, struct grail_coord *max,
-			 const struct utouch_frame *frame)
+			 const struct oif_frame *frame)
 {
 	float x, y;
 	int i;
@@ -52,7 +52,7 @@
 }
 
 int gin_add_contact_props(const struct gesture_inserter *gin,
-			  grail_prop_t *prop, const struct utouch_frame *frame)
+			  grail_prop_t *prop, const struct oif_frame *frame)
 {
 	struct grail_coord min, max;
 	int i, n = 0, ntouch = frame->num_active;
@@ -66,7 +66,7 @@
 	prop[n++] = max.x;
 	prop[n++] = max.y;
 	for (i = 0; i < ntouch; i++) {
-		const struct utouch_contact *ct = frame->active[i];
+		const struct oif_contact *ct = frame->active[i];
 		prop[n++] = ct->id;
 		prop[n++] = ct->x;
 		prop[n++] = ct->y;
@@ -78,7 +78,7 @@
 		    struct grail_client_info *info, int maxinfo,
 		    const grail_mask_t* types, int btypes,
 		    const grail_mask_t* span, int bspan,
-		    const struct utouch_frame *frame)
+		    const struct oif_frame *frame)
 {
 	struct grail_coord pos[DIM_TOUCH];
 	int i, npos = 0;
@@ -94,7 +94,7 @@
 
 void gin_send_event(struct grail *ge, struct slot_state *s,
 		    const struct gesture_event *ev,
-		    const struct utouch_frame *frame)
+		    const struct oif_frame *frame)
 {
 	struct grail_impl *impl = ge->impl;
 	const struct gesture_inserter *gin = ge->gin;
 
=== modified file 'src/grail-frame.c'
--- src/grail-frame.c	2011-05-20 14:35:18 +0000
+++ src/grail-frame.c	2012-08-22 19:30:25 +0000
@@ -27,7 +27,7 @@
 static void set_center_velocity_and_radius(struct grail_impl *impl,
 					   struct grail_element *slot)
 {
-	const struct utouch_contact **tc = slot->touches;
+	const struct oif_contact **tc = slot->touches;
 	double x, y, vx, vy, r2, dx, dy;
 	int i;
 
@@ -98,7 +98,7 @@
 
 static void start_slot(struct grail_impl *impl,
 		       struct grail_element *slot,
-		       const struct utouch_frame *touch)
+		       const struct oif_frame *touch)
 {
 	float *T = slot->transform;
 
@@ -156,11 +156,11 @@
 
 static void set_slot_one(struct grail_impl *impl,
 			 struct grail_element *slot,
-			 const struct utouch_frame *touch,
-			 const struct utouch_contact *t1)
+			 const struct oif_frame *touch,
+			 const struct oif_contact *t1)
 {
 	const struct grail_element *pslot = slot->prev;
-	const struct utouch_contact *p1 = pslot->touches[0];
+	const struct oif_contact *p1 = pslot->touches[0];
 
 	if (!t1->active) {
 		stop_slot(impl, slot);
@@ -180,13 +180,13 @@
 
 static void set_slot_two(struct grail_impl *impl,
 			 struct grail_element *slot,
-			 const struct utouch_frame *touch,
-			 const struct utouch_contact *t1,
-			 const struct utouch_contact *t2)
+			 const struct oif_frame *touch,
+			 const struct oif_contact *t1,
+			 const struct oif_contact *t2)
 {
 	const struct grail_element *pslot = slot->prev;
-	const struct utouch_contact *p1 = pslot->touches[0];
-	const struct utouch_contact *p2 = pslot->touches[1];
+	const struct oif_contact *p1 = pslot->touches[0];
+	const struct oif_contact *p2 = pslot->touches[1];
 	double tx, ty, px, py, d2;
 
 	if (!t1->active || !t2->active) {
@@ -221,7 +221,7 @@
 static void set_slot_multi(struct grail_impl *impl,
 			   struct grail_element *slot,
 			   struct grail_frame *frame,
-			   const struct utouch_frame *touch)
+			   const struct oif_frame *touch)
 {
 	const struct grail_element *pslot = slot->prev;
 	struct grail_element **slots = frame->slots;
@@ -318,10 +318,10 @@
 
 static void set_slots(struct grail_impl *impl,
 		      struct grail_frame *frame,
-		      const struct utouch_frame *touch)
+		      const struct oif_frame *touch)
 {
 	struct grail_element **slots = frame->slots;
-	struct utouch_contact *const *tc = touch->slots;
+	struct oif_contact *const *tc = touch->slots;
 	int i, j, n = 0;
 
 	for (i = 0; i < impl->num_touches; i++)
@@ -336,9 +336,9 @@
 
 static void collect_transforms(struct grail_impl *impl,
 			       struct grail_frame *frame,
-			       const struct utouch_frame *touch)
+			       const struct oif_frame *touch)
 {
-	const struct utouch_surface *s = utouch_frame_get_surface(impl->fh);
+	const struct oif_surface *s = oif_frame_get_surface(impl->fh);
 	const struct grail_control *ctl = impl->ctl;
 	float d_x = ctl->bar_drag_x * (s->mapped_max_x - s->mapped_min_x);
 	float d_y = ctl->bar_drag_y * (s->mapped_max_y - s->mapped_min_y);
@@ -386,7 +386,7 @@
 }
 
 const struct grail_frame GRAIL_PUBLIC *
-grail_pump_frame(grail_handle ge, const struct utouch_frame *touch)
+grail_pump_frame(grail_handle ge, const struct oif_frame *touch)
 {
 	struct grail_impl *impl = ge->impl;
 	struct grail_frame *frame = impl->frames[impl->nextframe];
 
=== modified file 'src/grail-gestures.c'
--- src/grail-gestures.c	2011-08-09 21:58:43 +0000
+++ src/grail-gestures.c	2012-08-22 19:30:25 +0000
@@ -35,7 +35,7 @@
 static const float EPS = 1e-3;
 
 static void compute_position(float *x, float *y,
-			     const struct utouch_frame *frame)
+			     const struct oif_frame *frame)
 {
 	int i, n = frame->num_active;
 	*x = 0;
@@ -43,7 +43,7 @@
 	if (n < 1)
 		return;
 	for (i = 0; i < n; i++) {
-		const struct utouch_contact *t = frame->active[i];
+		const struct oif_contact *t = frame->active[i];
 		*x += t->x;
 		*y += t->y;
 	}
@@ -52,14 +52,14 @@
 }
 
 static float compute_radius(float x, float y,
-			    const struct utouch_frame *frame)
+			    const struct oif_frame *frame)
 {
 	int i, n = frame->num_active;
 	float r = 0, r2 = 0;
 	if (n < 2)
 		return r;
 	for (i = 0; i < n; i++) {
-		const struct utouch_contact *t = frame->active[i];
+		const struct oif_contact *t = frame->active[i];
 		float dx = t->x - x;
 		float dy = t->y - y;
 		r2 += dx * dx + dy * dy;
@@ -70,15 +70,15 @@
 }
 
 static float compute_rotation(float x, float y, float r,
-			      const struct utouch_frame *frame)
+			      const struct oif_frame *frame)
 {
 	int i, n = frame->num_active;
 	float da = 0, darc2 = 0;
 	if (n < 2)
 		return da;
 	for (i = 0; i < n; i++) {
-		const struct utouch_contact *t = frame->active[i];
-		const struct utouch_contact *ot = t->prev;
+		const struct oif_contact *t = frame->active[i];
+		const struct oif_contact *ot = t->prev;
 		float dx = t->x - x;
 		float dy = t->y - y;
 		float mx = t->x - ot->x;
@@ -137,7 +137,7 @@
 
 void gru_init_motion(struct grail *ge)
 {
-	struct utouch_surface *s = utouch_frame_get_surface(ge->impl->fh);
+	struct oif_surface *s = oif_frame_get_surface(ge->impl->fh);
 	struct gesture_recognizer *gru = ge->gru;
 	struct move_model *m = &gru->move;
 	float U[DIM_FM]; /* Device unit dimensions */
@@ -160,9 +160,9 @@
 }
 
 void gru_motion(struct grail *ge,
-		const struct utouch_frame *frame)
+		const struct oif_frame *frame)
 {
-	const struct utouch_surface *s = utouch_frame_get_surface(ge->impl->fh);
+	const struct oif_surface *s = oif_frame_get_surface(ge->impl->fh);
 	struct gesture_recognizer *gru = ge->gru;
 	struct move_model *m = &gru->move;
 	grail_time_t t = frame->time;
 
=== modified file 'src/grail-gestures.h'
--- src/grail-gestures.h	2011-06-16 17:28:51 +0000
+++ src/grail-gestures.h	2012-08-22 19:30:25 +0000
@@ -61,7 +61,7 @@
 
 void gru_init_motion(struct grail *ge);
 void gru_motion(struct grail *ge,
-		const struct utouch_frame *frame);
+		const struct oif_frame *frame);
 void gru_event(struct grail *ge, int gid,
 	       const struct move_model *move,
 	       const grail_prop_t *prop, int nprop);
@@ -77,13 +77,13 @@
 };
 
 int gru_touch(struct grail *ge,
-	      const struct utouch_frame *frame);
+	      const struct oif_frame *frame);
 int gru_drag(struct grail *ge,
-	     const struct utouch_frame *frame);
+	     const struct oif_frame *frame);
 int gru_pinch(struct grail *ge,
-	      const struct utouch_frame *frame);
+	      const struct oif_frame *frame);
 int gru_rotate(struct grail *ge,
-	       const struct utouch_frame *frame);
+	       const struct oif_frame *frame);
 
 static inline int out_of_bounds(const struct combo_model *s,
 				const struct move_model *m)
@@ -92,13 +92,13 @@
 }
 
 int gru_wintouch(struct grail *ge,
-		 const struct utouch_frame *frame);
+		 const struct oif_frame *frame);
 int gru_windrag(struct grail *ge,
-		const struct utouch_frame *frame);
+		const struct oif_frame *frame);
 int gru_winpinch(struct grail *ge,
-		 const struct utouch_frame *frame);
+		 const struct oif_frame *frame);
 int gru_winrotate(struct grail *ge,
-		  const struct utouch_frame *frame);
+		  const struct oif_frame *frame);
 
 struct tapping_model {
 	grail_time_t start;
@@ -109,7 +109,7 @@
 };
 
 int gru_tapping(struct grail *ge,
-		const struct utouch_frame *frame);
+		const struct oif_frame *frame);
 
 #endif
 
 
=== modified file 'src/grail-impl.h'
--- src/grail-impl.h	2011-06-16 17:28:51 +0000
+++ src/grail-impl.h	2012-08-22 19:30:25 +0000
@@ -26,7 +26,7 @@
 #define GRAIL_NO_LEGACY_API
 
 #include <grail.h>
-#include <utouch/frame-mtdev.h>
+#include <oif/frame-mtdev.h>
 #include "evbuf.h"
 #include "grailbuf.h"
 
@@ -49,7 +49,7 @@
 }
 
 int create_grail2(struct grail_impl *x,
-		  utouch_frame_handle fh,
+		  oif_frame_handle fh,
 		  unsigned int num_frames,
 		  void *select,
 		  unsigned int version,
@@ -62,8 +62,8 @@
 struct grail_impl {
 	struct evemu_device *evemu;
 	struct mtdev *mtdev;
-	utouch_frame_handle fh;
-	const struct utouch_frame *touch;
+	oif_frame_handle fh;
+	const struct oif_frame *touch;
 	struct evbuf evbuf;
 	struct grailbuf gbuf;
 	int filter_abs;
 
=== modified file 'src/grail-init.c'
--- src/grail-init.c	2011-05-18 16:38:44 +0000
+++ src/grail-init.c	2012-08-22 19:30:25 +0000
@@ -147,7 +147,7 @@
 }
 
 int create_grail2(struct grail_impl *x,
-		  utouch_frame_handle fh,
+		  oif_frame_handle fh,
 		  unsigned int num_frames,
 		  grail_select_callback select,
 		  unsigned int version,
@@ -155,8 +155,8 @@
 		  unsigned int frame_size,
 		  unsigned int slot_size)
 {
-	struct utouch_surface *s = utouch_frame_get_surface(fh);
-	unsigned int ntouch = utouch_frame_get_num_slots(fh);
+	struct oif_surface *s = oif_frame_get_surface(fh);
+	unsigned int ntouch = oif_frame_get_num_slots(fh);
 	unsigned int nslot = get_slot_count(ntouch);
 	int i, j;
 
@@ -194,7 +194,7 @@
 	free(x->ctl);
 }
 
-grail_handle GRAIL_PUBLIC grail_new_raw(utouch_frame_handle fh,
+grail_handle GRAIL_PUBLIC grail_new_raw(oif_frame_handle fh,
 					unsigned int num_frames,
 					grail_select_callback select,
 					unsigned int version,
 
=== modified file 'src/grail-inserter.c'
--- src/grail-inserter.c	2011-06-16 17:28:51 +0000
+++ src/grail-inserter.c	2012-08-22 19:30:25 +0000
@@ -52,7 +52,7 @@
 
 // todo: spanning tree for multi-user case
 static void setup_new_gestures(struct grail *ge,
-			       const struct utouch_frame *frame)
+			       const struct oif_frame *frame)
 {
 	struct gesture_inserter *gin = ge->gin;
 	grail_mask_t types[DIM_GRAIL_TYPE_BYTES];
@@ -114,7 +114,7 @@
 	ge->gin = NULL;
 }
 
-void gin_frame_begin(struct grail *ge, const struct utouch_frame *frame)
+void gin_frame_begin(struct grail *ge, const struct oif_frame *frame)
 {
 	struct gesture_inserter *gin = ge->gin;
 	memset(gin->types, 0, sizeof(gin->types));
@@ -123,7 +123,7 @@
 		gin->grab_active = 0;
 }
 
-void gin_frame_end(struct grail *ge, const struct utouch_frame *frame)
+void gin_frame_end(struct grail *ge, const struct oif_frame *frame)
 {
 	struct gesture_inserter *gin = ge->gin;
 	grail_mask_t keep[DIM_TOUCH_BYTES];
@@ -186,7 +186,7 @@
 }
 
 int gin_gid_begin(struct grail *ge, int type, int priority,
-		  const struct utouch_frame *frame)
+		  const struct oif_frame *frame)
 {
 	struct gesture_inserter *gin = ge->gin;
 	struct slot_state *s;
@@ -292,7 +292,7 @@
 				 const struct grail_coord *tmin,
 				 const struct grail_coord *tmax)
 {
-	struct utouch_surface *s = utouch_frame_get_surface(ge->impl->fh);
+	struct oif_surface *s = oif_frame_get_surface(ge->impl->fh);
 
 	s->mapped_min_x = tmin->x;
 	s->mapped_min_y = tmin->y;
 
=== modified file 'src/grail-inserter.h'
--- src/grail-inserter.h	2011-06-16 17:28:51 +0000
+++ src/grail-inserter.h	2012-08-22 19:30:25 +0000
@@ -60,25 +60,25 @@
 };
 
 int gin_add_contact_props(const struct gesture_inserter *gin,
-			  grail_prop_t *prop, const struct utouch_frame *frame);
+			  grail_prop_t *prop, const struct oif_frame *frame);
 
 int gin_get_clients(struct grail *ge,
 		    struct grail_client_info *info, int maxinfo,
 		    const grail_mask_t* types, int btypes,
 		    const grail_mask_t* span, int bspan,
-		    const struct utouch_frame *frame);
+		    const struct oif_frame *frame);
 void gin_send_event(struct grail *ge, struct slot_state *s,
 		    const struct gesture_event *ev,
-		    const struct utouch_frame *frame);
+		    const struct oif_frame *frame);
 
 int gin_init(struct grail *ge);
 void gin_destroy(struct grail *ge);
 
-void gin_frame_begin(struct grail *ge, const struct utouch_frame *frame);
-void gin_frame_end(struct grail *ge, const struct utouch_frame *frame);
+void gin_frame_begin(struct grail *ge, const struct oif_frame *frame);
+void gin_frame_end(struct grail *ge, const struct oif_frame *frame);
 
 int gin_gid_begin(struct grail *ge, int type, int priority,
-		  const struct utouch_frame *frame);
+		  const struct oif_frame *frame);
 void gin_gid_discard(struct grail *ge, int gid);
 void gin_gid_timeout(struct grail *ge, int gid);
 
 
=== modified file 'src/grail-legacy.c'
--- src/grail-legacy.c	2011-04-28 16:53:57 +0000
+++ src/grail-legacy.c	2012-08-22 19:30:25 +0000
@@ -41,13 +41,13 @@
 				    struct grail_contact *touch, int max_touch)
 {
 	const struct gesture_inserter *gin = ge->gin;
-	const struct utouch_frame *frame = ge->impl->touch;
+	const struct oif_frame *frame = ge->impl->touch;
 	int i;
 	if (frame->num_active < max_touch)
 		max_touch = frame->num_active;
 	for (i = 0; i < max_touch; i++) {
 		struct grail_contact *t = &touch[i];
-		const struct utouch_contact *ct = frame->active[i];
+		const struct oif_contact *ct = frame->active[i];
 		t->id = ct->id;
 		t->tool_type = ct->tool_type;
 		t->pos.x = ct->x;
 
=== modified file 'src/grail-recognizer.c'
--- src/grail-recognizer.c	2011-06-16 17:28:51 +0000
+++ src/grail-recognizer.c	2012-08-22 19:30:25 +0000
@@ -41,7 +41,7 @@
 	ge->gru = NULL;
 }
 
-void gru_recognize(struct grail *ge, const struct utouch_frame *frame)
+void gru_recognize(struct grail *ge, const struct oif_frame *frame)
 {
 	if (!ge->gin || !ge->gru)
 		return;
 
=== modified file 'src/grail-recognizer.h'
--- src/grail-recognizer.h	2011-06-16 17:28:51 +0000
+++ src/grail-recognizer.h	2012-08-22 19:30:25 +0000
@@ -38,7 +38,7 @@
 };
 
 int gru_init(struct grail *ge);
-void gru_recognize(struct grail *ge, const struct utouch_frame *frame);
+void gru_recognize(struct grail *ge, const struct oif_frame *frame);
 void gru_destroy(struct grail *ge);
 
 #endif
 
=== modified file 'test/Makefile.am'
--- test/Makefile.am	2011-04-28 16:53:46 +0000
+++ test/Makefile.am	2012-08-22 19:30:25 +0000
@@ -23,6 +23,6 @@
 # internal symbols.
 #
 check_grail_LDADD = \
-	$(top_builddir)/src/.libs/libutouch-grail.a \
+	$(top_builddir)/src/.libs/libgrail.a \
 	$(CHECK_LIBS) \
-	-lutouch-frame -lutouch-evemu -lmtdev -lm
+	-lframe -levemu -lmtdev -lm
 
=== modified file 'test/Makefile.in'
--- test/Makefile.in	2011-08-09 21:58:43 +0000
+++ test/Makefile.in	2012-08-22 19:30:25 +0000
@@ -53,8 +53,7 @@
 	check_grail-check-grail.$(OBJEXT)
 check_grail_OBJECTS = $(am_check_grail_OBJECTS)
 am__DEPENDENCIES_1 =
-check_grail_DEPENDENCIES =  \
-	$(top_builddir)/src/.libs/libutouch-grail.a \
+check_grail_DEPENDENCIES = $(top_builddir)/src/.libs/libgrail.a \
 	$(am__DEPENDENCIES_1)
 check_grail_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(check_grail_CFLAGS) \
@@ -226,9 +225,9 @@
 # internal symbols.
 #
 check_grail_LDADD = \
-	$(top_builddir)/src/.libs/libutouch-grail.a \
+	$(top_builddir)/src/.libs/libgrail.a \
 	$(CHECK_LIBS) \
-	-lutouch-frame -lutouch-evemu -lmtdev -lm
+	-lframe -levemu -lmtdev -lm
 
 all: all-am
 
 
=== modified file 'test/check-transform.c'
--- test/check-transform.c	2011-04-28 16:53:46 +0000
+++ test/check-transform.c	2012-08-22 19:30:25 +0000
@@ -1,5 +1,5 @@
 #include <check.h>
-#include <utouch/frame-mtdev.h>
+#include <oif/frame-mtdev.h>
 #include <grail.h>
 #include <string.h>
 #include <stdio.h>
@@ -11,7 +11,7 @@
 
 struct test_data {
 	struct evemu_device *evemu;
-	utouch_frame_handle fh;
+	oif_frame_handle fh;
 	grail_handle ge;
 	FILE *fp;
 	struct timeval evtime;
@@ -36,8 +36,8 @@
 	if (!data->evemu || evemu_read(data->evemu, data->fp) <= 0)
 		return -1;
 
-	data->fh = utouch_frame_new_engine(100, 32, 100);
-	if (!data->fh || utouch_frame_init_mtdev(data->fh, data->evemu))
+	data->fh = oif_frame_new_engine(100, 32, 100);
+	if (!data->fh || oif_frame_init_mtdev(data->fh, data->evemu))
 		return -1;
 
 	data->ge = grail_new(data->fh, 10, 0);
@@ -50,7 +50,7 @@
 static void term_test_data(struct test_data *data)
 {
 	grail_delete(data->ge);
-	utouch_frame_delete_engine(data->fh);
+	oif_frame_delete_engine(data->fh);
 	evemu_delete(data->evemu);
 	fclose(data->fp);
 }
@@ -63,10 +63,10 @@
 static const struct grail_element *get_element(struct test_data *data,
 					       const struct input_event *ev)
 {
-	const struct utouch_frame *touch;
+	const struct oif_frame *touch;
 	const struct grail_frame *frame;
 
-	touch = utouch_frame_pump_mtdev(data->fh, ev);
+	touch = oif_frame_pump_mtdev(data->fh, ev);
 	if (!touch)
 		return 0;
 	frame = grail_pump_frame(data->ge, touch);
 
=== modified file 'tools/Makefile.am'
--- tools/Makefile.am	2011-04-28 16:53:53 +0000
+++ tools/Makefile.am	2012-08-22 19:30:25 +0000
@@ -11,5 +11,5 @@
 AM_CFLAGS = $(X11_CFLAGS) $(XINPUT_CFLAGS)
 
 AM_LDFLAGS = -L$(top_builddir)/src/.libs/ \
-	-lutouch-grail -lutouch-frame -lutouch-evemu -lmtdev \
+	-lgrail -lframe -levemu -lmtdev \
 	$(X11_LIBS) $(XINPUT_LIBS) -lm
 
=== modified file 'tools/Makefile.in'
--- tools/Makefile.in	2011-08-09 21:58:43 +0000
+++ tools/Makefile.in	2012-08-22 19:30:25 +0000
@@ -208,7 +208,7 @@
 INCLUDES = -I$(top_srcdir)/include/
 AM_CFLAGS = $(X11_CFLAGS) $(XINPUT_CFLAGS)
 AM_LDFLAGS = -L$(top_builddir)/src/.libs/ \
-	-lutouch-grail -lutouch-frame -lutouch-evemu -lmtdev \
+	-lgrail -lframe -levemu -lmtdev \
 	$(X11_LIBS) $(XINPUT_LIBS) -lm
 
 all: all-am
 
=== modified file 'tools/grail-test-mtdev.c'
--- tools/grail-test-mtdev.c	2011-05-18 16:38:44 +0000
+++ tools/grail-test-mtdev.c	2012-08-22 19:30:25 +0000
@@ -21,7 +21,7 @@
 
 #define MTDEV_NO_LEGACY_API
 
-#include <utouch/frame-mtdev.h>
+#include <oif/frame-mtdev.h>
 #include <grail.h>
 #include <string.h>
 #include <stdio.h>
@@ -32,7 +32,7 @@
 struct frame_test {
 	struct evemu_device *evemu;
 	struct mtdev *mtdev;
-	utouch_frame_handle fh;
+	oif_frame_handle fh;
 	grail_handle ge;
 };
 
@@ -57,10 +57,10 @@
 
 static int init_frame(struct frame_test *test, int fd)
 {
-	test->fh = utouch_frame_new_engine(100, 32, 100);
+	test->fh = oif_frame_new_engine(100, 32, 100);
 	if (!test->fh)
 		return -1;
-	return utouch_frame_init_mtdev(test->fh, test->evemu);
+	return oif_frame_init_mtdev(test->fh, test->evemu);
 }
 
 static int init_grail(struct frame_test *test)
@@ -77,7 +77,7 @@
 static void destroy_all(struct frame_test *test)
 {
 	grail_delete(test->ge);
-	utouch_frame_delete_engine(test->fh);
+	oif_frame_delete_engine(test->fh);
 	if (test->mtdev)
 		mtdev_close_delete(test->mtdev);
 	evemu_delete(test->evemu);
@@ -85,7 +85,7 @@
 }
 
 static void report_frame(grail_handle ge,
-			 const struct utouch_frame *touch)
+			 const struct oif_frame *touch)
 {
 	const struct grail_frame *frame = grail_pump_frame(ge, touch);
 	int i;
@@ -131,21 +131,21 @@
 
 static void loop_device(struct frame_test *test, FILE *fp, int fd)
 {
-	const struct utouch_frame *frame;
+	const struct oif_frame *frame;
 	struct input_event ev;
 
 	if (fp) {
 		struct timeval evtime;
 		memset(&evtime, 0, sizeof(evtime));
 		while (evemu_read_event_realtime(fp, &ev, &evtime) > 0) {
-			frame = utouch_frame_pump_mtdev(test->fh, &ev);
+			frame = oif_frame_pump_mtdev(test->fh, &ev);
 			if (frame)
 				report_frame(test->ge, frame);
 		}
 	} else {
 		while (!mtdev_idle(test->mtdev, fd, 5000)) {
 			while (mtdev_get(test->mtdev, fd, &ev, 1) > 0) {
-				frame = utouch_frame_pump_mtdev(test->fh, &ev);
+				frame = oif_frame_pump_mtdev(test->fh, &ev);
 				if (frame)
 					report_frame(test->ge, frame);
 			}
@@ -155,7 +155,7 @@
 
 static void report_device_caps(struct frame_test *test)
 {
-	const struct utouch_surface *s = utouch_frame_get_surface(test->fh);
+	const struct oif_surface *s = oif_frame_get_surface(test->fh);
 
 	fprintf(stderr, "device props:\n");
 	if (s->needs_pointer)
@@ -183,9 +183,9 @@
 		fprintf(stderr, "\tdistance\n");
 
 	fprintf(stderr, "touch frames: %d\n",
-		utouch_frame_get_num_frames(test->fh));
+		oif_frame_get_num_frames(test->fh));
 	fprintf(stderr, "touch slots: %d\n",
-		utouch_frame_get_num_slots(test->fh));
+		oif_frame_get_num_slots(test->fh));
 }
 
 int main(int argc, char *argv[])
@@ -223,7 +223,7 @@
 		fprintf(stderr, "error: could not describe device\n");
 		return -1;
 	}
-	if (!utouch_frame_is_supported_mtdev(test.evemu)) {
+	if (!oif_frame_is_supported_mtdev(test.evemu)) {
 		fprintf(stderr, "error: unsupported device\n");
 		return -1;
 	}
 
=== modified file 'tools/grail-transform.c'
--- tools/grail-transform.c	2011-05-24 08:16:15 +0000
+++ tools/grail-transform.c	2012-08-22 19:30:25 +0000
@@ -21,8 +21,8 @@
 
 #include "config.h"
 #include <evemu.h>
-#include <utouch/frame-mtdev.h>
-#include <utouch/frame-xi2.h>
+#include <oif/frame-mtdev.h>
+#include <oif/frame-xi2.h>
 #include <grail.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -37,7 +37,7 @@
 	int fd;
 	struct evemu_device *evemu;
 	struct mtdev *mtdev;
-	utouch_frame_handle fh;
+	oif_frame_handle fh;
 	struct grail *ge;
 
 	struct grail_coord pos[4];
@@ -59,7 +59,7 @@
 
 static void clear_screen(struct appdata *w)
 {
-	const struct utouch_surface *s = utouch_frame_get_surface(w->fh);
+	const struct oif_surface *s = oif_frame_get_surface(w->fh);
 	int width = s->mapped_max_x - s->mapped_min_x;
 	int height = s->mapped_max_y - s->mapped_min_y;
 	int i;
@@ -80,7 +80,7 @@
 static void draw_object(struct appdata *w)
 {
 	static const double frac = 0.04;
-	const struct utouch_surface *s = utouch_frame_get_surface(w->fh);
+	const struct oif_surface *s = oif_frame_get_surface(w->fh);
 	double d = frac * (s->mapped_max_x - s->mapped_min_x);
 	int i;
 
@@ -105,7 +105,7 @@
 }
 
 static void report_frame(struct appdata *w,
-			 const struct utouch_frame *touch)
+			 const struct oif_frame *touch)
 {
 	const struct grail_frame *frame;
 	const struct grail_element *slot;
@@ -201,7 +201,7 @@
 
 static void set_screen_size_mtdev(struct appdata *w, XEvent *xev)
 {
-	struct utouch_surface *s = utouch_frame_get_surface(w->fh);
+	struct oif_surface *s = oif_frame_get_surface(w->fh);
 	XConfigureEvent *cev = (XConfigureEvent *)xev;
 
 	s->mapped_min_x = 0;
@@ -218,7 +218,7 @@
 
 static void loop_device_mtdev(struct appdata *w)
 {
-	const struct utouch_frame *tf;
+	const struct oif_frame *tf;
 	struct input_event iev;
 	XEvent xev;
 
@@ -230,7 +230,7 @@
 	while (1) {
 		while (!mtdev_idle(w->mtdev, w->fd, 100)) {
 			while (mtdev_get(w->mtdev, w->fd, &iev, 1) > 0) {
-				tf = utouch_frame_pump_mtdev(w->fh, &iev);
+				tf = oif_frame_pump_mtdev(w->fh, &iev);
 				report_frame(w, tf);
 			}
 		}
@@ -261,10 +261,10 @@
 	w->mtdev = mtdev_new_open(w->fd);
 	if (!w->mtdev)
 		return -1;
-	w->fh = utouch_frame_new_engine(500, 32, 100);
+	w->fh = oif_frame_new_engine(500, 32, 100);
 	if (!w->fh)
 		return -1;
-	if (utouch_frame_init_mtdev(w->fh, w->evemu))
+	if (oif_frame_init_mtdev(w->fh, w->evemu))
 		return -1;
 	w->ge = grail_new(w->fh, 100, 0);
 	if (!w->ge)
@@ -278,7 +278,7 @@
 	loop_device_mtdev(w);
 
 	grail_delete(w->ge);
-	utouch_frame_delete_engine(w->fh);
+	oif_frame_delete_engine(w->fh);
 	mtdev_close_delete(w->mtdev);
 	evemu_delete(w->evemu);
 
@@ -322,7 +322,7 @@
 
 static void loop_device_xi2(struct appdata *w, int id)
 {
-	const struct utouch_frame *tf;
+	const struct oif_frame *tf;
 	XIEventMask mask;
 
 	mask.deviceid = id;
@@ -346,7 +346,7 @@
 		if (XGetEventData(w->dsp, cookie) &&
 		    cookie->type == GenericEvent &&
 		    cookie->extension == w->opcode) {
-			tf = utouch_frame_pump_xi2(w->fh, cookie->data);
+			tf = oif_frame_pump_xi2(w->fh, cookie->data);
 			report_frame(w, tf);
 		}
 		XFreeEventData(w->dsp, cookie);
@@ -373,10 +373,10 @@
 	if (!dev)
 		return -1;
 
-	w->fh = utouch_frame_new_engine(500, 32, 100);
+	w->fh = oif_frame_new_engine(500, 32, 100);
 	if (!w->fh)
 		return -1;
-	if (utouch_frame_init_xi2(w->fh, w->dsp, dev))
+	if (oif_frame_init_xi2(w->fh, w->dsp, dev))
 		return -1;
 	w->ge = grail_new(w->fh, 100, 0);
 	if (!w->ge)
@@ -385,7 +385,7 @@
 	loop_device_xi2(w, id);
 
 	grail_delete(w->ge);
-	utouch_frame_delete_engine(w->fh);
+	oif_frame_delete_engine(w->fh);
 
 	XIFreeDeviceInfo(info);