Merge branch 'ubuntu'
authorXavier Boudet <x-boudet@ti.com>
Thu, 5 Apr 2012 07:50:14 +0000 (07:50 +0000)
committerXavier Boudet <x-boudet@ti.com>
Thu, 5 Apr 2012 07:50:14 +0000 (07:50 +0000)
Conflicts:
debian/changelog
debian/patches/series

Signed-off-by: Xavier Boudet <x-boudet@ti.com>
1  2 
debian/changelog
debian/patches/series

index 9d9e0989e1ae97fc548621a3563c1f2b1ac0cc81,8abf057d102bb55fc78ad0dc7a4b766ba18e90e2..2a458a271c9f57640de6fb0e03ddfe63ccb5000f
@@@ -1,9 -1,9 +1,16 @@@
- xorg-server (2:1.11.4-0ubuntu9+ti1.0) precise; urgency=low
++xorg-server (2:1.11.4-0ubuntu10+ti1.0) precise; urgency=low
 +
-   * Rebased dri2video support on 0ubuntu9
-   * Add patches for driver to handle the transform 
++  * Rebased dri2video support on 0ubuntu10
++  * Add patches for driver to handle the transform
 +
-  -- Xavier Boudet <x-boudet@ti.com>  Wed, 04 Apr 2012 12:18:44 +0000
++ -- Xavier Boudet <x-boudet@ti.com>  Thu, 05 Apr 2012 09:18:44 +0200
++
+ xorg-server (2:1.11.4-0ubuntu10) precise; urgency=low
+   * Fix touchscreen pointer emulation (LP: #949791)
+     - Add temporary patch 506_touchscreen_pointer_emulation_checks.patch
+  -- Chase Douglas <chase.douglas@ubuntu.com>  Wed, 04 Apr 2012 16:53:33 -0700
  
  xorg-server (2:1.11.4-0ubuntu9) precise; urgency=low
  
index 69f1a8dfc0614fa3ba2c8dbed150442fed4342ae,e07cbea54145882a2fbbb40612a405e2de2a7cd8..125c06b96cfcd6e9b8a640f8beb0a413b4e333c4
@@@ -38,6 -37,4 +38,7 @@@
  503_fix_mouse_warp.patch
  504_implement_passive_touch_ungrab.patch
  505_query_pointer_touchscreen.patch
+ 506_touchscreen_pointer_emulation_checks.patch
 +#Rotation patches
 +1001-xfree86-modes-Let-the-driver-handle-the-transform.patch
 +1002-xfree86-modes-Make-cursor-position-transform-a-helpe.patch