[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: xorg-server: Changes to 'debian-experimental'



On Fri, Jan 28, 2011 at 08:28:20 +0000, Cyril Brulebois wrote:

> 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

/usr/X11R6/lib?

> +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

not sure the else is needed.

> +
> +echo
> +
>  if which lspci > /dev/null 2>&1; then
>      pecho "VGA-compatible devices on PCI bus:"
>      LC_ALL=C lspci | grep 'VGA compatible controller:'
> 
[...]
> 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 "$@"?

> +    echo "$1"|sed 's/./-/g'
> +}
> +

Attachment: signature.asc
Description: Digital signature


Reply to: