Author: branden
Date: 2003-08-01 13:11:00 -0500 (Fri, 01 Aug 2003)
New Revision: 352
Modified:
trunk/debian/changelog
trunk/debian/xserver-xfree86.config.in
Log:
debian/xserver-xfree86.config.in: explicitly assume the number of
autodetected video cards, corresponding X servers and drivers are zero,
and that the user does not have a multihead config; and do not let
discover trick wc into interpreting a blank line as a detected video card
(based on a patch by Nikita V. Youshchenko -- thanks!) (Closes: #195418)
Modified: trunk/debian/changelog
==============================================================================
--- trunk/debian/changelog 2003-08-01 14:33:32 UTC (rev 351)
+++ trunk/debian/changelog 2003-08-01 18:11:00 UTC (rev 352)
@@ -65,8 +65,14 @@
* debian/rules: update list of packages not to strip to reflect
xlibmesa3-dbg's split into xlibmesa3-gl-dbg and xlibmesa-glu-dbg
- -- Branden Robinson <[EMAIL PROTECTED]> Wed, 30 Jul 2003 17:22:49 -0500
+ * debian/xserver-xfree86.config.in: explicitly assume the number of
+ autodetected video cards, corresponding X servers and drivers are zero,
+ and that the user does not have a multihead config; and do not let
+ discover trick wc into interpreting a blank line as a detected video card
+ (based on a patch by Nikita V. Youshchenko -- thanks!) (Closes: #195418)
+ -- Branden Robinson <[EMAIL PROTECTED]> Fri, 1 Aug 2003 13:05:57 -0500
+
xfree86 (4.2.1-9) unstable; urgency=high
* urgency due to xterm security fixes; see below
Modified: trunk/debian/xserver-xfree86.config.in
==============================================================================
--- trunk/debian/xserver-xfree86.config.in 2003-08-01 14:33:32 UTC (rev
351)
+++ trunk/debian/xserver-xfree86.config.in 2003-08-01 18:11:00 UTC (rev
352)
@@ -14,6 +14,11 @@
THIS_SERVER=/usr/bin/X11/XFree86
XF86CONFIG=/etc/X11/XF86Config-4
+NCARDS=0
+NSERVERS=0
+NDRIVERS=0
+MULTIHEAD=
+
# get machine architecture
ARCH=$( dpkg --print-installation-architecture )
@@ -335,13 +340,16 @@
# collect information about installed video card(s), if possible
if which discover > /dev/null 2>&1; then
DISCOVERED_VIDEO=$(discover_video)
- 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)
- DRIVERS=$(echo "$DISCOVERED_VIDEO" | awk 'BEGIN { FS="\t" } {print $NF}' |
grep -v unknown | sort | uniq)
- NDRIVERS=$(echo "$DRIVERS" | wc -l)
- if [ $NCARDS -gt 1 ]; then
- MULTIHEAD=yes
+
+ 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)
+ DRIVERS=$(echo "$DISCOVERED_VIDEO" | awk 'BEGIN { FS="\t" } {print $NF}' |
grep -v unknown | sort | uniq)
+ NDRIVERS=$(echo "$DRIVERS" | wc -l)
+ if [ $NCARDS -gt 1 ]; then
+ MULTIHEAD=yes
+ fi
fi
fi
@@ -1056,4 +1064,4 @@
exit 0
-# vim:ai:et:sts=2:sw=2:tw=0:
+# vim:set ai et sts=2 sw=2 tw=0:
