xorg-server: Changes to 'ubuntu'
debian/changelog | 7 +++++++
debian/patches/500_pointer_barrier_thresholds.diff | 6 ++++--
2 files changed, 11 insertions(+), 2 deletions(-)
New commits:
commit a3c6110370d05c73f3bc7984c4f6e6a7375c7d63
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Mon Nov 19 12:16:32 2012 +0200
Revert the change to 500_pointer_barrier_thresholds.diff, causes issues with unity launcher.
diff --git a/debian/changelog b/debian/changelog
index 11367e3..8d26f26 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.13.0-0ubuntu8) raring; urgency=low
+
+ * Revert the change to 500_pointer_barrier_thresholds.diff, causes
+ issues with unity launcher.
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com> Mon, 19 Nov 2012 12:15:49 +0200
+
xorg-server (2:1.13.0-0ubuntu7) raring; urgency=low
[ Maarten Lankhorst ]
diff --git a/debian/patches/500_pointer_barrier_thresholds.diff b/debian/patches/500_pointer_barrier_thresholds.diff
index 70020b7..b61dcfc 100644
--- a/debian/patches/500_pointer_barrier_thresholds.diff
+++ b/debian/patches/500_pointer_barrier_thresholds.diff
@@ -392,7 +392,8 @@ 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, *x, *y);
++ nearest = barrier_find_nearest(cs, dir, ox, oy, unclamped_prex, unclamped_prey);
if (nearest) {
- barrier_clamp_to_barrier(nearest, dir, x, y);
+ int velocity = barrier_is_vertical(nearest) ? vel_x : vel_y;
@@ -418,7 +419,8 @@ index 602b906..cab5b31 100644
oy = *y;
}
- nearest = barrier_find_nearest(cs, dir, ox, oy, *x, *y);
+- nearest = barrier_find_nearest(cs, dir, ox, oy, *x, *y);
++ nearest = barrier_find_nearest(cs, dir, ox, oy, unclamped_prex, unclamped_prey);
if (nearest) {
- barrier_clamp_to_barrier(nearest, dir, x, y);
+ velocity = barrier_is_vertical(nearest) ? vel_x : vel_y;
Reply to: