Index: xc/ChangeLog
===================================================================
RCS file: /cvs/xorg/xc/ChangeLog,v
retrieving revision 1.662
diff -u -2 -0 -r1.662 ChangeLog
--- xc/ChangeLog	10 Jan 2005 23:11:52 -0000	1.662
+++ xc/ChangeLog	10 Jan 2005 23:33:29 -0000
@@ -1,20 +1,26 @@
+2005-01-10 Roland Mainz <roland.mainz@nrubsig.org>
+	* xc/programs/Xserver/Xprint/spooler.c
+	Bugzilla #2167 (https://bugs.freedesktop.org/show_bug.cgi?id=2167)
+	attachment #1641 (https://bugs.freedesktop.org/attachment.cgi?id=1641):
+	Fix broken Solaris print queue enumeration.
+
 2005-01-11  Felix Kuehling  <fxkuehl@gmx.de>
 
 	* programs/Xserver/hw/xfree86/drivers/savage/savage_dri.c:
 	(SAVAGEDRIAgpInit), (SAVAGEDRIBuffersInit), (SAVAGEDRIKernelInit),
 	(SAVAGEDRIScreenInit), (SAVAGEDRIFinishScreenInit),
 	(SAVAGEDRICloseScreen):
 	- Support for PCI Savages: on PCI cards don't run
 	  SAVAGEDRIAgpInit, add PCI DMA buffers instead of AGP
 	  buffers. Set dma_type properly in SAVAGEDRIKernelInit.
 	- Something's still wrong with ShadowStatus on the PCI card I'm
 	  testing here. Probably a DRM issue.
 	- Fixed error handling. Call SAVAGEDRICloseScreen instead of
 	  DRICloseScreen.
 
 	* programs/Xserver/hw/xfree86/drivers/savage/savage_driver.c:
 	(SavagePreInit):
 	* programs/Xserver/hw/xfree86/drivers/savage/savage_driver.h:
 	* programs/Xserver/hw/xfree86/drivers/savage/savage_regs.h:
 	- Added AGP/PCI detection (copied from the radeon driver).
 
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	10 Jan 2005 23:33:46 -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[] =