X Strike Force XFree86 SVN commit: r1468 - trunk/debian
Author: branden
Date: 2004-05-28 21:53:38 -0500 (Fri, 28 May 2004)
New Revision: 1468
Modified:
trunk/debian/CHANGESETS
trunk/debian/changelog
trunk/debian/xserver-xfree86.config.in
Log:
Fix hang in xserver-xfree86 config script by telling grep what file to
search.
Set upload urgency to medium.
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2004-05-29 02:52:20 UTC (rev 1467)
+++ trunk/debian/CHANGESETS 2004-05-29 02:53:38 UTC (rev 1468)
@@ -8,4 +8,8 @@
(It should always be safe to merge the latest version of TODO or CHANGESETS
files anywhere.)
+Fix hang in xserver-xfree86 config script by telling grep what file to
+search.
+ 1468
+
vim:set ai et sts=4 sw=4 tw=80:
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-05-29 02:52:20 UTC (rev 1467)
+++ trunk/debian/changelog 2004-05-29 02:53:38 UTC (rev 1468)
@@ -1,3 +1,14 @@
+xfree86 (4.3.0.dfsg.1-3+SVN) unstable; urgency=medium
+
+ * The "thanks for the 'testing'" release.
+
+ Changes by Branden Robinson:
+
+ * Fix hang in xserver-xfree86 config script by telling grep what file to
+ search.
+
+ -- Branden Robinson <branden@debian.org> Fri, 28 May 2004 21:49:53 -0500
+
xfree86 (4.3.0.dfsg.1-3) unstable; urgency=low
Changes by Branden Robinson:
Modified: trunk/debian/xserver-xfree86.config.in
===================================================================
--- trunk/debian/xserver-xfree86.config.in 2004-05-29 02:52:20 UTC (rev 1467)
+++ trunk/debian/xserver-xfree86.config.in 2004-05-29 02:53:38 UTC (rev 1468)
@@ -598,7 +598,7 @@
DRIVER_LIST=${DRIVER_LIST:=ati, chips, fbdev, glint, mga, newport, nv, s3, s3virge, savage, sis, tdfx, trident}
# Are we dealing with an SGI Indy or Indigo2?
if [ -e /proc/cpuinfo ]; then
- if grep -q "system type.*:.*SGI Ind"; then
+ if grep -q "system type.*:.*SGI Ind" /proc/cpuinfo; then
PRIORITY=medium
DEFAULT_DRIVER=newport
fi
@@ -712,7 +712,7 @@
# SGI Indigo2 XLs require a special hack, per Guido Guenther (see Debian
# #249614).
if [ -e /proc/cpuinfo ]; then
- if grep -q "system type.*:.*SGI Indigo2"; then
+ if grep -q "system type.*:.*SGI Indigo2" /proc/cpuinfo; then
PRIORITY=medium
DEFAULT=1
fi
Reply to: