xserver-xorg-input-evdev: Changes to 'ubuntu-oneiric'

[Chase Douglas <corp186-guest@alioth.debian.org>]

 debian/changelog                  |    6 ++++++
 debian/control                    |    4 +---
 debian/patches/101-gestures.patch |    4 ++--
 3 files changed, 9 insertions(+), 5 deletions(-)

New commits:
commit 0948625b2bcef8c136647b1a74bc311da88b0fcc
Author: Chase Douglas <chase.douglas@canonical.com>
Date:   Wed Sep 5 22:27:29 2012 +0000

    releasing version 1:2.6.0-1ubuntu13.1

diff --git a/debian/changelog b/debian/changelog
index cefae9e..f7e149f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xserver-xorg-input-evdev (1:2.6.0-1ubuntu13.1) UNRELEASED; urgency=low
+xserver-xorg-input-evdev (1:2.6.0-1ubuntu13.1) oneiric-proposed; urgency=low
 
   * Update dependency for Open Input Framework rename (LP: #1046592)
 
- -- Chase Douglas <chase.douglas@ubuntu.com>  Wed, 05 Sep 2012 22:22:30 +0000
+ -- Chase Douglas <chase.douglas@ubuntu.com>  Wed, 05 Sep 2012 22:27:13 +0000
 
 xserver-xorg-input-evdev (1:2.6.0-1ubuntu13) oneiric; urgency=low
 

commit 62fbab228f011ac2302ee46b077197b57afba2f6
Author: Chase Douglas <chase.douglas@canonical.com>
Date:   Wed Sep 5 22:27:08 2012 +0000

    Update dependency for Open Input Framework rename (LP: #1046592)

diff --git a/debian/changelog b/debian/changelog
index fc80b48..cefae9e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-evdev (1:2.6.0-1ubuntu13.1) UNRELEASED; urgency=low
+
+  * Update dependency for Open Input Framework rename (LP: #1046592)
+
+ -- Chase Douglas <chase.douglas@ubuntu.com>  Wed, 05 Sep 2012 22:22:30 +0000
+
 xserver-xorg-input-evdev (1:2.6.0-1ubuntu13) oneiric; urgency=low
 
   * 11-evdev-trackpoint.conf: Add a config snippet for enabling wheel
diff --git a/debian/control b/debian/control
index c4edbd9..2438cc2 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Build-Depends:
  automake,
  libtool,
  xutils-dev (>= 1:7.5+4),
- libutouch-grail-dev (>= 1.0.10),
+ libgrail-dev,
  libmtdev-dev
 Standards-Version: 3.8.4
 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-evdev
@@ -27,7 +27,6 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-evdev.g
 Package: xserver-xorg-input-evdev
 Architecture: linux-any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${xinpdriver:Depends},
- libutouch-grail1 (>= 1.0.19),
  xserver-xorg-core (>= 2:1.9.99.902-2ubuntu1)
 Provides: ${xinpdriver:Provides}
 Replaces: xserver-xorg (<< 6.8.2-35), xserver-xorg-input-gevdev
@@ -48,7 +47,6 @@ Section: debian-installer
 Architecture: linux-any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends},
  udev-udeb [linux-any],
- libutouch-grail1-udeb (>= 1.0.19),
  xserver-xorg-core-udeb (>= 2:1.9.99.902-2ubuntu1)
 Provides: ${xinpdriver:Provides}
 Description: X.Org X server -- evdev input driver
diff --git a/debian/patches/101-gestures.patch b/debian/patches/101-gestures.patch
index fd55d1a..e204af8 100644
--- a/debian/patches/101-gestures.patch
+++ b/debian/patches/101-gestures.patch
@@ -4,8 +4,8 @@
  AC_ARG_WITH([sdkdir], [], [sdkdir="$withval"])
  AC_SUBST([sdkdir])
  
-+AC_ARG_ENABLE(utouch-grail, AS_HELP_STRING([--enable-utouch-grail], [Build with utouch-grail gesture support (default: auto)]), [GRAIL=$enableval], [GRAIL=auto])
-+PKG_CHECK_MODULES(GRAIL, utouch-grail, [have_grail=yes], [have_grail=no])
++AC_ARG_ENABLE(grail, AS_HELP_STRING([--enable-grail], [Build with grail gesture support (default: auto)]), [GRAIL=$enableval], [GRAIL=auto])
++PKG_CHECK_MODULES(GRAIL, grail, [have_grail=yes], [have_grail=no])
 +if test "x$GRAIL" = xauto; then
 +        GRAIL="$have_grail"
 +fi