X Strike Force X.Org X11 SVN commit: r156 - trunk/debian
Author: branden
Date: 2005-06-09 11:54:04 -0500 (Thu, 09 Jun 2005)
New Revision: 156
Added:
trunk/debian/xlibmesa-dri.bug.script
trunk/debian/xlibs.bug.script
trunk/debian/xserver-xorg.bug.script
Removed:
trunk/debian/xlibmesa-dri.bug
trunk/debian/xlibs.bug
trunk/debian/xserver-xorg.bug
Modified:
trunk/debian/rules
Log:
Repair regressions to bug script handling, restoring functionality from
xfree86 4.3.0.dfsg.1-11 and later.
Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules 2005-06-09 16:46:47 UTC (rev 155)
+++ trunk/debian/rules 2005-06-09 16:54:04 UTC (rev 156)
@@ -417,8 +417,8 @@
egrep -v 'iso8859-(8|15)$$' $(DEBTREEDIR)/usr/X11R6/lib/X11/fonts/misc/fonts.alias > debian/xfonts-base/etc/X11/fonts/misc/xfonts-base.alias
cp -f $(DEBTREEDIR)/usr/X11R6/lib/X11/fonts/Type1/fonts.scale debian/xfonts-scalable/etc/X11/fonts/Type1/xfonts-scalable.scale
# install bug report assistance script
- install -m 755 -d debian/xlibs/usr/share/bug
- install -m 755 debian/xlibs.bug debian/xlibs/usr/share/bug/xlibs
+ install -m 755 -d debian/xlibs/usr/share/bug/xlibs
+ install -m 755 debian/xlibs.bug.script debian/xlibs/usr/share/bug/xlibs/script
dh_installdocs
dh_installexamples
dh_installmenu
@@ -454,15 +454,17 @@
dh_installdocs
# how about a dh_installbug? :)
ifndef NOT_BUILDING_XFREE86_X_SERVER
- install -m 755 -d debian/xserver-xorg/usr/share/bug
- install -m 755 debian/xserver-xorg.bug debian/xserver-xorg/usr/share/bug/xserver-xorg
- install -m 755 -d debian/xserver-xorg-dbg/usr/share/bug
- install -m 755 debian/xserver-xorg.bug debian/xserver-xorg-dbg/usr/share/bug/xserver-xorg-dbg
+ install -m 755 -d debian/xserver-xorg/usr/share/bug/xserver-xorg
+ install -m 644 debian/xserver-xorg.bug.presubj debian/xserver-xorg/usr/share/bug/xserver-xorg/presubj
+ install -m 755 debian/xserver-xorg.bug.script debian/xserver-xorg/usr/share/bug/xserver-xorg/script
+ install -m 755 -d debian/xserver-xorg-dbg/usr/share/bug/xserver-xorg-dbg
+ install -m 644 debian/xserver-xorg.bug.presubj debian/xserver-xorg-dbg/usr/share/bug/xserver-xorg-dbg/presubj
+ install -m 755 debian/xserver-xorg.bug.script debian/xserver-xorg-dbg/usr/share/bug/xserver-xorg-dbg/script
endif
# (Crudely) test to see if we're shipping xlibmesa-dri for the architecture being built.
ifneq (,$(findstring xlibmesa-dri,$(XLIBMESA_GL_SPECIAL_DEPENDS)))
- install -m 755 -d debian/xlibmesa-dri/usr/share/bug
- install -m 755 debian/xlibmesa-dri.bug debian/xlibmesa-dri/usr/share/bug/xlibmesa-dri
+ install -m 755 -d debian/xlibmesa-dri/usr/share/bug/xlibmesa-dri
+ install -m 755 debian/xlibmesa-dri.bug.script debian/xlibmesa-dri/usr/share/bug/xlibmesa-dri/script
endif
dh_installexamples
dh_installmenu
@@ -621,10 +623,12 @@
dh_installdirs
dh_installdocs
# how about a dh_installbug? :)
- install -m 755 -d debian/xserver-xorg/usr/share/bug
- install -m 755 debian/xserver-xorg.bug debian/xserver-xorg/usr/share/bug/xserver-xorg
- install -m 755 -d debian/xserver-xorg-dbg/usr/share/bug
- install -m 755 debian/xserver-xorg.bug debian/xserver-xorg-dbg/usr/share/bug/xserver-xorg-dbg
+ install -m 755 -d debian/xserver-xorg/usr/share/bug/xserver-xorg
+ install -m 644 debian/xserver-xorg.bug.presubj debian/xserver-xorg/usr/share/bug/xserver-xorg/presubj
+ install -m 755 debian/xserver-xorg.bug.script debian/xserver-xorg/usr/share/bug/xserver-xorg/script
+ install -m 755 -d debian/xserver-xorg-dbg/usr/share/bug/xserver-xorg-dbg
+ install -m 644 debian/xserver-xorg.bug.presubj debian/xserver-xorg-dbg/usr/share/bug/xserver-xorg-dbg/presubj
+ install -m 755 debian/xserver-xorg.bug.script debian/xserver-xorg-dbg/usr/share/bug/xserver-xorg-dbg/script
dh_installexamples
dh_installinit --noscripts
dh_installchangelogs
Deleted: trunk/debian/xlibmesa-dri.bug
===================================================================
--- trunk/debian/xlibmesa-dri.bug 2005-06-09 16:46:47 UTC (rev 155)
+++ trunk/debian/xlibmesa-dri.bug 2005-06-09 16:54:04 UTC (rev 156)
@@ -1,49 +0,0 @@
-#!/bin/sh
-
-# $Id: xlibmesa-dri.bug.script 2182 2005-02-10 06:39:04Z branden $
-
-PATH="/sbin:/usr/bin/X11:$PATH"
-
-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
-
-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
- printf "%s:\n" "$LOG" >&3
- cat "$LOG" >&3
- # the log files are large; only show the most recent
- break
- fi
- done
-else
- printf "No XFree86 X server log files found.\n" >&3
-fi
-
-printf "\n" >&3
-
-if which glxinfo >/dev/null 2>&1; then
- printf "GL-library linkage of glxinfo executable:\n" >&3
- ldd $(which glxinfo) | grep libGL >&3 2>/dev/null
- printf "\n" >&3
- printf "glxinfo reports:\n" >&3
- LIBGL_DEBUG=verbose glxinfo >&3 2>&1
-else
- printf "The glxinfo command was not found; " >&3
- printf "not including GLX extension information.\n" >&3
-fi
-
-# vim:set ai et sts=4 sw=4 tw=80:
Copied: trunk/debian/xlibmesa-dri.bug.script (from rev 154, trunk/debian/xlibmesa-dri.bug)
Deleted: trunk/debian/xlibs.bug
===================================================================
--- trunk/debian/xlibs.bug 2005-06-09 16:46:47 UTC (rev 155)
+++ trunk/debian/xlibs.bug 2005-06-09 16:54:04 UTC (rev 156)
@@ -1,39 +0,0 @@
-#!/bin/sh
-
-# $Id: xlibs.bug 1557 2004-06-22 18:16:23Z branden $
-
-XORG_LOGS=$(ls -dt /var/log/Xorg.*.log 2>/dev/null)
-
-if [ -n "$XORG_LOGS" ]; then
- for LOG in $XORG_LOGS; do
- if [ -f "$LOG" ]; then
- printf "Keyboard-related contents of X.Org X server log file\n%s:\n" \
- "$LOG" >&3
- egrep -5i '(keyboard|xkb|kbd)' "$LOG" >&3
- printf "\n" >&3
- fi
- done
- printf "X.Org X server log files on system:\n" >&3
- ls -dlrt /var/log/Xorg.*.log >&3 2>/dev/null
-else
- printf "No X.Org X server log files found.\n" >&3
-fi
-
-printf "\n" >&3
-
-if which xkbcomp >/dev/null 2>&1; then
- if [ -n "$DISPLAY" ]; then
- printf "Compiled XKB description for X server \"%s\":\n" "$DISPLAY" >&3
- if ! xkbcomp -o - "$DISPLAY" >&3; then
- printf "xkbcomp command reported failure.\n" >&3
- fi
- else
- printf "Cannot report compiled XKB description; \$DISPLAY null or undefined.\n"
- fi
-else
- printf "xkbcomp command not available.\n" >&3
-fi
-
-printf "\n" >&3
-
-# vim:set ai et sts=4 sw=4 tw=80:
Copied: trunk/debian/xlibs.bug.script (from rev 154, trunk/debian/xlibs.bug)
Deleted: trunk/debian/xserver-xorg.bug
===================================================================
--- trunk/debian/xserver-xorg.bug 2005-06-09 16:46:47 UTC (rev 155)
+++ trunk/debian/xserver-xorg.bug 2005-06-09 16:54:04 UTC (rev 156)
@@ -1,123 +0,0 @@
-#!/bin/sh
-
-# $Id: xserver-xfree86.bug 1250 2004-04-14 16:58:48Z branden $
-
-PATH="/sbin:$PATH"
-CONFIG_DIR=/etc/X11
-SERVER_SYMLINK="$CONFIG_DIR/X"
-XF86CONFIG="$CONFIG_DIR/XF86Config-4"
-XORGCONFIG="$CONFIG_DIR/XF86Config-4"
-CONFIG_AUX_DIR=/var/lib/xfree86
-SERVER_SYMLINK_CHECKSUM="$CONFIG_AUX_DIR/${SERVER_SYMLINK##*/}.md5sum"
-SERVER_SYMLINK_ROSTER="$CONFIG_AUX_DIR/${SERVER_SYMLINK##*/}.roster"
-XF86CONFIG_CHECKSUM="$CONFIG_AUX_DIR/${XF86CONFIG##*/}.md5sum"
-XORGCONFIG_CHECKSUM="$CONFIG_AUX_DIR/${XORGCONFIG##*/}.md5sum"
-XF86CONFIG_ROSTER="$CONFIG_AUX_DIR/${XF86CONFIG##*/}.roster"
-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:
Copied: trunk/debian/xserver-xorg.bug.script (from rev 154, trunk/debian/xserver-xorg.bug)
Reply to: