--- xfonts-base.old/debian/xsfbs/xsfbs.sh	Sun Jul  6 22:05:53 2008
+++ /opt/emdebian/trunk/x/xfonts-base/trunk/xfonts-base-1.0.0/debian/xsfbs/xsfbs.sh	Sun Jul  6 22:08:36 2008
@@ -148,7 +148,7 @@
 message () {
   # pretty-print messages of arbitrary length
   reject_nondigits "$COLUMNS"
-  echo "$*" | fmt -t -w ${COLUMNS:-$DEFCOLUMNS} >&2
+  echo "$*" 
 }
 
 observe () {
@@ -710,7 +710,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
@@ -732,14 +732,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