diff --git a/debian/changelog b/debian/changelog
index eefd6271e0230702a3bee2273ee6768665dee968..6ca7701b558e4ba165ad8e23d875414a927ec0fb 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
-xorg-server (2:1.11.4-0ubuntu10.6) precise-security; urgency=low
+xorg-server (2:1.11.4-0ubuntu10.8) precise-proposed; urgency=low
+
+ * Add upstream patches to avoid seg fault in case the user is running with
+ multiple screens and xrandr is only enabled at one (LP: #1015292):
+ - 229_randr_first_check_pScrPriv_before_using_the_pointer.patch
+ - 230_randr_catch_two_more_potential_unset_rrScrPriv_uses.patch
+
+ -- Ricardo Salveti de Araujo <ricardo.salveti@linaro.org> Thu, 19 Jul 2012 22:57:12 -0300
+
+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 <tjaalton@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
attempted to fix bug 968845, but this caused the xserver to crash
-- 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