xorg-server: Changes to 'ubuntu'

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

 debian/patches/188_default_primary_to_first_busid.patch |   15 +++++++++++++++
 1 file changed, 15 insertions(+)

New commits:
commit 3a4400f0193c413f57c6109afe80c6a1142b31bf
Author: Bryce Harrington <bryce@bryceharrington.org>
Date:   Mon Nov 23 13:50:28 2009 -0800

    Default to first busid if X can't determine primary

diff --git a/debian/patches/188_default_primary_to_first_busid.patch b/debian/patches/188_default_primary_to_first_busid.patch
new file mode 100644
index 0000000..5cfa79a
--- /dev/null
+++ b/debian/patches/188_default_primary_to_first_busid.patch
@@ -0,0 +1,15 @@
+Binary files xorg-server-ubuntu-git-patched/.git/index and xorg-server-ubuntu-git-working/.git/index differ
+diff -Nurp xorg-server-ubuntu-git-patched/hw/xfree86/common/xf86pciBus.c xorg-server-ubuntu-git-working/hw/xfree86/common/xf86pciBus.c
+--- xorg-server-ubuntu-git-patched/hw/xfree86/common/xf86pciBus.c	2009-10-23 16:18:49.000000000 -0700
++++ xorg-server-ubuntu-git-working/hw/xfree86/common/xf86pciBus.c	2009-10-23 18:49:36.000000000 -0700
+@@ -424,8 +424,8 @@ xf86PciProbe(void)
+                         primaryBus.id.pci = info;
+                     } else {
+ 		        xf86Msg(X_NOTICE,
+-			    "More than one possible primary device found\n");
+-		        primaryBus.type ^= (BusType)(-1);
++			    "More than one possible primary device found.  Using first one seen.\n");
++                        break;
+                     }
+ 		}
+ 	    }