On Sat, 20 Dec 2008 18:48:11 +0100 Julien Cristau <jcristau@debian.org> wrote: > > --- xorg.old/debian/xsfbs/xsfbs.sh Mon Jul 14 15:12:16 2008 > > +++ /opt/emdebian/trunk/x/xorg/trunk/xorg-7.3 > > +14/debian/xsfbs/xsfbs.sh Mon Jul 14 15:15:05 2008 @@ -141,7 > > +141,7 @@ message () { > > # pretty-print messages of arbitrary length > > reject_nondigits "$COLUMNS" > > - echo "$*" | fmt -t -w ${COLUMNS:-$DEFCOLUMNS} >&2 > > + echo "$*" > > } > > this kills the whole point of that function, so it's not acceptable in > this form. I guess it could check if fmt is available and only use it > then. I guessed it might be too severe - so, yes, a check for /usr/bin/fmt would be much appreciated. (I'll probably change the patch to do just that at the next cross-build - after Lenny.) > > observe () { > > @@ -734,7 +734,7 @@ > > ldsoconf="/etc/ld.so.conf" > > > > # is the line not already present? > > - if ! fgrep -qsx "$dir" "$ldsoconf"; then > > + if ! fgrep -qs "$dir" "$ldsoconf"; then > > observe "adding $dir directory to $ldsoconf" > > echo "$dir" >> "$ldsoconf" > > fi > > @@ -756,14 +756,14 @@ > > ldsoconf="/etc/ld.so.conf" > > > > # is the line present? > > - if fgrep -qsx "$dir" "$ldsoconf"; then > > + if fgrep -qs "$dir" "$ldsoconf"; then > > # are there any shared objects in the directory? > > if [ "$(echo "$dir"/lib*.so.*.*)" = "$dir/lib*.so.*.*" ]; then > > # glob expansion produced nothing, so no shared libraries > > # are present > > observe "removing $dir directory from $ldsoconf" > > # rewrite the file (very carefully) > > set +e > > - fgrep -svx "$dir" "$ldsoconf" > "$ldsoconf.dpkg-tmp" > > + fgrep -sv "$dir" "$ldsoconf" > "$ldsoconf.dpkg-tmp" > > fgrep_status=$? > > set -e > > case $fgrep_status in > > and this is a functional change, the -x has a meaning. That said, I > don't think these functions are used anywhere anymore (they became > obsolete when X libraries moved out of /usr/X11R6/lib and > into /usr/lib proper) so they'll get removed before long. Thanks for looking at it - hopefully, these obsolete routines could be removed before Squeeze. -- Neil Williams ============= http://www.data-freedom.org/ http://www.linux.codehelp.co.uk/ http://e-mail.is-not-s.ms/
Attachment:
pgpdLMBhYgUVj.pgp
Description: PGP signature