diff -u xf86-input-evtouch-0.8.7/debian/changelog xf86-input-evtouch-0.8.7/debian/changelog
--- xf86-input-evtouch-0.8.7/debian/changelog
+++ xf86-input-evtouch-0.8.7/debian/changelog
@@ -1,3 +1,13 @@
+xf86-input-evtouch (0.8.7-3ubuntu1) hardy; urgency=low
+
+  * Merge from debian unstable, remaining changes: (LP: #190004)
+    - Change maintainer address.
+    - Change the default font from helvetica to fixed.
+  * Drop Pepper/Q1 patch, upstream has a slightly different fix
+  * Upstream includes fix for running on amd64 (LP: #155880)
+	
+ -- Steve Magoun <steve.magoun@canonical.com>  Thu, 07 Feb 2008 14:09:00 -0500
+
 xf86-input-evtouch (0.8.7-3) unstable; urgency=low
 
   * work(!!!!) with xserver-xorg-core 1.4
@@ -8,6 +18,16 @@
 
  -- Mattia Dongili <malattia@debian.org>  Sat, 02 Feb 2008 21:32:15 +0900
 
+xf86-input-evtouch (0.8.7-2ubuntu1) hardy; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Change maintainer address.
+    - Add patch from Pepper to handle the touch screen on the Samsung Q1
+      Ultra correctly.
+    - Change the default font from helvetica to fixed.
+ 
+ -- Timo Aaltonen <tepsipakki@ubuntu.com>  Tue, 13 Nov 2007 10:53:54 +0200
+
 xf86-input-evtouch (0.8.7-2) unstable; urgency=low
 
   * build with xserver-xorg-core 1.4
@@ -23,6 +43,14 @@
 
  -- Mattia Dongili <malattia@debian.org>  Tue, 11 Sep 2007 22:42:32 +0900
 
+xf86-input-evtouch (0.8.6-1ubuntu1) gutsy; urgency=low
+
+  * Add patch from Pepper to handle the touch screen on the Samsung Q1
+    Ultra correctly.
+  * Change the default font from helvetica to fixed.
+
+ -- Tollef Fog Heen <tfheen@ubuntu.com>  Wed, 11 Jul 2007 18:52:09 +0200
+
 xf86-input-evtouch (0.8.6-1) unstable; urgency=low
 
   * New upstream release:
diff -u xf86-input-evtouch-0.8.7/debian/control xf86-input-evtouch-0.8.7/debian/control
--- xf86-input-evtouch-0.8.7/debian/control
+++ xf86-input-evtouch-0.8.7/debian/control
@@ -1,7 +1,8 @@
 Source: xf86-input-evtouch
 Section: x11
 Priority: optional
-Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
 Uploaders: Mattia Dongili <malattia@debian.org>
 Build-Depends: debhelper (>= 5), pkg-config, xserver-xorg-dev (>= 2:1.4), x11proto-randr-dev, libxrender-dev, libx11-dev, quilt
 Standards-Version: 3.7.3
only in patch2:
unchanged:
--- xf86-input-evtouch-0.8.7.orig/ev_calibrate.c
+++ xf86-input-evtouch-0.8.7/ev_calibrate.c
@@ -198,7 +198,7 @@
         Pixmap cursor_pic;
         XColor cursor_fg, cursor_bg;
         XFontStruct* font_info;
-        char* font_name = "*-helvetica-*-12-*";
+        char* font_name = "*fixed*";
         char str[256];   
         unsigned int cursor_width, cursor_height;
         int hotspot_x, hotspot_y;