xorg-server: Changes to 'ubuntu-quantal'
debian/changelog | 9 ++++++++-
debian/patches/500_pointer_barrier_thresholds.diff | 6 ++++--
2 files changed, 12 insertions(+), 3 deletions(-)
New commits:
commit a3a8e6e087659719f20946d53e5831dc860e721e
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Thu Nov 22 17:30:30 2012 +0200
upload to quantal-proposed
diff --git a/debian/changelog b/debian/changelog
index c948331..dc6b5b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xorg-server (2:1.13.0-0ubuntu6.2) UNRELEASED; urgency=low
+xorg-server (2:1.13.0-0ubuntu6.2) quantal-proposed; urgency=low
* Revert the change to 500_pointer_barrier_thresholds.diff, causes
issues with unity launcher.
- -- Timo Aaltonen <tjaalton@ubuntu.com> Thu, 22 Nov 2012 17:29:36 +0200
+ -- Timo Aaltonen <tjaalton@ubuntu.com> Thu, 22 Nov 2012 17:30:15 +0200
xorg-server (2:1.13.0-0ubuntu6.1) quantal-proposed; urgency=low
commit cdcbf947b65920c5eaa64a7b2666986afd02098d
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.
Conflicts:
debian/changelog
diff --git a/debian/changelog b/debian/changelog
index 05eb38e..c948331 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.13.0-0ubuntu6.2) UNRELEASED; urgency=low
+
+ * Revert the change to 500_pointer_barrier_thresholds.diff, causes
+ issues with unity launcher.
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com> Thu, 22 Nov 2012 17:29:36 +0200
+
xorg-server (2:1.13.0-0ubuntu6.1) quantal-proposed; urgency=low
[ Maarten Lankhorst ]
@@ -13,7 +20,7 @@ xorg-server (2:1.13.0-0ubuntu6.1) quantal-proposed; urgency=low
jumping with absolute pointing device. Initializes device
transformation matrix to an identity matrix. Thanks to a7x.
(LP: #1041063)
-
+
[ Tim Lunn ]
* 500_pointer_barrier_thresholds.diff: Update to fix gaps above
barriers at edge of screen (LP: #1073724)
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: