X Strike Force X.Org X11 SVN commit: r3962 - trunk/xserver/xorg-server/debian
Author: julien
Date: 2006-11-07 01:33:19 -0500 (Tue, 07 Nov 2006)
New Revision: 3962
Added:
trunk/xserver/xorg-server/debian/xserver-xorg-core.bug.script
Modified:
trunk/xserver/xorg-server/debian/changelog
trunk/xserver/xorg-server/debian/rules
Log:
* Add reportbug script stolen from the monolith, to add the user's config
and log file in every bug report.
Modified: trunk/xserver/xorg-server/debian/changelog
===================================================================
--- trunk/xserver/xorg-server/debian/changelog 2006-11-07 05:00:30 UTC (rev 3961)
+++ trunk/xserver/xorg-server/debian/changelog 2006-11-07 06:33:19 UTC (rev 3962)
@@ -11,8 +11,10 @@
* Don't build-depend on libdrm-dev on hurd-i386 (closes: #358015). Thanks,
Samuel Thibault.
* Update hurd support patch (Closes: #356300). Thanks, Samuel Thibault.
+ * Add reportbug script stolen from the monolith, to add the user's config
+ and log file in every bug report.
- -- Julien Cristau <julien.cristau@ens-lyon.org> Tue, 31 Oct 2006 18:22:56 +0100
+ -- Julien Cristau <julien.cristau@ens-lyon.org> Tue, 7 Nov 2006 07:32:43 +0100
xorg-server (2:1.1.1-10) unstable; urgency=low
Modified: trunk/xserver/xorg-server/debian/rules
===================================================================
--- trunk/xserver/xorg-server/debian/rules 2006-11-07 05:00:30 UTC (rev 3961)
+++ trunk/xserver/xorg-server/debian/rules 2006-11-07 06:33:19 UTC (rev 3962)
@@ -103,6 +103,8 @@
$(INSTALL) -d $(CURDIR)/debian/xserver-xorg-dev/usr/share/xserver-xorg
$(INSTALL) -m644 $(CURDIR)/debian/serverabiver \
$(CURDIR)/debian/xserver-xorg-dev/usr/share/xserver-xorg/serverabiver
+ $(INSTALL) -m 755 -d debian/xserver-xorg-core/usr/share/bug/xserver-xorg-core
+ $(INSTALL) -m 755 debian/xserver-xorg-core.bug.script debian/xserver-xorg-core/usr/share/bug/xserver-xorg-core/script
dh_link
dh_strip --exclude=usr/lib/xorg/modules
find debian/xserver-xorg-core/usr/lib/xorg/modules -name "lib*.so" | \
Copied: trunk/xserver/xorg-server/debian/xserver-xorg-core.bug.script (from rev 3961, tags/monolith/6.9.0.dfsg.1-6/debian/xserver-xorg.bug.script)
===================================================================
--- trunk/xserver/xorg-server/debian/xserver-xorg-core.bug.script (rev 0)
+++ trunk/xserver/xorg-server/debian/xserver-xorg-core.bug.script 2006-11-07 06:33:19 UTC (rev 3962)
@@ -0,0 +1,120 @@
+#!/bin/sh
+
+# $Id$
+
+PATH="/sbin:$PATH"
+CONFIG_DIR=/etc/X11
+SERVER_SYMLINK="$CONFIG_DIR/X"
+XORGCONFIG="$CONFIG_DIR/xorg.conf"
+CONFIG_AUX_DIR=/var/lib/x11
+SERVER_SYMLINK_CHECKSUM="$CONFIG_AUX_DIR/${SERVER_SYMLINK##*/}.md5sum"
+SERVER_SYMLINK_ROSTER="$CONFIG_AUX_DIR/${SERVER_SYMLINK##*/}.roster"
+XORGCONFIG_CHECKSUM="$CONFIG_AUX_DIR/${XORGCONFIG##*/}.md5sum"
+XORGCONFIG_ROSTER="$CONFIG_AUX_DIR/${XORGCONFIG##*/}.roster"
+
+if [ -e "$SERVER_SYMLINK_ROSTER" ]; then
+ printf "Contents of $SERVER_SYMLINK_ROSTER:\n" >&3
+ cat "$SERVER_SYMLINK_ROSTER" >&3
+else
+ printf "$SERVER_SYMLINK_ROSTER does not exist.\n" >&3
+fi
+
+printf "\n" >&3
+
+if [ -e "$SERVER_SYMLINK" ]; then
+ if [ -e "$SERVER_SYMLINK_CHECKSUM" ]; then
+ if [ "$(readlink "$SERVER_SYMLINK" | md5sum)" = \
+ "$(cat "$SERVER_SYMLINK_CHECKSUM")" ]; then
+ printf "%s target unchanged from checksum in %s.\n" \
+ "$SERVER_SYMLINK" "$SERVER_SYMLINK_CHECKSUM" >&3
+ else
+ printf "%s target does not match checksum in %s.\n" \
+ "$SERVER_SYMLINK" "$SERVER_SYMLINK_CHECKSUM" >&3
+ fi
+ 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
+
+if ! [ -L "$SERVER_SYMLINK" ]; then
+ printf "$SERVER_SYMLINK is not a symlink.\n" >&3
+fi
+
+if ! [ -x "$SERVER_SYMLINK" ]; then
+ printf "$SERVER_SYMLINK is not executable.\n" >&3
+fi
+
+printf "\n" >&3
+
+if [ -e "$XORGCONFIG_ROSTER" ]; then
+ printf "Contents of $XORGCONFIG_ROSTER:\n" >&3
+ cat "$XORGCONFIG_ROSTER" >&3
+else
+ printf "$XORGCONFIG_ROSTER does not exist.\n" >&3
+fi
+
+printf "\n" >&3
+
+if which lspci > /dev/null 2>&1; then
+ printf "VGA-compatible devices on PCI bus:\n" >&3
+ LC_ALL=C lspci | grep 'VGA compatible controller:' >&3
+ LC_ALL=C lspci -n | grep 'Class 0300:' >&3
+else
+ printf "The lspci command was not found; not including PCI data.\n" >&3
+fi
+
+printf "\n" >&3
+
+if [ -e "$XORGCONFIG" ]; then
+ if [ -e "$XORGCONFIG_CHECKSUM" ]; then
+ if [ "$(md5sum "$XORGCONFIG")" = "$(cat "$XORGCONFIG_CHECKSUM")" ]; then
+ printf "%s unchanged from checksum in %s.\n" "$XORGCONFIG" \
+ "$XORGCONFIG_CHECKSUM" >&3
+ else
+ printf "%s does not match checksum in %s.\n" "$XORGCONFIG" \
+ "$XORGCONFIG_CHECKSUM" >&3
+ fi
+ else
+ printf "$XORGCONFIG_CHECKSUM does not exist.\n" >&3
+ fi
+ printf "\n" >&3
+ printf "Xorg X server configuration file status:\n" >&3
+ ls -dl "$XORGCONFIG" >&3
+ printf "\n" >&3
+ printf "Contents of $XORGCONFIG:\n" >&3
+ cat "$XORGCONFIG" >&3
+ printf "\n" >&3
+else
+ printf "$XORGCONFIG does not exist.\n" >&3
+fi
+
+printf "\n" >&3
+
+XORG_LOGS=$(ls -dt /var/log/Xorg.*.log 2>/dev/null)
+
+if [ -n "$XORG_LOGS" ]; then
+ printf "Xorg X server log files on system:\n" >&3
+ ls -dlrt /var/log/Xorg.*.log >&3 2>/dev/null
+ printf "\n" >&3
+ for LOG in $XORG_LOGS; do
+ if [ -f "$LOG" ]; then
+ printf "Contents of most recent Xorg X server log file\n" >&3
+ printf "%s:\n" "$LOG" >&3
+ cat "$LOG" >&3
+ # the log files are large; only show the most recent
+ break
+ fi
+ done
+else
+ printf "No Xorg X server log files found.\n" >&3
+fi
+
+printf "\n" >&3
+
+# vim:set ai et sts=4 sw=4 tw=0:
Reply to: