Author: branden
Date: 2004-04-14 11:58:48 -0500 (Wed, 14 Apr 2004)
New Revision: 1250
Modified:
trunk/debian/changelog
trunk/debian/xserver-xfree86.bug
Log:
Re-order diagnostic output of xserver-xfree86 bug script to be skimmable
more quickly (in Branden's opinion, anyway).
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-04-14 16:31:23 UTC (rev 1249)
+++ trunk/debian/changelog 2004-04-14 16:58:48 UTC (rev 1250)
@@ -188,8 +188,11 @@
+ version xlibs-static-dev's conflict with and replacement of xlib6g-dev
at << 4.0
- -- Branden Robinson <[EMAIL PROTECTED]> Wed, 14 Apr 2004 11:20:31 -0500
+ * Re-order diagnostic output of xserver-xfree86 bug script to be skimmable
+ more quickly (in Branden's opinion, anyway).
+ -- Branden Robinson <[EMAIL PROTECTED]> Wed, 14 Apr 2004 11:42:02 -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.bug
===================================================================
--- trunk/debian/xserver-xfree86.bug 2004-04-14 16:31:23 UTC (rev 1249)
+++ trunk/debian/xserver-xfree86.bug 2004-04-14 16:58:48 UTC (rev 1250)
@@ -22,9 +22,6 @@
printf "\n" >&3
if [ -e "$SERVER_SYMLINK" ]; then
- printf "X server symlink status:\n" >&3
- ls -dl "$SERVER_SYMLINK" >&3
- ls -dl "$(readlink "$SERVER_SYMLINK")" >&3
if [ -e "$SERVER_SYMLINK_CHECKSUM" ]; then
if [ "$(readlink "$SERVER_SYMLINK" | md5sum)" = \
"$(cat "$SERVER_SYMLINK_CHECKSUM")" ]; then
@@ -37,6 +34,10 @@
else
printf "$SERVER_SYMLINK_CHECKSUM does not exist.\n" >&3
fi
+ printf "\n" >&3
+ printf "X server symlink status:\n" >&3
+ ls -dl "$SERVER_SYMLINK" >&3
+ ls -dl "$(readlink "$SERVER_SYMLINK")" >&3
else
printf "$SERVER_SYMLINK does not exist.\n" >&3
fi
@@ -71,12 +72,6 @@
printf "\n" >&3
if [ -e "$XF86CONFIG" ]; then
- printf "XFree86 X server configuration file status:\n" >&3
- ls -dl "$XF86CONFIG" >&3
- printf "\n" >&3
- printf "Contents of $XF86CONFIG:\n" >&3
- cat "$XF86CONFIG" >&3
- printf "\n" >&3
if [ -e "$XF86CONFIG_CHECKSUM" ]; then
if [ "$(md5sum "$XF86CONFIG")" = "$(cat "$XF86CONFIG_CHECKSUM")" ];
then
printf "%s unchanged from checksum in %s.\n" "$XF86CONFIG" \
@@ -88,6 +83,13 @@
else
printf "$XF86CONFIG_CHECKSUM does not exist.\n" >&3
fi
+ printf "\n" >&3
+ printf "XFree86 X server configuration file status:\n" >&3
+ ls -dl "$XF86CONFIG" >&3
+ printf "\n" >&3
+ printf "Contents of $XF86CONFIG:\n" >&3
+ cat "$XF86CONFIG" >&3
+ printf "\n" >&3
else
printf "$XF86CONFIG does not exist.\n" >&3
fi
@@ -97,6 +99,9 @@
XFREE86_LOGS=$(ls -dt /var/log/XFree86.*.log 2>/dev/null)
if [ -n "$XFREE86_LOGS" ]; then
+ printf "XFree86 X server log files on system:\n" >&3
+ ls -dlrt /var/log/XFree86.*.log >&3 2>/dev/null
+ printf "\n" >&3
for LOG in $XFREE86_LOGS; do
if [ -f "$LOG" ]; then
printf "Contents of most recent XFree86 X server log file\n" >&3
@@ -106,9 +111,6 @@
break
fi
done
- printf "\n" >&3
- printf "XFree86 X server log files on system:\n" >&3
- ls -dlrt /var/log/XFree86.*.log >&3 2>/dev/null
else
printf "No XFree86 X server log files found.\n" >&3
fi
