xorg: Changes to 'debian-experimental'

[Loïc Minier <lool@alioth.debian.org>]

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

New commits:
commit 0858ed28863d49b856203983b071545d4d7d7cf8
Author: Loïc Minier <lool@dooz.org>
Date:   Mon Sep 8 12:54:38 2008 +0200

    Allow consider alternate tty devices as consoles
    
    Allow /dev/console, /dev/tty or all other char devices with major 5
    and minor < 64 for the onConsole() check.

diff --git a/debian/local/xserver-wrapper.c b/debian/local/xserver-wrapper.c
index 6003606..760f8eb 100644
--- a/debian/local/xserver-wrapper.c
+++ b/debian/local/xserver-wrapper.c
@@ -159,8 +159,11 @@ onConsole()
     return FALSE;
   }
   if (S_ISCHR(s.st_mode) &&
-      ((s.st_rdev >> 8) & 0xff) == TTY_MAJOR_DEV &&
-      (s.st_rdev & 0xff) < 64) {
+        ((((s.st_rdev >> 8) & 0xff) == TTY_MAJOR_DEV &&
+          (s.st_rdev & 0xff) < 64) ||
+        (((s.st_rdev >> 8) & 0xff) == ALT_TTY_MAJOR_DEV &&
+          (s.st_rdev & 0xff) < 64)
+        )) {
     return TRUE;
   }
 #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)

commit 33ff7d1f414d9f6d53696d10e54280606804011c
Author: Loïc Minier <lool@dooz.org>
Date:   Mon Sep 8 12:46:45 2008 +0200

    Add ALT_TTY_MAJOR_DEV (alternate TTY devices)

diff --git a/debian/local/xserver-wrapper.c b/debian/local/xserver-wrapper.c
index 875ef8d..6003606 100644
--- a/debian/local/xserver-wrapper.c
+++ b/debian/local/xserver-wrapper.c
@@ -108,6 +108,7 @@
 
 #if defined(__linux__)
 #define TTY_MAJOR_DEV 4
+#define ALT_TTY_MAJOR_DEV 5
 #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 #include <sys/consio.h>
 #endif

commit 29578cee8d15a92f70b87c301bb6b7f2c4fe4c67
Author: Loïc Minier <lool@dooz.org>
Date:   Mon Sep 8 12:45:33 2008 +0200

    Rename VT_MAJOR_DEV to more accurate TTY_MAJOR_DEV

diff --git a/debian/local/xserver-wrapper.c b/debian/local/xserver-wrapper.c
index 08e3140..875ef8d 100644
--- a/debian/local/xserver-wrapper.c
+++ b/debian/local/xserver-wrapper.c
@@ -107,7 +107,7 @@
 #endif
 
 #if defined(__linux__)
-#define VT_MAJOR_DEV 4
+#define TTY_MAJOR_DEV 4
 #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 #include <sys/consio.h>
 #endif
@@ -158,7 +158,7 @@ onConsole()
     return FALSE;
   }
   if (S_ISCHR(s.st_mode) &&
-      ((s.st_rdev >> 8) & 0xff) == VT_MAJOR_DEV &&
+      ((s.st_rdev >> 8) & 0xff) == TTY_MAJOR_DEV &&
       (s.st_rdev & 0xff) < 64) {
     return TRUE;
   }