diff --git a/debian/patches/series b/debian/patches/series
index dbd3796d71f862e068a2a3214383d4be2ba838ea..14910e7e1757a5885e5140c9455d3721a1a99e0e 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
## Patches with a number < 100 are applied in debian.
## Ubuntu patches start with 100.
+0001-add-dri2video.patch
001_fedora_extramodes.patch
02_Add-libnettle-as-option-for-sha1.diff
07-xfree86-fix-build-with-xv-disabled.diff
224_return_BadWindow_not_BadMatch.diff
225_non-root_config_paths.patch
226_fall_back_to_autoconfiguration.patch
+227_null_ptr_midispcur.patch
+228_log-format-fix.patch
+229_randr_first_check_pScrPriv_before_using_the_pointer.patch
+230_randr_catch_two_more_potential_unset_rrScrPriv_uses.patch
-# Temporary, until it's reviewed & accepted upstream
+## Input Stack Patches (from xserver 1.12) ##
500_pointer_barrier_thresholds.diff
+505_query_pointer_touchscreen.patch
+506_touchscreen_pointer_emulation_checks.patch
+507_touchscreen_fixes.patch
+# Patch 508 attempted to fix LP: #968845, but caused regression
+# crash bug #1009629. Patches 510-515 attempted to fix that
+# regression, but this led to the severe crash bug #1021517.
+# So, disabling the patch set until this can be studied better.
+#508_device_off_release_buttons.patch
+#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
+516-dix-dont-emulate-scroll-events-for-non-existing-axes.patch
+
+# Rotation patches
+1001-xfree86-modes-Let-the-driver-handle-the-transform.patch
+1002-xfree86-modes-Make-cursor-position-transform-a-helpe.patch
-# Temporary, until they are 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