From: David Bercovitz <d-bercovitz@ti.com>
Date: Fri, 2 Mar 2012 12:48:57 +0000 (+0000)
Subject: Merge branch 'ubuntu'
X-Git-Url: https://git.ti.com/gitweb?p=glsdk%2Fxserver.git;a=commitdiff_plain;h=93012fee9a99336ba03b8f849fab97745bfc9971

Merge branch 'ubuntu'
---

93012fee9a99336ba03b8f849fab97745bfc9971
diff --cc debian/changelog
index d5f60e0,1fbc21e..6a36a95
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,12 +1,18 @@@
+ xorg-server (2:1.11.4-0ubuntu4) precise; urgency=low
+ 
+   * debian/patches/500_pointer_barrier_thresholds.diff:
+     - Make the velocity calculation more robust on screen edges.  Fixes reveal
+       behaviour on nVidia 295.20 driver, which now clamps the pointer to the
+       visible screen area. (LP: #937792)
+ 
+  -- 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 
++  * 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 --cc debian/control
index 4eb0d04,7da92bf..54fd8c3
--- a/debian/control
+++ b/debian/control
@@@ -42,7 -42,7 +42,7 @@@ Build-Depends
   xtrans-dev (>= 1.2.2),
   libxau-dev (>= 1:1.0.5-2),
   x11proto-input-dev (>= 2.1.99.6),
-- x11proto-dri2-dev (>= 2.6),
++ x11proto-dri2-dev (>= 2.6-2ubuntu1+ti1.1),
   libxdmcp-dev (>= 1:0.99.1),
   libxfont-dev (>= 1:1.4.2),
   libxkbfile-dev (>= 1:0.99.1),
@@@ -55,8 -55,7 +55,8 @@@
   libudev-dev (>= 151-3),
   libselinux1-dev (>= 2.0.80),
   x11proto-xf86dri-dev (>= 2.1.0),
 - libdrm-dev (>= 2.4.3) [!hurd-i386],
 + libdrm-dev (>= 2.4.30-1ubuntu1+ti1.0) [!hurd-i386],
-  libdri2-dev (>= 1.0.1-0ubuntu6), 
++ libdri2-dev (>= 1.0.2-0ubuntu2), 
   x11proto-gl-dev (>= 1.4.14),
   mesa-common-dev (>= 7.10.3-0ubuntu1),
   libgl1-mesa-dev (>= 7.8),