xorg: Changes to 'debian-unstable'

[Julien Cristau <jcristau@alioth.debian.org>]

 debian/changelog               |    4 ++++
 debian/local/xserver-wrapper.c |    6 ++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 37c5cb9c3c4ecf35f42cec13a009b07b6e8bfb16
Author: Julien Cristau <jcristau@debian.org>
Date:   Sat Jun 6 23:40:42 2009 +0200

    xserver-wrapper: recognize /usr/bin/X as a path to the wrapper.

diff --git a/debian/changelog b/debian/changelog
index 735b9d6..ad00aef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
 xorg (1:7.4+4) UNRELEASED; urgency=low
 
+  [ Timo Aaltonen ]
   * debian-x11-keymap.fdi: Check for input.keys from info.capabilities.
     (closes: #535291)
   * control: Move xserver-xorg dependency on evdev after -input-all.
     Otherwise only evdev is installed by default.
 
+  [ Julien Cristau ]
+  * xserver-wrapper: recognize /usr/bin/X as a path to the wrapper.
+
  -- Timo Aaltonen <tjaalton@ubuntu.com>  Thu, 02 Jul 2009 17:23:57 +0300
 
 xorg (1:7.4+3) unstable; urgency=low
diff --git a/debian/local/xserver-wrapper.c b/debian/local/xserver-wrapper.c
index 4a8d7f3..0e37e68 100644
--- a/debian/local/xserver-wrapper.c
+++ b/debian/local/xserver-wrapper.c
@@ -75,6 +75,7 @@
  * Loïc Minier: on Linux, also consider alternate tty devices (major 5 and
  *              minor < 64) as consoles (24 Sep 2008)
  * Julien Cristau: remove the nice_value option
+ * Julien Cristau: recognize /usr/bin/X as a path to this wrapper (6 Jun 2009)
  *
  * This is free software; you may redistribute it and/or modify
  * it under the terms of the GNU General Public License as
@@ -265,8 +266,9 @@ main(int argc, char **argv)
 
   xserver[i] = '\0'; /* readlink() does not null-terminate the string */
 
-  if ((strncmp(xserver, "/usr/bin/X11/X", 1024) == 0) ||
-      (strncmp(xserver, "/usr/X11R6/bin/X", 1024) == 0)) {
+  if ((strcmp(xserver, "/usr/bin/X11/X") == 0) ||
+      (strcmp(xserver, "/usr/X11R6/bin/X") == 0) ||
+      (strcmp(xserver, "/usr/bin/X") == 0)) {
     (void) fprintf(stderr, "X: %s points back to X wrapper executable, "
                    "aborting.\n", X_SERVER_SYMLINK);
     exit(1);