debian/changelog | 8 ++++++++
debian/patches/series | 2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
New commits:
commit 47b30951c24a1a3cb1907730c5e261062260bec1
Author: Timo Aaltonen <Timo Aaltonen tjaal...@cc.hut.fi>
Date: Thu Aug 2 17:24:13 2012 +0300
re-enable patch 516, push to proposed
diff --git a/debian/changelog b/debian/changelog
index fad498f..5842c13 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg-server (2:1.11.4-0ubuntu10.7) precise-proposed; urgency=low
+
+ * Re-enable 516-dix-dont-emulate-scroll-events-for-non-existing-axes.patch
+ from upstream 1.12.2. Fixes the server from entering in an infinite
+ loop in certain situations. (LP: #921236)
+
+ -- Timo Aaltonen <tjaal...@ubuntu.com> Thu, 02 Aug 2012 17:14:39 +0300
+
xorg-server (2:1.11.4-0ubuntu10.6) precise-proposed; urgency=low
* Revert changes from 10.2 and 10.3 (and the unreleased SRU 10.4). 10.2
diff --git a/debian/patches/series b/debian/patches/series
index e45658c..0ce1ed6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -49,4 +49,4 @@
#513-dix-disable-non-sprite-owners-first-when-disabling-p.patch
#514-Xi-drop-forced-unpairing-when-changing-the-hierarchy.patch
#515-dix-disable-all-devices-before-shutdown.patch
-#516-dix-dont-emulate-scroll-events-for-non-existing-axes.patch
+516-dix-dont-emulate-scroll-events-for-non-existing-axes.patch
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1swwku-0004e1...@vasks.debian.org
