X Strike Force XFree86 SVN commit: r1081 - trunk/debian
Author: branden
Date: 2004-02-19 19:57:15 -0500 (Thu, 19 Feb 2004)
New Revision: 1081
Modified:
trunk/debian/changelog
trunk/debian/shell-lib.sh
Log:
Stop passing -q to fgrep if we actually want output from it. Duh.
Thanks again to Filip Van Raemdonck.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-02-19 22:54:00 UTC (rev 1080)
+++ trunk/debian/changelog 2004-02-20 00:57:15 UTC (rev 1081)
@@ -25,8 +25,9 @@
- debian/control
* 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
- (thanks, Filip Van Raemdonck). (Closes: #233645)
+ 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)
- debian/shell-lib.sh
* Guard against potentially empty second argument to fgrep in
@@ -55,7 +56,7 @@
sunffb driver.
- debian/patches/073_sunffb_xaa_render_fb_support.diff
- -- Branden Robinson <branden@debian.org> Thu, 19 Feb 2004 17:31:00 -0500
+ -- Branden Robinson <branden@debian.org> Thu, 19 Feb 2004 19:55:13 -0500
xfree86 (4.3.0-2) unstable; urgency=low
Modified: trunk/debian/shell-lib.sh
===================================================================
--- trunk/debian/shell-lib.sh 2004-02-19 22:54:00 UTC (rev 1080)
+++ trunk/debian/shell-lib.sh 2004-02-20 00:57:15 UTC (rev 1081)
@@ -568,7 +568,7 @@
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 -qsvx "$dir" "$ldsoconf" > "$ldsoconf.dpkg-tmp"
+ fgrep -svx "$dir" "$ldsoconf" > "$ldsoconf.dpkg-tmp"
mv "$ldsoconf.dpkg-tmp" "$ldsoconf"
fi
fi
Reply to: