diff --git a/debian/changelog b/debian/changelog
index 636da64a498810caddd041593a7b16048091dcee..661760dbd8e44ba4c29eb520c5d2c0f3afaefdab 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
+xorg-server (2:1.11.4-0ubuntu10.6) precise-security; urgency=low
+
+ * 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.
+
+ -- 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
+
+ * SECURITY UPDATE: do not use input device names in logging format
+ strings (LP: #996250):
+ - debian/patches/509_log-format-fix.patch: backported upstream changes.
+ - CVE-2012-2118
+
+ -- 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 ]
+ * Add upstream patches for proper device disabling (LP: #1009629)
+ - 510-dix-return-early-from-DisableDevice-if-the-device-is.patch
+ - 511-dix-move-freeing-the-sprite-into-a-function.patch
+ - 512-dix-free-the-sprite-when-disabling-the-device.patch
+ - 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
+
+ -- Chase Douglas <chase.douglas@ubuntu.com> Wed, 20 Jun 2012 09:12:44 -0700
+
+xorg-server (2:1.11.4-0ubuntu10.2) precise-proposed; urgency=low
+
+ * Release buttons when device is disabled on suspend (LP: #968845)
+ - Add temporary patch 508_device_off_release_buttons.patch from upstream
+
+ -- Chase Douglas <chase.douglas@ubuntu.com> Sat, 05 May 2012 13:17:34 -0700
+
xorg-server (2:1.11.4-0ubuntu10.1) precise-proposed; urgency=low
[ Bryce Harrington ]