Merge branch 'ubuntu'

Conflicts:
	debian/changelog
	debian/patches/series

diff --combined debian/changelog
index b868aefb861f1124a18b854b3b98350d6e99ee86,bc906d22872b7521843a4bf7fd5df2535dc4858e..32de86214ff8915cc37a770ca809fb89249ff047
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,9 @@@
- xorg-server (2:1.11.4-0ubuntu10.1+ti1.0) precise; urgency=low
+ xorg-server (2:1.11.4-0ubuntu10.2) precise-proposed; urgency=low
  
-   * Rebased dri2video support on 0ubuntu10.1
-   * Add patches for driver to handle the transform
+   * Release buttons when device is disabled on suspend (LP: #968845)
+     - Add temporary patch 508_device_off_release_buttons.patch from upstream
  
-  -- Xavier Boudet <x-boudet@ti.com>  Wed, 02 May 2012 08:57:46 +0000
+  -- Chase Douglas <chase.douglas@ubuntu.com>  Sat, 05 May 2012 13:17:34 -0700
  
  xorg-server (2:1.11.4-0ubuntu10.1) precise-proposed; urgency=low
  
@@@ -70,12 -70,6 +70,12 @@@ xorg-server (2:1.11.4-0ubuntu7) precise
  
   -- Ricardo Salveti de Araujo <ricardo.salveti@linaro.org>  Tue, 20 Mar 2012 02:09:18 -0300
  
 +xorg-server (2:1.11.4-0ubuntu6+ti1.0) precise; urgency=low
 +
 +  * Rebased dri2video support on 0ubuntu6
 +
 + -- Xavier Boudet <x-boudet@ti.com>  Thu, 15 Mar 2012 11:18:25 +0000
 +
  xorg-server (2:1.11.4-0ubuntu6) precise; urgency=low
  
    * debian/patches/500_pointer_barrier_thresholds.diff:
@@@ -111,12 -105,6 +111,12 @@@ xorg-server (2:1.11.4-0ubuntu5) precise
  
   -- Chase Douglas <chase.douglas@ubuntu.com>  Wed, 07 Mar 2012 15:36:20 -0800
  
 +xorg-server (2:1.11.4-0ubuntu4+ti1.0) precise; urgency=low
 +
 +  * Rebased dri2video support on 0ubuntu4 patch
 +
 + -- David Bercovitz <d-bercovitz@ti.com>  Fri, 02 Mar 2012 12:59:02 +0000
 +
  xorg-server (2:1.11.4-0ubuntu4) precise; urgency=low
  
    * debian/patches/500_pointer_barrier_thresholds.diff:
@@@ -126,12 -114,6 +126,12 @@@
  
   -- Christopher James Halse Rogers <raof@ubuntu.com>  Tue, 21 Feb 2012 17:04:41 +1100
  
 +xorg-server (2:1.11.4-0ubuntu3+ti1.0) precise; urgency=low
 +
 +  * Added dri2video support
 +
 + -- David Bercovitz <d-bercovitz@ti.com>  Wed, 22 Feb 2012 16:43:17 +0100
 +
  xorg-server (2:1.11.4-0ubuntu3) precise; urgency=low
  
    * Fix touch class memory corruption

diff --combined debian/patches/series
index 6af5ed7d21c558bea2741cb4ae846bcda5515eb5,1b863e7ccfa108fc4f45b4760946cebb26a3829d..0e0102575eb1814b4164dc325a7efa50410df49b
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -1,6 -1,5 +1,6 @@@
  ## Patches with a number < 100 are applied in debian.
  ## Ubuntu patches start with 100.
 +0001-add-dri2video.patch
  001_fedora_extramodes.patch
  02_Add-libnettle-as-option-for-sha1.diff
  07-xfree86-fix-build-with-xv-disabled.diff
@@@ -37,7 -36,4 +37,8 @@@
  505_query_pointer_touchscreen.patch
  506_touchscreen_pointer_emulation_checks.patch
  507_touchscreen_fixes.patch
+ 508_device_off_release_buttons.patch
 +
 +#Rotation patches
 +1001-xfree86-modes-Let-the-driver-handle-the-transform.patch
 +1002-xfree86-modes-Make-cursor-position-transform-a-helpe.patch