Author: branden
Date: 2004-05-28 21:56:18 -0500 (Fri, 28 May 2004)
New Revision: 1469
Modified:
branches/4.3.0/sid/debian/CHANGESETS
branches/4.3.0/sid/debian/TODO
branches/4.3.0/sid/debian/changelog
branches/4.3.0/sid/debian/xserver-xfree86.config.in
Log:
Merge revisions 1463 to HEAD from trunk.
Modified: branches/4.3.0/sid/debian/CHANGESETS
===================================================================
--- branches/4.3.0/sid/debian/CHANGESETS 2004-05-29 02:53:38 UTC (rev
1468)
+++ branches/4.3.0/sid/debian/CHANGESETS 2004-05-29 02:56:18 UTC (rev
1469)
@@ -8,29 +8,8 @@
(It should always be safe to merge the latest version of TODO or CHANGESETS
files anywhere.)
-Begin new changelog entry.
- 1445
+Fix hang in xserver-xfree86 config script by telling grep what file to
+search.
+ 1468
-#251119: Fix breakage of NumLock.
- 1452
-
-Rework xserver-xfree86/config/device/driver debconf logic. Attempt to populate
-driver choices by scanning filesystem first. observe() if we do not find any.
-Set default driver on an architecture-specific basis. Use vga for alpha; vesa
-for amd64, hurd-i386, and i386; and fbdev for everyone else, except mips and
-mipsel boxen that report themselves as "SGI Ind*" machines via /proc/cpuinfo,
-for which we default to newport. (Closes: #226193, #249614) Update
-xserver-xfree86/config/device/bus_id logic. Add comments describing why we
-don't default to a blank answer all the time. Use "1" as the default answer on
-systems that identify themselves as "SGI Indigo2" machines via /proc/cpuinfo.
-Update template description to tell SGI Indigo2 XL users to specify "1" for the
-BusID.
- 1454
-
-Move XDeviceTimeCoord(3x) manpage from libx11-dev to libxi-dev, where it
-belongs. Make libxi-dev conflict/replace libx11-dev (<< 4.3.0.dfsg.1-3)
-so that upgrades proceed smoothly. Thanks to Stephen Kitt for identifying
-this problem. (Closes: #233839)
- 1459
-
vim:set ai et sts=4 sw=4 tw=80:
Modified: branches/4.3.0/sid/debian/TODO
===================================================================
--- branches/4.3.0/sid/debian/TODO 2004-05-29 02:53:38 UTC (rev 1468)
+++ branches/4.3.0/sid/debian/TODO 2004-05-29 02:56:18 UTC (rev 1469)
@@ -12,7 +12,7 @@
These items are listed in descending order of priority; that is, the most
important items come first.
-4.3.0.dfsg.1-4
+4.3.0.dfsg.1-5
--------------
* #237583: xlibs: BKSL key doesn't work when 'us' is one of multiple layouts;
@@ -34,7 +34,7 @@
XAA and Render support for the sunffb driver. Mmmm, burning manflesh...
* Apply "other half" of SPARC 64-bit avoidance patch to Mesa; see #241331.
-4.3.0.dfsg.1-5
+4.3.0.dfsg.1-6
--------------
* Re-do migration of /usr/X11R6/lib/X11/{app-defaults,xkb}:
Modified: branches/4.3.0/sid/debian/changelog
===================================================================
--- branches/4.3.0/sid/debian/changelog 2004-05-29 02:53:38 UTC (rev 1468)
+++ branches/4.3.0/sid/debian/changelog 2004-05-29 02:56:18 UTC (rev 1469)
@@ -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 <[EMAIL PROTECTED]> Fri, 28 May 2004 21:49:53 -0500
+
xfree86 (4.3.0.dfsg.1-3) unstable; urgency=low
Changes by Branden Robinson:
Modified: branches/4.3.0/sid/debian/xserver-xfree86.config.in
===================================================================
--- branches/4.3.0/sid/debian/xserver-xfree86.config.in 2004-05-29 02:53:38 UTC
(rev 1468)
+++ branches/4.3.0/sid/debian/xserver-xfree86.config.in 2004-05-29 02:56:18 UTC
(rev 1469)
@@ -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
