Merge branch 'ubuntu'
[glsdk/xserver.git] / debian / patches / series
index 325ccbe1d665e929b45f115c079619932cd89885..14910e7e1757a5885e5140c9455d3721a1a99e0e 100644 (file)
 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
 
 ## 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.
@@ -56,6 +57,3 @@
 1001-xfree86-modes-Let-the-driver-handle-the-transform.patch
 1002-xfree86-modes-Make-cursor-position-transform-a-helpe.patch
 
-# Upstream patches
-516-randr-first-check-pScrPriv-before-using-the-pointer.patch
-517-randr-Catch-two-more-potential-unset-rrScrPriv-uses.patch