X Strike Force XFree86 SVN commit: r2182 - trunk/debian
Author: branden
Date: 2005-02-10 01:39:04 -0500 (Thu, 10 Feb 2005)
New Revision: 2182
Added:
trunk/debian/xlibmesa-dri.bug.script
trunk/debian/xlibs.bug.script
trunk/debian/xserver-xfree86.bug.script
Removed:
trunk/debian/xlibmesa-dri.bug
trunk/debian/xlibs.bug
trunk/debian/xserver-xfree86.bug
Modified:
trunk/debian/CHANGESETS
trunk/debian/TODO
trunk/debian/changelog
trunk/debian/rules
Log:
Migrate the bug scripts to the more sophisticated world order now in use.
+ Move current scripts from /usr/share/bug/$PACKAGE to
/usr/share/bug/$PACKAGE/script.
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2005-02-09 09:04:58 UTC (rev 2181)
+++ trunk/debian/CHANGESETS 2005-02-10 06:39:04 UTC (rev 2182)
@@ -301,4 +301,9 @@
shared between xfs and the X server. Thanks, Guillem! (Closes: #294320)
2181
+Migrate the bug scripts to the more sophisticated world order now in use.
++ Move current scripts from /usr/share/bug/$PACKAGE to
+ /usr/share/bug/$PACKAGE/script.
+ 2182
+
vim:set ai et sts=4 sw=4 tw=80:
Modified: trunk/debian/TODO
===================================================================
--- trunk/debian/TODO 2005-02-09 09:04:58 UTC (rev 2181)
+++ trunk/debian/TODO 2005-02-10 06:39:04 UTC (rev 2182)
@@ -18,9 +18,6 @@
---------------
* Migrate the bug scripts to the more sophisticated world order now in use.
- + Move current scripts from /usr/share/bug/$PACKAGE to
- /usr/share/bug/$PACKAGE/script (renaming in SVN from $PACKAGE.bug to
- $PACKAGE.bug.script).
+ Add $PACKAGE.bug.presubj files wherever necessary.
4.3.0.dfsg.1-12
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-02-09 09:04:58 UTC (rev 2181)
+++ trunk/debian/changelog 2005-02-10 06:39:04 UTC (rev 2182)
@@ -235,8 +235,12 @@
* Add patch #099v by Guillem Jover to fix a SEGV in font server code
shared between xfs and the X server. Thanks, Guillem! (Closes: #294320)
- -- Branden Robinson <branden@debian.org> Wed, 9 Feb 2005 04:00:07 -0500
+ * Migrate the bug scripts to the more sophisticated world order now in use.
+ + Move current scripts from /usr/share/bug/$PACKAGE to
+ /usr/share/bug/$PACKAGE/script.
+ -- Branden Robinson <branden@debian.org> Thu, 10 Feb 2005 01:36:12 -0500
+
xfree86 (4.3.0.dfsg.1-10) unstable; urgency=medium
* Upload urgency set to medium due to fix for stable-release-critical bugs
Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules 2005-02-09 09:04:58 UTC (rev 2181)
+++ trunk/debian/rules 2005-02-10 06:39:04 UTC (rev 2182)
@@ -421,8 +421,8 @@
cp -f $(DEBTREEDIR)/usr/X11R6/lib/X11/fonts/Speedo/fonts.scale debian/xfonts-scalable/etc/X11/fonts/Speedo/xfonts-scalable.scale
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
@@ -458,15 +458,15 @@
dh_installdocs
# how about a dh_installbug? :)
ifndef NOT_BUILDING_XFREE86_X_SERVER
- install -m 755 -d debian/xserver-xfree86/usr/share/bug
- install -m 755 debian/xserver-xfree86.bug debian/xserver-xfree86/usr/share/bug/xserver-xfree86
- install -m 755 -d debian/xserver-xfree86-dbg/usr/share/bug
- install -m 755 debian/xserver-xfree86.bug debian/xserver-xfree86-dbg/usr/share/bug/xserver-xfree86-dbg
+ install -m 755 -d debian/xserver-xfree86/usr/share/bug/xserver-xfree86
+ install -m 755 debian/xserver-xfree86.bug.script debian/xserver-xfree86/usr/share/bug/xserver-xfree86/script
+ install -m 755 -d debian/xserver-xfree86-dbg/usr/share/bug/xserver-xfree86-dbg
+ install -m 755 debian/xserver-xfree86.bug.script debian/xserver-xfree86-dbg/usr/share/bug/xserver-xfree86-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
@@ -600,10 +600,10 @@
dh_installdirs
dh_installdocs
# how about a dh_installbug? :)
- install -m 755 -d debian/xserver-xfree86/usr/share/bug
- install -m 755 debian/xserver-xfree86.bug debian/xserver-xfree86/usr/share/bug/xserver-xfree86
- install -m 755 -d debian/xserver-xfree86-dbg/usr/share/bug
- install -m 755 debian/xserver-xfree86.bug debian/xserver-xfree86-dbg/usr/share/bug/xserver-xfree86-dbg
+ install -m 755 -d debian/xserver-xfree86/usr/share/bug/xserver-xfree86
+ install -m 755 debian/xserver-xfree86.bug.script debian/xserver-xfree86/usr/share/bug/xserver-xfree86/script
+ install -m 755 -d debian/xserver-xfree86-dbg/usr/share/bug/xserver-xfree86-dbg
+ install -m 755 debian/xserver-xfree86.bug.script debian/xserver-xfree86-dbg/usr/share/bug/xserver-xfree86-dbg/script
dh_installexamples
dh_installinit --noscripts
dh_installchangelogs
Deleted: trunk/debian/xlibmesa-dri.bug
===================================================================
--- trunk/debian/xlibmesa-dri.bug 2005-02-09 09:04:58 UTC (rev 2181)
+++ trunk/debian/xlibmesa-dri.bug 2005-02-10 06:39:04 UTC (rev 2182)
@@ -1,49 +0,0 @@
-#!/bin/sh
-
-# $Id$
-
-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 2180, trunk/debian/xlibmesa-dri.bug)
Deleted: trunk/debian/xlibs.bug
===================================================================
--- trunk/debian/xlibs.bug 2005-02-09 09:04:58 UTC (rev 2181)
+++ trunk/debian/xlibs.bug 2005-02-10 06:39:04 UTC (rev 2182)
@@ -1,39 +0,0 @@
-#!/bin/sh
-
-# $Id$
-
-XFREE86_LOGS=$(ls -dt /var/log/XFree86.*.log 2>/dev/null)
-
-if [ -n "$XFREE86_LOGS" ]; then
- for LOG in $XFREE86_LOGS; do
- if [ -f "$LOG" ]; then
- printf "Keyboard-related contents of XFree86 X server log file\n%s:\n" \
- "$LOG" >&3
- egrep -5i '(keyboard|xkb|kbd)' "$LOG" >&3
- printf "\n" >&3
- fi
- done
- 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
-
-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 2180, trunk/debian/xlibs.bug)
Deleted: trunk/debian/xserver-xfree86.bug
===================================================================
--- trunk/debian/xserver-xfree86.bug 2005-02-09 09:04:58 UTC (rev 2181)
+++ trunk/debian/xserver-xfree86.bug 2005-02-10 06:39:04 UTC (rev 2182)
@@ -1,120 +0,0 @@
-#!/bin/sh
-
-# $Id$
-
-PATH="/sbin:$PATH"
-CONFIG_DIR=/etc/X11
-SERVER_SYMLINK="$CONFIG_DIR/X"
-XF86CONFIG="$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"
-XF86CONFIG_ROSTER="$CONFIG_AUX_DIR/${XF86CONFIG##*/}.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 "$XF86CONFIG_ROSTER" ]; then
- printf "Contents of $XF86CONFIG_ROSTER:\n" >&3
- cat "$XF86CONFIG_ROSTER" >&3
-else
- printf "$XF86CONFIG_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 "$XF86CONFIG" ]; then
- if [ -e "$XF86CONFIG_CHECKSUM" ]; then
- if [ "$(md5sum "$XF86CONFIG")" = "$(cat "$XF86CONFIG_CHECKSUM")" ]; then
- printf "%s unchanged from checksum in %s.\n" "$XF86CONFIG" \
- "$XF86CONFIG_CHECKSUM" >&3
- else
- printf "%s does not match checksum in %s.\n" "$XF86CONFIG" \
- "$XF86CONFIG_CHECKSUM" >&3
- fi
- 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
-
-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
-
-# vim:set ai et sts=4 sw=4 tw=80:
Copied: trunk/debian/xserver-xfree86.bug.script (from rev 2180, trunk/debian/xserver-xfree86.bug)
Reply to: