[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

X Strike Force XFree86 SVN commit: r1186 - trunk/debian



Author: branden
Date: 2004-03-25 17:56:46 -0500 (Thu, 25 Mar 2004)
New Revision: 1186

Modified:
   trunk/debian/TODO
   trunk/debian/changelog
   trunk/debian/xserver-xfree86.config.in
Log:
If using Discover 1.x to scan for hardware in the XFree86 X server
packages' config scripts, pass the discover command the
"--disable=serial,parallel" option to avoid long delays on some systems.
We're certain to not find a VGA device on those buses anyway.
(Closes: #237046)


Modified: trunk/debian/TODO
===================================================================
--- trunk/debian/TODO	2004-03-25 22:32:53 UTC (rev 1185)
+++ trunk/debian/TODO	2004-03-25 22:56:46 UTC (rev 1186)
@@ -73,7 +73,6 @@
   + How do I debug crashes in the XFree86 X server?
 * #224909: patches to lnx_{io,kbd}.c to shut up noise from Linux 2.6
 * dump stderr from discover 1.x
-* #237046: pass --disable=serial,parallel to discover 1.x
 * #238407: XFree86 crashes on PPC in 0x1072260c in AccessXCancelRepeatKey
   (xkbi=0x0, key=64 '@') at xkbAccessX.c:387; possible fix exits upstream --
   see bug report

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2004-03-25 22:32:53 UTC (rev 1185)
+++ trunk/debian/changelog	2004-03-25 22:56:46 UTC (rev 1186)
@@ -48,8 +48,14 @@
     8MB internally, and the i830 driver defaults to 32MB is DRI is enabled,
     and 8MB otherwise.  (Closes: #238340)
 
- -- Branden Robinson <branden@debian.org>  Thu, 25 Mar 2004 17:29:37 -0500
+  * If using Discover 1.x to scan for hardware in the XFree86 X server
+    packages' config scripts, pass the discover command the
+    "--disable=serial,parallel" option to avoid long delays on some systems.
+    We're certain to not find a VGA device on those buses anyway.
+    (Closes: #237046)
 
+ -- Branden Robinson <branden@debian.org>  Thu, 25 Mar 2004 17:54:37 -0500
+
 xfree86 (4.3.0-7) unstable; urgency=medium
 
   * Urgency due to fix for FTBFS.  Yes -- I too am begging for it to stop.

Modified: trunk/debian/xserver-xfree86.config.in
===================================================================
--- trunk/debian/xserver-xfree86.config.in	2004-03-25 22:32:53 UTC (rev 1185)
+++ trunk/debian/xserver-xfree86.config.in	2004-03-25 22:56:46 UTC (rev 1186)
@@ -61,7 +61,8 @@
     rm -f $VENDOR_MODEL_FILE $SERVER_FILE $DRIVER_FILE
   else
     # must be Discover 1.x
-    DISCOVERED_VIDEO=$(discover --format="%V %M\t%S\t%D\n" video)
+    DISCOVERED_VIDEO=$(discover --disable=serial,parallel \
+                                --format="%V %M\t%S\t%D\n" video)
   fi
   echo "$DISCOVERED_VIDEO"
 }



Reply to: