xorg-server: Changes to 'ubuntu'

[Maarten Lankhorst <mlankhorst-guest@alioth.debian.org>]

 debian/changelog                            |    1 +
 debian/patches/drm_device_keep_trying.patch |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 9013783d0d25337313e14e5b79cc319f03c0aed6
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date:   Tue Mar 12 11:30:01 2013 +0100

    add changelog entry, change patch slightly

diff --git a/debian/changelog b/debian/changelog
index 956c364..db91c79 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ xorg-server (2:1.13.3-0ubuntu1) UNRELEASED; urgency=low
   * Drop patches applied upstream.
     - 237_dix_save_touchpoint_last_coords_before_transform.patch
     - randr-cleanup-provider-properly.patch
+  * Rework drm_device_keep_trying.patch (LP: #982889)
 
  -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com>  Mon, 11 Mar 2013 19:30:46 +0100
 
diff --git a/debian/patches/drm_device_keep_trying.patch b/debian/patches/drm_device_keep_trying.patch
index a93a0bc..3ff1eab 100644
--- a/debian/patches/drm_device_keep_trying.patch
+++ b/debian/patches/drm_device_keep_trying.patch
@@ -67,7 +67,7 @@ Signed-off-by: Bryce Harrington <bryce@canonical.com>
 +            /* retry */
 +            continue;
 +
-+        ErrorF("drmSetMaster failed with %i(%s)\n", err, strerror(-err));
++        ErrorF("drmSetMaster failed with %i(%m)\n", errno);
 +err:
 +        close(fd);
          return FALSE;