diff --git a/debian/changelog b/debian/changelog
index 3756386efe4558065d5d36f33a7cfe738b5b2c93..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 ]
+ * Enable 227_null_ptr_midispcur.patch to apply
+
+ [ Chase Douglas ]
+ * Update to xserver 1.12.1 for the input stack
+ * Drop patches merged upstream in 1.12.1:
+ - 501_touch_accept_end.patch
+ - 502_indirect_touch_window_set.patch
+ - 503_fix_mouse_warp.patch
+ - 504_implement_passive_touch_ungrab.patch
+ * Fix patch 506_touchscreen_pointer_emulation_checks.patch after upstream
+ review
+ * Fix various touchscreen issues (LP: #974887)
+ - Add temporary patch 506_touchscreen_fixes.patch, which is a combination of
+ multiple upstream patches
+
+ -- Chase Douglas <chase.douglas@ubuntu.com> Thu, 19 Apr 2012 12:34:54 -0700
+
+xorg-server (2:1.11.4-0ubuntu10) precise; urgency=low
+
+ * Fix touchscreen pointer emulation (LP: #949791)
+ - Add temporary patch 506_touchscreen_pointer_emulation_checks.patch
+
+ -- Chase Douglas <chase.douglas@ubuntu.com> Wed, 04 Apr 2012 16:53:33 -0700
+
+xorg-server (2:1.11.4-0ubuntu9) precise; urgency=low
+
+ * Report button press when touchscreen touch is active (LP: #972985)
+ - Add temporary patch 505_query_pointer_touchscreen.patch
+ - Fixes some compiz/unity touchscreen issues
+
+ -- Chase Douglas <chase.douglas@ubuntu.com> Tue, 03 Apr 2012 19:04:01 -0700
+
+xorg-server (2:1.11.4-0ubuntu8) precise; urgency=low
+
+ [ Chase Douglas ]
+ * Fix crash at startup due to input option abi break (LP: #931397)
+ - Revert two commits from upstream 1.12 input stack
+
+ [ Bryce Harrington ]
+ * debian/patches/227_null_ptr_midispcur.patch:
+ - Check for NULL pointer before dereferencing pointer from
+ miGetDCDevice. Fixes crash after connecting a bluetooth keyboard.
+ (LP: #930936)
+
+ [ Chase Douglas ]
+ * Fix mouse warping and clipping (LP: #948938)
+ - Add temporary patch 503_fix_mouse_warp.patch
+ * Implement passive touch ungrab (LP: #968726)
+ - Add temporary patch 503_implement_passive_touch_ungrab.patch
+ * Bump lintian standards to 3.9.3
+
+ -- Chase Douglas <chase.douglas@ubuntu.com> Thu, 29 Mar 2012 18:09:19 -0700
+
+xorg-server (2:1.11.4-0ubuntu7) precise; urgency=low
+
+ * debian/patches/111_armel-drv-fallbacks.patch:
+ - Avoid loading the driver to test if it's available. Xorg will later load
+ and validate the module, and if it's already loaded it'll trigger an
+ error and invalidate the driver (LP: #959928)
+
+ -- 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:
-- 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:
-- 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