xorg-server: Changes to 'debian-experimental'
debian/changelog | 5 +++--
debian/xserver-xorg-core.bug.script | 23 +++++++++--------------
2 files changed, 12 insertions(+), 16 deletions(-)
New commits:
commit c6f2b7e5b0f3983e2ed455d6ee2ce102c61d27be
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Jan 29 11:51:38 2011 +0100
bug script: Check for /usr/X11R6 using ldd.
diff --git a/debian/changelog b/debian/changelog
index 8b702f5..bddb57b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,8 +10,9 @@ xorg-server (2:1.9.3.901-2) UNRELEASED; urgency=low
- 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.
+ - Check for obsolete libraries in the same way (/usr/X11R6/lib might
+ still exist in some cases, and be referenced in /etc/ld.so.conf, so
+ using ldd is sufficient to find out, see #546836 for an example).
-- 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 32b7ba2..9d0f54c 100644
--- a/debian/xserver-xorg-core.bug.script
+++ b/debian/xserver-xorg-core.bug.script
@@ -7,8 +7,8 @@ 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
+X11R6_LIBS=/usr/X11R6/lib
+LOCAL_LIBS=/usr/local/lib
# Pretty echo, underline the specified string:
pecho() {
@@ -39,20 +39,15 @@ 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."
+ echo
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."
+if ldd "$SERVER_BINARY" | grep -qs "$X11R6_LIBS"; then
+ pecho "The server is using obsolete libraries!"
+ ldd "$SERVER_BINARY" | grep "$X11R6_LIBS"
+ echo
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 e9c8cdf69499a467e31c0f03d780f041170c600d
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Jan 29 11:39:46 2011 +0100
bug script: Fix pecho() to also work if passed several parameters.
diff --git a/debian/xserver-xorg-core.bug.script b/debian/xserver-xorg-core.bug.script
index 1b2a5ce..32b7ba2 100644
--- a/debian/xserver-xorg-core.bug.script
+++ b/debian/xserver-xorg-core.bug.script
@@ -12,8 +12,8 @@ LOCAL_LIBS=/usr/local
# Pretty echo, underline the specified string:
pecho() {
- echo "$1"
- echo "$1"|sed 's/./-/g'
+ echo "$@"
+ echo "$@"|sed 's/./-/g'
}
exec >&3
Reply to: