X Strike Force XFree86 SVN commit: r1720 - trunk/debian
Author: fabbione
Date: 2004-08-10 11:51:13 -0500 (Tue, 10 Aug 2004)
New Revision: 1720
Modified:
trunk/debian/CHANGESETS
trunk/debian/changelog
trunk/debian/xserver-xfree86.config.in
Log:
* Add checks to NSERVERS and NDRIVERS to avoid an "unknown" card to be
counted as a supported one if the user choose to autodetected.
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2004-08-10 16:44:25 UTC (rev 1719)
+++ trunk/debian/CHANGESETS 2004-08-10 16:51:13 UTC (rev 1720)
@@ -258,4 +258,8 @@
only available for hurd-i386 and i386.
1719
+Add checks to NSERVERS and NDRIVERS to avoid an "unknown" card to be
+counted as a supported one if the user choose to autodetected.
+ 1720
+
vim:set ai et sts=4 sw=4 tw=80:
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-08-10 16:44:25 UTC (rev 1719)
+++ trunk/debian/changelog 2004-08-10 16:51:13 UTC (rev 1720)
@@ -223,6 +223,9 @@
* Fix default drivers lists in xserver-xfree86.config.in. The via driver is
only available for hurd-i386 and i386.
+ * Add checks to NSERVERS and NDRIVERS to avoid an "unknown" card to be
+ counted as a supported one if the user choose to autodetected.
+
-- Branden Robinson <branden@debian.org> Mon, 9 Aug 2004 14:22:21 -0500
xfree86 (4.3.0.dfsg.1-6) unstable; urgency=low
Modified: trunk/debian/xserver-xfree86.config.in
===================================================================
--- trunk/debian/xserver-xfree86.config.in 2004-08-10 16:44:25 UTC (rev 1719)
+++ trunk/debian/xserver-xfree86.config.in 2004-08-10 16:51:13 UTC (rev 1720)
@@ -520,9 +520,9 @@
if [ -n "$DISCOVERED_VIDEO" ]; then
NCARDS=$(echo "$DISCOVERED_VIDEO" | wc -l)
SERVERS=$(echo "$DISCOVERED_VIDEO" | awk 'BEGIN { FS="\t" } {print $2}' | grep -v unknown | sort | uniq)
- NSERVERS=$(echo "$SERVERS" | wc -l)
+ if [ -n "$SERVERS" ]; then NSERVERS=$(echo "$SERVERS" | wc -l); fi
DRIVERS=$(echo "$DISCOVERED_VIDEO" | awk 'BEGIN { FS="\t" } {print $NF}' | grep -v unknown | sort | uniq)
- NDRIVERS=$(echo "$DRIVERS" | wc -l)
+ if [ -n "$DRIVERS" ]; then NDRIVERS=$(echo "$DRIVERS" | wc -l); fi
if [ $NCARDS -gt 1 ]; then
MULTIHEAD=yes
fi
Reply to: