xorg-server: Changes to 'debian-experimental'
debian/changelog | 17 ++++
debian/xserver-xorg-core.bug.script | 133 +++++++++++++++---------------------
2 files changed, 74 insertions(+), 76 deletions(-)
New commits:
commit 3c1dbdff7b6a542b07c2090cf2d56edba8cd81ef
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Jan 28 02:44:54 2011 +0100
bug script: Detect /usr/local/lib and /usr/X11R6.
diff --git a/debian/changelog b/debian/changelog
index 0437a09..8b702f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,9 @@ xorg-server (2:1.9.3.901-2) UNRELEASED; urgency=low
making the output slightly more readable.
- Fix listing xorg.conf.d's contents. Previously, that was only done
if xorg.conf existed.
+ - Check for local libraries by running ldd on the server.
+ - Warn about possible obsolete libraries by checking for /usr/X11R6's
+ existence.
-- Cyril Brulebois <kibi@debian.org> Fri, 28 Jan 2011 01:30:13 +0100
diff --git a/debian/xserver-xorg-core.bug.script b/debian/xserver-xorg-core.bug.script
index 1438a95..1b2a5ce 100644
--- a/debian/xserver-xorg-core.bug.script
+++ b/debian/xserver-xorg-core.bug.script
@@ -2,10 +2,13 @@
PATH="/sbin:$PATH"
CONFIG_DIR=/etc/X11
+SERVER_BINARY=/usr/bin/Xorg
SERVER_SYMLINK="$CONFIG_DIR/X"
XORGCONFIG="$CONFIG_DIR/xorg.conf"
XORGCONFIG_DIR="$CONFIG_DIR/xorg.conf.d"
CONFIG_AUX_DIR=/var/lib/x11
+OLD_LIBS=/usr/X11R6
+LOCAL_LIBS=/usr/local
# Pretty echo, underline the specified string:
pecho() {
@@ -33,6 +36,23 @@ fi
echo
+if ldd "$SERVER_BINARY" | grep -qs "$LOCAL_LIBS"; then
+ pecho "The server is using local libraries!"
+ ldd "$SERVER_BINARY" | grep "$LOCAL_LIBS"
+else
+ echo "No local libraries in sight."
+fi
+
+echo
+
+if [ -d "$OLD_LIBS" ]; then
+ echo "There might still be some libraries in obsolete $OLD_LIBS directory!"
+else
+ echo "No obsolete libraries in sight."
+fi
+
+echo
+
if which lspci > /dev/null 2>&1; then
pecho "VGA-compatible devices on PCI bus:"
LC_ALL=C lspci | grep 'VGA compatible controller:'
commit 2eba00a7ed9b43e27cc60f69f4fd52f19989c753
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Jan 28 02:09:35 2011 +0100
bug script: Fix listing xorg.conf.d's contents.
Previously, that was only done if xorg.conf existed.
diff --git a/debian/changelog b/debian/changelog
index 26aa692..0437a09 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ xorg-server (2:1.9.3.901-2) UNRELEASED; urgency=low
all lines are newline-terminated anyway.
- Also use a “pecho” (pretty echo) function to underline some strings,
making the output slightly more readable.
+ - Fix listing xorg.conf.d's contents. Previously, that was only done
+ if xorg.conf existed.
-- Cyril Brulebois <kibi@debian.org> Fri, 28 Jan 2011 01:30:13 +0100
diff --git a/debian/xserver-xorg-core.bug.script b/debian/xserver-xorg-core.bug.script
index 71dfe57..1438a95 100644
--- a/debian/xserver-xorg-core.bug.script
+++ b/debian/xserver-xorg-core.bug.script
@@ -49,18 +49,21 @@ if [ -e "$XORGCONFIG" ]; then
echo
pecho "Contents of $XORGCONFIG:"
iconv -c -t ascii "$XORGCONFIG"
- echo
- if [ -d "$XORGCONFIG_DIR" ]; then
- pecho "Contents of $XORGCONFIG_DIR:"
- ls -l "$XORGCONFIG_DIR"
- echo
- fi
else
echo "$XORGCONFIG does not exist."
fi
echo
+if [ -d "$XORGCONFIG_DIR" ]; then
+ pecho "Contents of $XORGCONFIG_DIR:"
+ ls -l "$XORGCONFIG_DIR"
+else
+ echo "$XORGCONFIG_DIR does not exist."
+fi
+
+echo
+
KERNEL_VERSION=/proc/version
if [ -e "$KERNEL_VERSION" ]; then
commit 210e8468572db732737b5d3810c91405091ec57d
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Jan 28 02:04:11 2011 +0100
bug script: Prettify, using a pretty echo function.
diff --git a/debian/changelog b/debian/changelog
index 9620f1d..26aa692 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,10 @@ xorg-server (2:1.9.3.901-2) UNRELEASED; urgency=low
* Improve bug script:
- Stop reporting about roster and checksum for config file and server
symlink, they are no longer used.
+ - Replace printf with echo everywhere, it's slightly more readable and
+ all lines are newline-terminated anyway.
+ - Also use a “pecho” (pretty echo) function to underline some strings,
+ making the output slightly more readable.
-- Cyril Brulebois <kibi@debian.org> Fri, 28 Jan 2011 01:30:13 +0100
diff --git a/debian/xserver-xorg-core.bug.script b/debian/xserver-xorg-core.bug.script
index 160d990..71dfe57 100644
--- a/debian/xserver-xorg-core.bug.script
+++ b/debian/xserver-xorg-core.bug.script
@@ -7,94 +7,101 @@ XORGCONFIG="$CONFIG_DIR/xorg.conf"
XORGCONFIG_DIR="$CONFIG_DIR/xorg.conf.d"
CONFIG_AUX_DIR=/var/lib/x11
+# Pretty echo, underline the specified string:
+pecho() {
+ echo "$1"
+ echo "$1"|sed 's/./-/g'
+}
+
exec >&3
if [ -e "$SERVER_SYMLINK" ]; then
- printf "X server symlink status:\n"
+ pecho "X server symlink status:"
ls -dl "$SERVER_SYMLINK"
ls -dl "$(readlink "$SERVER_SYMLINK")"
else
- printf "$SERVER_SYMLINK does not exist.\n"
+ echo "$SERVER_SYMLINK does not exist."
fi
if ! [ -L "$SERVER_SYMLINK" ]; then
- printf "$SERVER_SYMLINK is not a symlink.\n"
+ echo "$SERVER_SYMLINK is not a symlink."
fi
if ! [ -x "$SERVER_SYMLINK" ]; then
- printf "$SERVER_SYMLINK is not executable.\n"
+ echo "$SERVER_SYMLINK is not executable."
fi
-printf "\n"
+echo
if which lspci > /dev/null 2>&1; then
- printf "VGA-compatible devices on PCI bus:\n"
+ pecho "VGA-compatible devices on PCI bus:"
LC_ALL=C lspci | grep 'VGA compatible controller:'
LC_ALL=C lspci -n | grep 'Class 0300:'
else
- printf "The lspci command was not found; not including PCI data.\n"
+ echo "The lspci command was not found; not including PCI data."
fi
-printf "\n"
+echo
if [ -e "$XORGCONFIG" ]; then
- printf "Xorg X server configuration file status:\n"
+ pecho "Xorg X server configuration file status:"
ls -dl "$XORGCONFIG"
- printf "\n"
- printf "Contents of $XORGCONFIG:\n"
+ echo
+ pecho "Contents of $XORGCONFIG:"
iconv -c -t ascii "$XORGCONFIG"
- printf "\n"
+ echo
if [ -d "$XORGCONFIG_DIR" ]; then
- printf "Contents of $XORGCONFIG_DIR:\n"
+ pecho "Contents of $XORGCONFIG_DIR:"
ls -l "$XORGCONFIG_DIR"
- printf "\n"
+ echo
fi
else
- printf "$XORGCONFIG does not exist.\n"
+ echo "$XORGCONFIG does not exist."
fi
-printf "\n"
+echo
KERNEL_VERSION=/proc/version
if [ -e "$KERNEL_VERSION" ]; then
- printf "Kernel version ($KERNEL_VERSION):\n"
+ pecho "Kernel version ($KERNEL_VERSION):"
cat /proc/version
else
- printf "No kernel version found (missing $KERNEL_VERSION).\n"
+ echo "No kernel version found (missing $KERNEL_VERSION)."
fi
-printf "\n"
+echo
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"
+ pecho "Xorg X server log files on system:"
ls -dlrt /var/log/Xorg.*.log 2>/dev/null
- printf "\n"
+ echo
for LOG in $XORG_LOGS; do
if [ -f "$LOG" ]; then
- printf "Contents of most recent Xorg X server log file\n"
- printf "%s:\n" "$LOG"
+ pecho "Contents of most recent Xorg X server log file ($LOG):"
cat "$LOG"
# the log files are large; only show the most recent
break
fi
done
else
- printf "No Xorg X server log files found.\n"
+ echo "No Xorg X server log files found."
fi
+echo
+
if [ -x /sbin/udevadm ]; then
- printf "\nudev information:\n"
+ pecho "udev information:"
/sbin/udevadm info --export-db | awk -F '\n' -v RS='\n\n' '/E: ID_INPUT/ { print; print "" }'
+ echo
fi
if [ -x /bin/dmesg ]; then
- printf "DRM Information from dmesg:\n"
+ pecho "DRM Information from dmesg:"
dmesg | egrep -i 'drm|agp'
+ echo
fi
-printf "\n"
-
# vim:set ai et sts=4 sw=4 tw=0:
commit 83a35ae90f305784b78711c47fc3170bb272ce60
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Jan 28 01:45:14 2011 +0100
bug script: Get rid of CVS keyword.
diff --git a/debian/xserver-xorg-core.bug.script b/debian/xserver-xorg-core.bug.script
index 8f17b11..160d990 100644
--- a/debian/xserver-xorg-core.bug.script
+++ b/debian/xserver-xorg-core.bug.script
@@ -1,7 +1,5 @@
#!/bin/sh
-# $Id$
-
PATH="/sbin:$PATH"
CONFIG_DIR=/etc/X11
SERVER_SYMLINK="$CONFIG_DIR/X"
commit 6b2be7436f9cdb9a72c4529b2def970b291b0ff0
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Jan 28 01:32:18 2011 +0100
bug script: Stop reporting about roster and checksum.
For both config file and server symlink, they are no longer used.
diff --git a/debian/changelog b/debian/changelog
index dbfe3de..9620f1d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg-server (2:1.9.3.901-2) UNRELEASED; urgency=low
+
+ * Improve bug script:
+ - Stop reporting about roster and checksum for config file and server
+ symlink, they are no longer used.
+
+ -- Cyril Brulebois <kibi@debian.org> Fri, 28 Jan 2011 01:30:13 +0100
+
xorg-server (2:1.9.3.901-1) experimental; urgency=low
* New upstream release (1.9.4 rc1).
diff --git a/debian/xserver-xorg-core.bug.script b/debian/xserver-xorg-core.bug.script
index a24bd0f..8f17b11 100644
--- a/debian/xserver-xorg-core.bug.script
+++ b/debian/xserver-xorg-core.bug.script
@@ -8,36 +8,10 @@ SERVER_SYMLINK="$CONFIG_DIR/X"
XORGCONFIG="$CONFIG_DIR/xorg.conf"
XORGCONFIG_DIR="$CONFIG_DIR/xorg.conf.d"
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"
exec >&3
-if [ -e "$SERVER_SYMLINK_ROSTER" ]; then
- printf "Contents of $SERVER_SYMLINK_ROSTER:\n"
- cat "$SERVER_SYMLINK_ROSTER"
-else
- printf "$SERVER_SYMLINK_ROSTER does not exist.\n"
-fi
-
-printf "\n"
-
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"
- else
- printf "%s target does not match checksum in %s.\n" \
- "$SERVER_SYMLINK" "$SERVER_SYMLINK_CHECKSUM"
- fi
- else
- printf "$SERVER_SYMLINK_CHECKSUM does not exist.\n"
- fi
- printf "\n"
printf "X server symlink status:\n"
ls -dl "$SERVER_SYMLINK"
ls -dl "$(readlink "$SERVER_SYMLINK")"
@@ -55,15 +29,6 @@ fi
printf "\n"
-if [ -e "$XORGCONFIG_ROSTER" ]; then
- printf "Contents of $XORGCONFIG_ROSTER:\n"
- cat "$XORGCONFIG_ROSTER"
-else
- printf "$XORGCONFIG_ROSTER does not exist.\n"
-fi
-
-printf "\n"
-
if which lspci > /dev/null 2>&1; then
printf "VGA-compatible devices on PCI bus:\n"
LC_ALL=C lspci | grep 'VGA compatible controller:'
@@ -75,18 +40,6 @@ fi
printf "\n"
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"
- else
- printf "%s does not match checksum in %s.\n" "$XORGCONFIG" \
- "$XORGCONFIG_CHECKSUM"
- fi
- else
- printf "$XORGCONFIG_CHECKSUM does not exist.\n"
- fi
- printf "\n"
printf "Xorg X server configuration file status:\n"
ls -dl "$XORGCONFIG"
printf "\n"
Reply to: