diff -u xf86-input-evtouch-0.8.8/debian/changelog xf86-input-evtouch-0.8.8/debian/changelog
--- xf86-input-evtouch-0.8.8/debian/changelog
+++ xf86-input-evtouch-0.8.8/debian/changelog
@@ -1,3 +1,9 @@
+xf86-input-evtouch (0.8.8-0ubuntu3) jaunty; urgency=low
+
+  * 21_more_calibration_fixups.patch: Make calibration work on xserver-1.6
+
+ -- Thomas Jaeger <ThJaeger@gmail.com>  Sun, 22 Mar 2009 20:58:58 -0400
+
 xf86-input-evtouch (0.8.8-0ubuntu2) jaunty; urgency=low
 
   * install fdi files to /usr/share/hal/fdi/policy/20thirdparty so we make
diff -u xf86-input-evtouch-0.8.8/debian/patches/series xf86-input-evtouch-0.8.8/debian/patches/series
--- xf86-input-evtouch-0.8.8/debian/patches/series
+++ xf86-input-evtouch-0.8.8/debian/patches/series
@@ -10,0 +11 @@
+21_more_calibration_fixups.patch
only in patch2:
unchanged:
--- xf86-input-evtouch-0.8.8.orig/debian/patches/21_more_calibration_fixups.patch
+++ xf86-input-evtouch-0.8.8/debian/patches/21_more_calibration_fixups.patch
@@ -0,0 +1,33 @@
+diff -u xf86-input-evtouch-0.8.8/evtouch.c xf86-input-evtouch-0.8.8/evtouch.c
+--- xf86-input-evtouch-0.8.8/evtouch.c
++++ xf86-input-evtouch-0.8.8/evtouch.c
+@@ -305,7 +305,7 @@
+ 	}
+ 
+         if (pos_changed == 1) {
+-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 2
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 2
+                 ConvertProc(priv->local, 0, 2, 
+                             priv->raw_x, priv->raw_y,
+                             0, 0, 0, 0, 
+@@ -369,7 +369,7 @@
+                         priv->raw_y = priv->min_y;
+         }
+ 
+-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 2
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 2
+         ConvertProc(priv->local, 0, 2,
+                     priv->raw_x, priv->raw_y,
+                     0, 0, 0, 0,
+diff -u xf86-input-evtouch-0.8.8/debian/changelog xf86-input-evtouch-0.8.8/debian/changelog
+--- xf86-input-evtouch-0.8.8.orig/ev_calibrate.c
++++ xf86-input-evtouch-0.8.8/ev_calibrate.c
+@@ -218,7 +218,7 @@
+         int cap_style = CapButt;        /* style of the line's edje and */
+         int join_style = JoinBevel;        /*  joined lines.                */
+ 
+-        int event_mask = ExposureMask | ButtonReleaseMask | PointerMotionMask | KeyPressMask;
++        int event_mask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask | KeyPressMask;
+ 
+         int depth;
+         int screen_num;