Merge branch 'ubuntu'

[glsdk/xserver.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 75b67e359009b58ecca4faf8d3aec009228e6252..661760dbd8e44ba4c29eb520c5d2c0f3afaefdab 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,24 @@
+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
@@ -91,6 +112,12 @@ xorg-server (2:1.11.4-0ubuntu7) precise; urgency=low
 
  -- Ricardo Salveti de Araujo <ricardo.salveti@linaro.org>  Tue, 20 Mar 2012 02:09:18 -0300
 
+xorg-server (2:1.11.4-0ubuntu6+ti1.0) precise; urgency=low
+
+  * Rebased dri2video support on 0ubuntu6
+
+ -- Xavier Boudet <x-boudet@ti.com>  Thu, 15 Mar 2012 11:18:25 +0000
+
 xorg-server (2:1.11.4-0ubuntu6) precise; urgency=low
 
   * debian/patches/500_pointer_barrier_thresholds.diff:
@@ -126,6 +153,12 @@ xorg-server (2:1.11.4-0ubuntu5) precise; urgency=low
 
  -- Chase Douglas <chase.douglas@ubuntu.com>  Wed, 07 Mar 2012 15:36:20 -0800
 
+xorg-server (2:1.11.4-0ubuntu4+ti1.0) precise; urgency=low
+
+  * Rebased dri2video support on 0ubuntu4 patch
+
+ -- David Bercovitz <d-bercovitz@ti.com>  Fri, 02 Mar 2012 12:59:02 +0000
+
 xorg-server (2:1.11.4-0ubuntu4) precise; urgency=low
 
   * debian/patches/500_pointer_barrier_thresholds.diff:
@@ -135,6 +168,12 @@ xorg-server (2:1.11.4-0ubuntu4) precise; urgency=low
 
  -- Christopher James Halse Rogers <raof@ubuntu.com>  Tue, 21 Feb 2012 17:04:41 +1100
 
+xorg-server (2:1.11.4-0ubuntu3+ti1.0) precise; urgency=low
+
+  * Added dri2video support
+
+ -- David Bercovitz <d-bercovitz@ti.com>  Wed, 22 Feb 2012 16:43:17 +0100
+
 xorg-server (2:1.11.4-0ubuntu3) precise; urgency=low
 
   * Fix touch class memory corruption