[prev in list] [next in list] [prev in thread] [next in thread] 

List:       cups-commit
Subject:    [cups.commit] [CUPS] r10526 - in branches/branch-1.5: . man scheduler
From:       cups-dev () easysw ! com
Date:       2012-06-20 16:16:26
Message-ID: 11298-cups.commit () news ! easysw ! com
[Download RAW message or body]

Author: mike
Date: 2012-06-20 09:16:25 -0700 (Wed, 20 Jun 2012)
New Revision: 10526
Log:
Mirror fixes from trunk.


Modified:
   branches/branch-1.5/CHANGES.txt
   branches/branch-1.5/man/cupsfilter.man
   branches/branch-1.5/scheduler/cups-lpd.c

Modified: branches/branch-1.5/CHANGES.txt
===================================================================
--- branches/branch-1.5/CHANGES.txt	2012-06-20 15:59:17 UTC (rev 10525)
+++ branches/branch-1.5/CHANGES.txt	2012-06-20 16:16:25 UTC (rev 10526)
@@ -1,8 +1,11 @@
-CHANGES.txt - 2012-05-23
+CHANGES.txt - 2012-06-20
 ------------------------
 
 CHANGES IN CUPS V1.5.4
 
+	- Documentation updates (STR #4112)
+	- The cups-lpd mini-daemon no longer handled jobs with multiple copies
+	  (STR #4118)
 	- Multiple libusb backend fixes (STR #4098, STR #4100)
 	- The IPP backend no longer tries to get the job status for printers
 	  that do not implement the required operation (STR #4083)

Modified: branches/branch-1.5/man/cupsfilter.man
===================================================================
--- branches/branch-1.5/man/cupsfilter.man	2012-06-20 15:59:17 UTC (rev 10525)
+++ branches/branch-1.5/man/cupsfilter.man	2012-06-20 16:16:25 UTC (rev 10526)
@@ -3,7 +3,7 @@
 .\"
 .\"   cupsfilter man page for CUPS.
 .\"
-.\"   Copyright 2007-2010 by Apple Inc.
+.\"   Copyright 2007-2012 by Apple Inc.
 .\"
 .\"   These coded instructions, statements, and computer programs are the
 .\"   property of Apple Inc. and are protected by Federal copyright
@@ -11,18 +11,22 @@
 .\"   which should have been included with this file.  If this file is
 .\"   file is missing or damaged, see the license at "http://www.cups.org/".
 .\"
-.TH cupsfilter 8 "CUPS" "4 March 2010" "Apple Inc."
+.TH cupsfilter 8 "CUPS" "20 June 2012" "Apple Inc."
 .SH NAME
 cupsfilter \- convert a file to another format using cups filters
 .SH SYNOPSIS
 .B cupsfilter
-[ -c
+[ -D ] [ -U
+.I user
+] [ -c
 .I config-file
-] [ -d 
+] [ -d
 .I printer
-] [ -e ] -j
+] [ -e ] [ -i
+.I mime/type
+] [ -j
 .I job-id[,N]
-[ -m
+] [ -m
 .I mime/type
 ] [ -n
 .I copies
@@ -32,7 +36,7 @@
 .I filename.ppd
 ] [ -t
 .I title
-]
+] [ -u ]
 .I filename
 .SH DESCRIPTION
 \fIcupsfilter\fR is a front-end to the CUPS filter subsystem which allows you
@@ -40,6 +44,14 @@
 through CUPS. By default, \fIcupsfilter\fR generates a PDF file.
 .SH OPTIONS
 .TP 5
+-D
+.br
+Delete the input file after conversion.
+.TP 5
+-U user
+.br
+Specifies the username passed to the filters. The default is the name of the current user.
+.TP 5
 -c config-file
 .br
 Uses the named cupsd.conf configuration file.
@@ -51,6 +63,11 @@
 .br
 Use every filter from the PPD file.
 .TP 5
+-i mime/type
+.br
+Specifies the source file type. The default file type is guessed using the
+filename and contents of the file.
+.TP 5
 -j job-id[,N]
 .br
 Converts document N from the specified job. If N is omitted, document 1 is
@@ -77,15 +94,16 @@
 -t title
 .br
 Specifies the document title.
-.SH KNOWN ISSUES
-\fIcupsfilter\fR currently does not use the filters defined in the PPD file.
-This will be addressed in a future CUPS release.
+.TP 5
+-u
+.br
+Delete the PPD file after conversion.
 .SH SEE ALSO
 \fIcupsd.conf(5)\fR
 .br
 http://localhost:631/help
 .SH COPYRIGHT
-Copyright 2007-2010 by Apple Inc.
+Copyright 2007-2012 by Apple Inc.
 .\"
 .\" End of "$Id$".
 .\"

Modified: branches/branch-1.5/scheduler/cups-lpd.c
===================================================================
--- branches/branch-1.5/scheduler/cups-lpd.c	2012-06-20 15:59:17 UTC (rev 10525)
+++ branches/branch-1.5/scheduler/cups-lpd.c	2012-06-20 16:16:25 UTC (rev 10526)
@@ -3,7 +3,7 @@
  *
  *   Line Printer Daemon interface for CUPS.
  *
- *   Copyright 2007-2011 by Apple Inc.
+ *   Copyright 2007-2012 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -744,8 +744,7 @@
     ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE,
                  "document-format", NULL, format);
 
-  if (last)
-    ippAddBoolean(request, IPP_TAG_OPERATION, "last-document", 1);
+  ippAddBoolean(request, IPP_TAG_OPERATION, "last-document", last);
 
  /*
   * Do the request...

_______________________________________________
cups-commit mailing list
cups-commit@easysw.com
http://lists.easysw.com/mailman/listinfo/cups-commit
[prev in list] [next in list] [prev in thread] [next in thread]