xorg: Changes to 'ubuntu'

[Bryce Harrington <bryce-guest@alioth.debian.org>]

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

New commits:
commit 82721a29bc57e25202f2b9305799c62ca2f78226
Author: Bryce Harrington <bryce@bryceharrington.org>
Date:   Tue Sep 16 14:24:53 2008 -0700

    Incorporate Loic's dev-console-support work
    (git://git.debian.org/git/users/lool/pkg-xorg/debian/xorg)

diff --git a/debian/changelog b/debian/changelog
index 8b98859..6bee7ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,13 @@
-xorg (1:7.4~2ubuntu1) UNRELEASED; urgency=low
+xorg (1:7.4~2ubuntu2) UNRELEASED; urgency=low
+
+  [Loic Minier]
+  * local/xserver-wrapper.c: Add support for /dev/console and other
+    alternate TTY devices such as /dev/console, /dev/tty, or all other
+    char devices with major 5 and minur < 64 for the onConsole() check.
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Tue, 16 Sep 2008 14:22:57 -0700
+
+xorg (1:7.4~2ubuntu1) intrepid; urgency=low
 
   [ Bryce Harrington ]
   * local/Failsafe/failsafeXinit:  Replace use of displayconfig-gtk with
@@ -16,7 +25,7 @@ xorg (1:7.4~2ubuntu1) UNRELEASED; urgency=low
       left behind on upgrade. (LP: #243690)
   * control: move xfonts-scalable to Recommends (LP: #84938)
 
- -- Timo Aaltonen <tepsipakki@ubuntu.com>  Thu, 04 Sep 2008 13:52:33 +0300
+ -- Bryce Harrington <bryce@ubuntu.com>  Thu, 11 Sep 2008 17:33:40 -0700
 
 xorg (1:7.4~2) experimental; urgency=low
 
diff --git a/debian/local/xserver-wrapper.c b/debian/local/xserver-wrapper.c
index 27afa3a..87067c5 100644
--- a/debian/local/xserver-wrapper.c
+++ b/debian/local/xserver-wrapper.c
@@ -111,7 +111,8 @@
 #endif
 
 #if defined(__linux__)
-#define VT_MAJOR_DEV 4
+#define TTY_MAJOR_DEV 4
+#define ALT_TTY_MAJOR_DEV 5
 #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 #include <sys/consio.h>
 #endif
@@ -162,8 +163,11 @@ onConsole()
     return FALSE;
   }
   if (S_ISCHR(s.st_mode) &&
-      ((s.st_rdev >> 8) & 0xff) == VT_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__)