Index: xc/programs/Xserver/Xprint/spooler.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/Xprint/spooler.c,v
retrieving revision 1.3
diff -u -2 -0 -r1.3 spooler.c
--- xc/programs/Xserver/Xprint/spooler.c	24 Jun 2004 06:26:27 -0000	1.3
+++ xc/programs/Xserver/Xprint/spooler.c	8 Jan 2005 23:04:53 -0000
@@ -108,41 +108,41 @@
   "}\n" \
   \
   "(\n" \
   "WHICH_LPSTAT=\"`which_tool lpstat`\"\n" \
   \
   "if [ \"`which_tool nawk`\" != \"\" ] ; then\n" \
   "    NAWK=\"nawk\"\n" \
   "else\n" \
   "    NAWK=\"awk\"\n" \
   "fi\n" \
   \
   "[ \"${WHICH_LPSTAT}\" != \"\" ] && (LANG=C lpstat -v     | ${NAWK} ' $2 == \"for\" { x = match($3, /:/); print substr($3, 1, x-1)   }')\n" \
   ") | egrep -v -i \" |^all$\" | sort | uniq"
 
 #define LIST_QUEUES_SOLARIS "LANG=C lpget -k description " \
   "`lpstat -v " \
     "| nawk '$2 == \"for\" { x = match($3, /:/); print substr($3, 1,x-1) }' " \
     "| sort -u` " \
   "| nawk -F: ' NF == 2 { name=$1 } " \
              " NF == 1 { sub(\"^.*description\\( - undefined|=\\)\",\"\"); " \
-                        " printf \"%sxp-printerattr.descriptor=%s\\n\",  name, $1 } '"
+                        " printf \"%s\txp-printerattr.descriptor=%s\\n\",  name, $1 } '"
 
 #define LIST_QUEUES_OTHER \
   "LANG=C lpstat -v | " \
   "nawk '" \
   " $2 == \"for\" " \
   "   { " \
   "      x = match($3, /:/); " \
   "      print substr($3, 1, x-1)" \
   "   }' | sort | uniq"
   
 #define DEFAULT_SPOOL_COMMAND_HPUX      "/usr/bin/lp -d %printer-name% -o raw -n %copy-count% -t %job-name% %options%"
 #define DEFAULT_SPOOL_COMMAND_BSD       "/usr/bin/lpr -P %printer-name% -#%copy-count% -T %job-name% %options%"
 #define DEFAULT_SPOOL_COMMAND_SYSV      "/usr/bin/lp -d %printer-name% -n %copy-count% -t %job-name% %options%"
 #define DEFAULT_SPOOL_COMMAND_SOLARIS   "/usr/bin/lp -d %printer-name% -n %copy-count% -t %job-name% %options%"
 #define DEFAULT_SPOOL_COMMAND_OTHER     "/usr/bin/lp -d %printer-name% -n %copy-count% -t %job-name% %options%"
 
 
 /* List of spooler types and the commands used to enumerate
  * print queues and submit print jobs */
 XpSpoolerType xpstm[] =