diff --git a/debian/changelog b/debian/changelog
index 34f8b7f9fa482814ae023a04ae096c7e60eef7ce..661760dbd8e44ba4c29eb520c5d2c0f3afaefdab 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
-xorg-server (2:1.11.4-0ubuntu10.5+ti1.0) precise; urgency=low
+xorg-server (2:1.11.4-0ubuntu10.6) precise-security; urgency=low
- * Rebased dri2video support on 0ubuntu10.5
- * Add patches for driver to handle the transform
+ * Revert changes from 10.2 and 10.3 (and the unreleased SRU 10.4). 10.2
+ attempted to fix bug 968845, but this caused the xserver to crash
+ under rare conditions (1009629). 10.3 attempted to fix that crash,
+ but resulted in a more commonly seen crash such as when using GIMP.
+ (LP: #1021517)
+ * Rename patch 509_log-format-fix.patch to 228_log-format-fix.patch,
+ to reserve the 5xx numbering for input stack patches.
- -- Xavier Boudet <x-boudet@ti.com> Thu, 12 Jul 2012 10:20:39 +0200
+ -- Bryce Harrington <bryce@ubuntu.com> Mon, 16 Jul 2012 10:42:25 -0700
xorg-server (2:1.11.4-0ubuntu10.5) precise-security; urgency=low
xorg-server (2:1.11.4-0ubuntu10.5) precise-security; urgency=low
-- Steve Beattie <sbeattie@ubuntu.com> Mon, 09 Jul 2012 15:24:55 -0700
-- Steve Beattie <sbeattie@ubuntu.com> Mon, 09 Jul 2012 15:24:55 -0700
+xorg-server (2:1.11.4-0ubuntu10.4) precise-proposed; urgency=low
+
+ * Add 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 <tjaalton@ubuntu.com> Thu, 05 Jul 2012 23:07:06 +0300
+
xorg-server (2:1.11.4-0ubuntu10.3) precise-proposed; urgency=low
[ Maarten Lankhorst ]
xorg-server (2:1.11.4-0ubuntu10.3) precise-proposed; urgency=low
[ Maarten Lankhorst ]