Index: xc/ChangeLog
===================================================================
RCS file: /cvs/xorg/xc/ChangeLog,v
retrieving revision 1.646
diff -u -2 -0 -r1.646 ChangeLog
--- xc/ChangeLog	7 Jan 2005 18:53:41 -0000	1.646
+++ xc/ChangeLog	9 Jan 2005 00:31:17 -0000
@@ -1,20 +1,30 @@
+2005-01-08 Roland Mainz <roland.mainz@nrubsig.org>
+	* xc/programs/Xserver/Xprint/etc/init.d/xprint.cpp
+	Bugzilla #2240 (https://bugs.freedesktop.org/show_bug.cgi?id=2240)
+	attachment #xxx (https://bugs.freedesktop.org/attachment.cgi?id=xxx):
+	Fix incorrect usage of /usr/bin/tr in startup script (the used
+	"[\n]" is neither correct or portable, using "\n" seems to be
+	sufficient (this fixes various "random" issues, including
+	including Debian bug #258419 and Debian bug #264983).
+	Patch by Drew Parsons <dparsons@debian.org>.
+
 2005-01-07 Alan Hourihane <alanh@fairlite.demon.co.uk>
 	* xc/lib/GL/mesa/tnl/Imakefile.inc
 	Add missing t_vb_cull.c
 
 2005-01-06 Alan Hourihane <alanh@fairlite.demon.co.uk>
 	* xc/extras/Mesa/src/mesa/drivers/dri/i915/i830_context.c
 	* xc/extras/Mesa/src/mesa/drivers/dri/i915/intel_context.c
 	* xc/extras/Mesa/src/mesa/drivers/dri/i915/i915_context.c
 	Cleanup of extension string handling (Ian Romanick)
 
 2005-01-06 Alan Hourihane <alanh@fairlite.demon.co.uk>
 	* xc/extras/drm/linux/drm_pm.h
 	Missing file
 
 2005-01-06 Alan Hourihane <alanh@fairlite.demon.co.uk>
 	* xc/programs/Xserver/hw/xfree86/drivers/i810/Imakefile
 	* xc/programs/Xserver/hw/xfree86/drivers/i810/common.h
 	* xc/programs/Xserver/hw/xfree86/drivers/i810/i810.man
 	* xc/programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c
 	* xc/programs/Xserver/hw/xfree86/drivers/i810/i830.h
Index: xc/programs/Xserver/Xprint/etc/init.d/xprint.cpp
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/Xprint/etc/init.d/xprint.cpp,v
retrieving revision 1.2
diff -u -2 -0 -r1.2 xprint.cpp
--- xc/programs/Xserver/Xprint/etc/init.d/xprint.cpp	11 Aug 2004 13:55:03 -0000	1.2
+++ xc/programs/Xserver/Xprint/etc/init.d/xprint.cpp	9 Jan 2005 00:31:34 -0000
@@ -231,41 +231,41 @@
 XCOMM Get list from a fontserver config
 get_fontlist_from_xfs_config()
 {
     if [ ! -r "${1}" ] ; then
         return 0
     fi
       
     (        
       cat "${1}" |
       while read -r i ; do
           for val in $i; do
               case $val in
                 \#*)  break ;;
                 ?*=*) key="${val%%=*}" ;;
                 =*)   key="${tok}" ;;
                 *)    [ "${key}" = "catalogue" -a "${tok}" != "" ] && echo "${tok}" ;;
               esac
               tok="${val#*=}"
           done
       done
-    ) | tr "," "[\n]" | fontpath2fontlist
+    ) | tr "," "\n" | fontpath2fontlist
 }
 
 get_fontlist_from_all_xfs_configs()
 {
     get_fontlist_from_xfs_config "/etc/openwin/fs/fontserver.cfg"
     get_fontlist_from_xfs_config "/usr/openwin/lib/X11/fontserver.cfg"
     get_fontlist_from_xfs_config "/etc/X11/fs-xtt/config"
     get_fontlist_from_xfs_config "/etc/X11/fs/config"
     get_fontlist_from_xfs_config "/etc/X11/xfs/config"
     get_fontlist_from_xfs_config "${XPROJECTROOT}/lib/X11/fs/config"
 }
 
 get_fontlist_from_xf86config()
 {
     srcxconf=""
 
     XCOMM see xorg.conf(5x) manual page for the list of locations used here    
     [ "${srcxconf}" = "" -a -f "/etc/X11/xorg.conf"  ]                      && srcxconf="/etc/X11/xorg.conf"
     [ "${srcxconf}" = "" -a -f "/usr/X11R6/etc/X11/xorg.conf" ]             && srcxconf="/usr/X11R6/etc/X11/xorg.conf"
     [ "${srcxconf}" = "" -a -f "/etc/X11/xorg.conf-4" ]                     && srcxconf="/etc/X11/xorg.conf-4"
@@ -815,41 +815,41 @@
         xpserverlist=$(
           # Enumerate both per-user and global servers (in that order)
           (
             [ -f "${XP_PER_USER_SERVERS}" ]  && cat "${XP_PER_USER_SERVERS}"
             [ -f "${XP_GLOBAL_SERVERS}"   ]  && cat "${XP_GLOBAL_SERVERS}"
           ) |
             egrep "^display=.*:.* pid=[0-9]*$|^display=.*:[0-9]*$" |
               while read i ; do
                   (
                     pid="none"
                     eval ${i}
                     # Check if the Xprt process exists (if possible)
                     if [ "$pid" != "none" ] ; then
                         if pexists ${pid} ; then
                             echo ${display}
                         fi
                     else
                         echo ${display}
                     fi
                   )
-              done | tr "[\n]" " "
+              done | tr "\n" " "
           )
         # Only produce output if we have some entries...
         [ "${xpserverlist}" != "" ] && echo "${xpserverlist}"
     fi
 }
 
 do_restart()
 {
     msg "Restarting Xprint server(s): Xprt."
     do_stop
     sleep 1
     do_start
 }
 
 do_diag()
 {
     echo "##### Diag start $(date)."
     
     # General info
     echo "## General info start."