Merge branch 'ubuntu'
authorXavier Boudet <x-boudet@ti.com>
Thu, 15 Mar 2012 11:13:49 +0000 (11:13 +0000)
committerXavier Boudet <x-boudet@ti.com>
Thu, 15 Mar 2012 11:13:49 +0000 (11:13 +0000)
Conflicts:
debian/changelog

1  2 
debian/changelog
debian/patches/series

index ff6c9b91d95f13706ad8b4b75f94a63c1402cbab,3756386efe4558065d5d36f33a7cfe738b5b2c93..831182038b2a4ff66fbe496d9a74780096e64b4c
@@@ -1,9 -1,38 +1,44 @@@
+ xorg-server (2:1.11.4-0ubuntu6) precise; urgency=low
+   * debian/patches/500_pointer_barrier_thresholds.diff:
+     - Don't try to send events from the context of the SIGIO handler.  That
+       leads to the dark side, or at least to server freezes when trying to
+       reveal the launcher in Unity (LP: #946954).  May also fix other seemingly
+       random X server crashes.
+     - Add build-time tests to make check for barrier behaviour.  These are
+       disabled, pending gtest, xorg-gtest, and xserver-xorg-video-dummy MIRs.
+  -- Christopher James Halse Rogers <raof@ubuntu.com>  Fri, 09 Mar 2012 19:16:02 +1100
+ xorg-server (2:1.11.4-0ubuntu5) precise; urgency=low
+   * Update to 1.12 input stack 
+   * Drop input patches that have been merged upstream:
+     - 600-Revert-dix-deduplicate-callers-of-DeliverDeviceEvent.patch
+     - 601-Store-window-pointer-in-touch-listener-record.patch
+     - 602-Factor-out-TouchEnd-generation-and-delivery.patch
+     - 603-Export-TouchEventRejected-as-TouchRejected.patch
+     - 604-Move-AllowTouch-to-dix-touch.c-and-rename-to-TouchAc.patch
+     - 605-Check-for-proper-window-ID-when-processing-touch-all.patch
+     - 606-Implement-early-touch-reject.patch
+     - 607-Implement-touch-early-accept.patch
+     - 608-dix-fix-an-out-of-memory-crash.patch
+     - 609-Xi-handle-new-XIAllowEvents-request-in-inputproto-2..patch
+     - 610-Fix-scrolling.patch
+     - 611-Fix-touch-punt-crash.patch
+     - 612-Fix-vcp-touches-corruption.patch
+     - 613-Keep-vcp-touch-class.patch
+   * Fix indirect touch grab handling (LP: #929408)
+     - Add temporary patch 501_touch_accept_end.patch
+     - Add temporary patch 502_indirect_touch_window_set.patch
+  -- 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:
Simple merge