[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

xorg-server: Changes to 'ubuntu'



 debian/changelog                                   |    6 +++++-
 debian/patches/500_pointer_barrier_thresholds.diff |    6 ++----
 2 files changed, 7 insertions(+), 5 deletions(-)

New commits:
commit f30ee00187320529c480674ff09a1953913fde5f
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date:   Thu Nov 8 12:55:21 2012 +0200

    500_pointer_barrier_thresholds.diff: Update to fix gaps above barriers at edge of screen (LP: #1073724)

diff --git a/debian/changelog b/debian/changelog
index d0ad5a7..e20b6f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,10 @@ xorg-server (2:1.13.0-0ubuntu7) UNRELEASED; urgency=low
       for upstream response for right fix..
   * add 235-composite-tracking.diff to fix exa corruption. (LP: #1010794)
 
+  [ Tim Lunn ]
+  * 500_pointer_barrier_thresholds.diff: Update to fix gaps above
+    barriers at edge of screen (LP: #1073724)
+
  -- Timo Aaltonen <tjaalton@ubuntu.com>  Thu, 25 Oct 2012 15:43:26 +0300
 
 xorg-server (2:1.13.0-0ubuntu6) quantal; urgency=low
diff --git a/debian/patches/500_pointer_barrier_thresholds.diff b/debian/patches/500_pointer_barrier_thresholds.diff
index b61dcfc..70020b7 100644
--- a/debian/patches/500_pointer_barrier_thresholds.diff
+++ b/debian/patches/500_pointer_barrier_thresholds.diff
@@ -392,8 +392,7 @@ index 602b906..cab5b31 100644
 +        dir = barrier_get_direction(ox, oy, unclamped_prex, unclamped_prey);
 +        barrier_calculate_velocity_components(ox, oy, unclamped_prex, unclamped_prey, &vel_x, &vel_y);
  
--        nearest = barrier_find_nearest(cs, dir, ox, oy, *x, *y);
-+        nearest = barrier_find_nearest(cs, dir, ox, oy, unclamped_prex, unclamped_prey);
+         nearest = barrier_find_nearest(cs, dir, ox, oy, *x, *y);
          if (nearest) {
 -            barrier_clamp_to_barrier(nearest, dir, x, y);
 +	    int velocity = barrier_is_vertical(nearest) ? vel_x : vel_y;
@@ -419,8 +418,7 @@ index 602b906..cab5b31 100644
                  oy = *y;
              }
  
--            nearest = barrier_find_nearest(cs, dir, ox, oy, *x, *y);
-+            nearest = barrier_find_nearest(cs, dir, ox, oy, unclamped_prex, unclamped_prey);
+             nearest = barrier_find_nearest(cs, dir, ox, oy, *x, *y);
              if (nearest) {
 -                barrier_clamp_to_barrier(nearest, dir, x, y);
 +			velocity = barrier_is_vertical(nearest) ? vel_x : vel_y;

commit 28e12e9344e7057635d6080d897e34c637562c64
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date:   Thu Nov 8 12:53:41 2012 +0200

    unrelease, the upload to proposed was done from the wrong branch and got dropped anyway

diff --git a/debian/changelog b/debian/changelog
index eb6a180..d0ad5a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.13.0-0ubuntu6.1) quantal-proposed; urgency=low
+xorg-server (2:1.13.0-0ubuntu7) UNRELEASED; urgency=low
 
   [ Maarten Lankhorst ]
   * add 233-xf86events-valgrind.patch to fix a xserver corruption


Reply to: