diff --git a/debian/changelog b/debian/changelog
index 4bc443cf9e54095c1f4c5609a0e727d39809c786..58183750a3a7d1cd215e81ee676629efe2d4cbc1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
+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: