Author: branden
Date: 2004-02-20 11:00:06 -0500 (Fri, 20 Feb 2004)
New Revision: 1084
Modified:
trunk/debian/changelog
trunk/debian/shell-lib.sh
Log:
Only attempt to remove /usr/X11R6/lib directory from /etc/ld.so.conf if it
is in the file.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-02-20 06:03:58 UTC (rev 1083)
+++ trunk/debian/changelog 2004-02-20 16:00:06 UTC (rev 1084)
@@ -27,7 +27,9 @@
* Fix missing second argument to fgrep in deregister_x_lib_dir_with_ld_so(),
which can cause it to block, attempting to read from standard input; also
drop -q from fgrep's option list, since we actually want to do something
- with its output (thanks, Filip Van Raemdonck). (Closes: #233645)
+ with its output; finally, only attempt to remove /usr/X11R6/lib directory
+ from /etc/ld.so.conf if it is in the file (thanks, Filip Van Raemdonck).
+ (Closes: #233645)
- debian/shell-lib.sh
* Guard against potentially empty second argument to fgrep in
@@ -56,7 +58,7 @@
sunffb driver.
- debian/patches/073_sunffb_xaa_render_fb_support.diff
- -- Branden Robinson <[EMAIL PROTECTED]> Thu, 19 Feb 2004 19:55:13 -0500
+ -- Branden Robinson <[EMAIL PROTECTED]> Fri, 20 Feb 2004 10:58:40 -0500
xfree86 (4.3.0-2) unstable; urgency=low
Modified: trunk/debian/shell-lib.sh
===================================================================
--- trunk/debian/shell-lib.sh 2004-02-20 06:03:58 UTC (rev 1083)
+++ trunk/debian/shell-lib.sh 2004-02-20 16:00:06 UTC (rev 1084)
@@ -568,7 +568,9 @@
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"
- fgrep -svx "$dir" "$ldsoconf" > "$ldsoconf.dpkg-tmp"
+ if fgrep -qsx "$dir" "$ldsoconf"; then
+ fgrep -svx "$dir" "$ldsoconf" > "$ldsoconf.dpkg-tmp"
+ fi
mv "$ldsoconf.dpkg-tmp" "$ldsoconf"
fi
fi
