The Common UNIX Printing System^TM, -("CUPS^TM"), is provided under the GNU General Public -License ("GPL") and GNU Library General Public License ("LGPL"), -Version 2, with exceptions for Apple operating systems and the -OpenSSL toolkit. A copy of the exceptions and licenses follow -this introduction.

CUPS^TM is provided under the GNU General Public License ("GPL") +and GNU Library General Public License ("LGPL"), Version 2, with exceptions for +Apple operating systems and the OpenSSL toolkit. A copy of the exceptions and +licenses follow this introduction.

The GNU LGPL applies to the CUPS and CUPS Imaging libraries located in the "cups" and "filter" subdirectories of the CUPS diff --git a/doc/help/overview.html b/doc/help/overview.html index c83785e23..946fadb3d 100644 --- a/doc/help/overview.html +++ b/doc/help/overview.html @@ -5,12 +5,11 @@ -

The Common UNIX Printing System^TM, or CUPS, is the software you -use to print from applications like the web browser you are using to read this -page. It converts the page descriptions produced by your application -(put a paragraph here, draw a line there, and so forth) into something your -printer can understand and then sends the information to the printer for -printing.

CUPS is the software you use to print from applications like the web browser +you are using to read this page. It converts the page descriptions +produced by your application (put a paragraph here, draw a line there, and so +forth) into something your printer can understand and then sends the information +to the printer for printing.

Now, since every printer manufacturer does things differently, printing can be very complicated. CUPS does its best to hide this from you and your diff --git a/doc/help/ref-cupsd-conf.html.in b/doc/help/ref-cupsd-conf.html.in index 8cefdf43d..638c49d81 100644 --- a/doc/help/ref-cupsd-conf.html.in +++ b/doc/help/ref-cupsd-conf.html.in @@ -1938,7 +1938,7 @@ location will override ones from /printers. Directives inside /printers will override ones from /. None of the directives are inherited.

diff --git a/doc/help/spec-design.html b/doc/help/spec-design.html index ba98794ab..928d6a1e7 100644 --- a/doc/help/spec-design.html +++ b/doc/help/spec-design.html @@ -6,15 +6,12 @@ -

This document is still being updated for CUPS -1.2...

- -

This design description documents the overall organization of -the Common UNIX Printing System. The purpose is not to provide a -line-by-line description of the CUPS source code, but rather to -describe the overall architecture and location of key pieces so -that developers can more easily understand the underlying -operation of CUPS.

This document is still being updated for CUPS 1.4...

+ +

This design description documents the overall organization of CUPS. The +purpose is not to provide a line-by-line description of the CUPS source code, +but rather to describe the overall architecture and location of key pieces so +that developers can more easily understand the underlying operation of CUPS.

Introduction

diff --git a/doc/index.html.in b/doc/index.html.in index cd5337503..4f81c01fd 100644 --- a/doc/index.html.in +++ b/doc/index.html.in @@ -29,7 +29,7 @@ AUTOSAVE="org.cups.help" RESULTS="20">

Table 3: Common Locations on the Server
Location	Description

Common UNIX Printing System @CUPS_VERSION@

CUPS @CUPS_VERSION@

CUPS is the standards-based, open source printing system developed by Apple Inc. for Mac OS^® X and diff --git a/doc/ja/index.html.in b/doc/ja/index.html.in index e1dfca729..21aaa9461 100644 --- a/doc/ja/index.html.in +++ b/doc/ja/index.html.in @@ -29,7 +29,7 @@ AUTOSAVE="org.cups.help" RESULTS="20">

Common UNIX Printing System @CUPS_VERSION@

CUPS @CUPS_VERSION@

CUPS ã¯ãMac OS^® X ããã³ãã®ä»ã® UNIX ç³» OS ã®ããã«ã Apple Inc. diff --git a/doc/pl/index.html.in b/doc/pl/index.html.in index 13b2d30cd..933ab8829 100644 --- a/doc/pl/index.html.in +++ b/doc/pl/index.html.in @@ -29,7 +29,7 @@ AUTOSAVE="org.cups.help" RESULTS="20">

WspÃ³lny uniksowy system drukowania @CUPS_VERSION@

CUPS @CUPS_VERSION@

CUPS jest opartym na standardach systemem drukowania na licencji open source, tworzonym przez Apple Inc. dla Mac OS^® X i diff --git a/doc/ru/index.html.in b/doc/ru/index.html.in index 6de75cd1f..ddd29c43c 100644 --- a/doc/ru/index.html.in +++ b/doc/ru/index.html.in @@ -29,7 +29,7 @@ AUTOSAVE="org.cups.help" RESULTS="20">

Common UNIX Printing System @CUPS_VERSION@

CUPS @CUPS_VERSION@

diff --git a/man/backend.man b/man/backend.man index 14ac41b19..7c828af14 100644 --- a/man/backend.man +++ b/man/backend.man @@ -12,7 +12,7 @@ .\" 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 backend 7 "Common UNIX Printing System" "28 July 2008" "Apple Inc." +.TH backend 7 "CUPS" "28 July 2008" "Apple Inc." .SH NAME backend \- cups backend transmission interfaces diff --git a/man/cancel.man b/man/cancel.man index dd46de6eb..d86ce3e7c 100644 --- a/man/cancel.man +++ b/man/cancel.man @@ -12,7 +12,7 @@ .\" 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 cancel 1 "Common UNIX Printing System" "20 March 2006" "Apple Inc." +.TH cancel 1 "CUPS" "20 March 2006" "Apple Inc." .SH NAME cancel - cancel jobs .SH SYNOPSIS diff --git a/man/classes.conf.man b/man/classes.conf.man index 4ff14d79d..17f9dc353 100644 --- a/man/classes.conf.man +++ b/man/classes.conf.man @@ -12,7 +12,7 @@ .\" 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 classes.conf 5 "Common UNIX Printing System" "12 February 2006" "Apple Inc." +.TH classes.conf 5 "CUPS" "12 February 2006" "Apple Inc." .SH NAME classes.conf \- class configuration file for cups .SH DESCRIPTION diff --git a/man/client.conf.man.in b/man/client.conf.man.in index d7dcc575d..366236a12 100644 --- a/man/client.conf.man.in +++ b/man/client.conf.man.in @@ -12,7 +12,7 @@ .\" 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 client.conf 5 "Common UNIX Printing System" "25 February 2006" "Apple Inc." +.TH client.conf 5 "CUPS" "25 February 2006" "Apple Inc." .SH NAME client.conf \- client configuration file for cups .SH DESCRIPTION diff --git a/man/commandtoescpx.man b/man/commandtoescpx.man index fd0c7b6e8..8d4209abf 100644 --- a/man/commandtoescpx.man +++ b/man/commandtoescpx.man @@ -1,7 +1,7 @@ .\" .\" "$Id: commandtoescpx.man 7600 2008-05-20 21:06:23Z mike $" .\" -.\" rastertoescpx man page for the CUPS Driver Development Kit. +.\" commandtoescpx man page for the CUPS Driver Development Kit. .\" .\" Copyright 2007-2009 by Apple Inc. .\" Copyright 1997-2007 by Easy Software Products. @@ -12,20 +12,20 @@ .\" 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 rastertoescpx 1 "CUPS Driver Development Kit" "14 February 2007" "Apple Inc." +.TH commandtoescpx 1 "CUPS" "9 March 2009" "Apple Inc." .SH NAME -rastertoescpx \- enhanced esc/p raster driver for cups +commandtoescpx \- enhanced esc/p command filter for cups .SH SYNOPSIS -.B rastertoescpx +.B commandtoescpx jobid user title copies options [ .I filename.ras ] .SH DESCRIPTION -\fIrastertoescpx\fR converts a CUPS raster stream to ESC/P or +\fIcommandtoescpx\fR converts a CUPS command file to ESC/P or ESC/P2. It is used to support printing to a variety of EPSON and EPSON-compatible printers and plotters. .SH SEE ALSO -cupsprofile(1), ppdc(1), ppdhtml(1), ppdi(1), ppdmerge(1), ppdpo(1), ppdcfile(5), CUPS Driver Developer Kit Manual. +ppdc(1), ppdhtml(1), ppdi(1), ppdmerge(1), ppdpo(1), ppdcfile(5), CUPS Driver Developer Kit Manual. .SH COPYRIGHT Copyright 2007-2009 by Apple Inc. .\" diff --git a/man/commandtopclx.man b/man/commandtopclx.man index ba6a5238d..9288ad210 100644 --- a/man/commandtopclx.man +++ b/man/commandtopclx.man @@ -1,7 +1,7 @@ .\" .\" "$Id: commandtopclx.man 7600 2008-05-20 21:06:23Z mike $" .\" -.\" rastertopclx man page for the CUPS Driver Development Kit. +.\" commandtopclx man page for the CUPS Driver Development Kit. .\" .\" Copyright 2007-2009 by Apple Inc. .\" Copyright 1997-2007 by Easy Software Products. @@ -12,20 +12,20 @@ .\" 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 rastertopclx 1 "CUPS Driver Development Kit" "14 February 2007" "Apple Inc." +.TH commandtopclx 1 "CUPS" "9 March 2009" "Apple Inc." .SH NAME -rastertopclx \- enhanced pcl raster driver for cups +commandtopclx \- enhanced pcl command filter for cups .SH SYNOPSIS -.B rastertopclx +.B commandtopclx jobid user title copies options [ .I filename.ras ] .SH DESCRIPTION -\fIrastertopclx\fR converts a CUPS raster stream to HP-PCL. It is +\fIcommandtopclx\fR converts a CUPS command file to HP-PCL. It is used to support printing to a variety of HP and HP-compatible printers and plotters. .SH SEE ALSO -cupsprofile(1), ppdc(1), ppdhtml(1), ppdi(1), ppdmerge(1), ppdpo(1), ppdcfile(5), CUPS Driver Developer Kit Manual. +ppdc(1), ppdhtml(1), ppdi(1), ppdmerge(1), ppdpo(1), ppdcfile(5), CUPS Driver Developer Kit Manual. .SH COPYRIGHT Copyright 2007-2009 by Apple Inc. .\" diff --git a/man/cups-config.man b/man/cups-config.man index 9825b3a11..e5a7df328 100644 --- a/man/cups-config.man +++ b/man/cups-config.man @@ -12,7 +12,7 @@ .\" 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 cups-config 1 "Common UNIX Printing System" "23 October 2008" "Apple Inc." +.TH cups-config 1 "CUPS" "23 October 2008" "Apple Inc." .SH NAME cups-config \- get cups api, compiler, directory, and link information. .SH SYNOPSIS diff --git a/man/cups-deviced.man.in b/man/cups-deviced.man.in index ddac8232c..f1f33dc17 100644 --- a/man/cups-deviced.man.in +++ b/man/cups-deviced.man.in @@ -12,7 +12,7 @@ .\" 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 cups-deviced 8 "Common UNIX Printing System" "16 June 2008" "Apple Inc." +.TH cups-deviced 8 "CUPS" "16 June 2008" "Apple Inc." .SH NAME cups-deviced \- cups device daemon .SH SYNOPSIS diff --git a/man/cups-driverd.man.in b/man/cups-driverd.man.in index 11edc42a2..6e1e94007 100644 --- a/man/cups-driverd.man.in +++ b/man/cups-driverd.man.in @@ -12,7 +12,7 @@ .\" 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 cups-driverd 8 "Common UNIX Printing System" "16 June 2008" "Apple Inc." +.TH cups-driverd 8 "CUPS" "16 June 2008" "Apple Inc." .SH NAME cups-driverd \- cups driver daemon .SH SYNOPSIS diff --git a/man/cups-lpd.man.in b/man/cups-lpd.man.in index 4d96a4f64..e826448f9 100644 --- a/man/cups-lpd.man.in +++ b/man/cups-lpd.man.in @@ -12,7 +12,7 @@ .\" 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 cups-lpd 8 "Common UNIX Printing System" "4 August 2008" "Apple Inc." +.TH cups-lpd 8 "CUPS" "4 August 2008" "Apple Inc." .SH NAME cups-lpd \- receive print jobs and report printer status to lpd clients .SH SYNOPSIS diff --git a/man/cups-polld.man b/man/cups-polld.man index d91b8e751..e3727dc75 100644 --- a/man/cups-polld.man +++ b/man/cups-polld.man @@ -12,7 +12,7 @@ .\" 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 cups-polld 8 "Common UNIX Printing System" "12 February 2006" "Apple Inc." +.TH cups-polld 8 "CUPS" "12 February 2006" "Apple Inc." .SH NAME cups-polld \- cups printer polling daemon .SH SYNOPSIS diff --git a/man/cups-snmp.conf.man b/man/cups-snmp.conf.man index 2586b421c..f2b6a8211 100644 --- a/man/cups-snmp.conf.man +++ b/man/cups-snmp.conf.man @@ -12,7 +12,7 @@ .\" 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 snmp.conf 5 "Common UNIX Printing System" "31 July 2006" "Apple Inc." +.TH snmp.conf 5 "CUPS" "31 July 2006" "Apple Inc." .SH NAME snmp.conf \- snmp configuration file for cups .SH DESCRIPTION diff --git a/man/cupsaccept.man b/man/cupsaccept.man index 48601503f..b014368aa 100644 --- a/man/cupsaccept.man +++ b/man/cupsaccept.man @@ -12,7 +12,7 @@ .\" 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 cupsaccept 8 "Common UNIX Printing System" "12 February 2006" "Apple Inc." +.TH cupsaccept 8 "CUPS" "12 February 2006" "Apple Inc." .SH NAME cupsaccept/cupsreject \- accept/reject jobs sent to a destination .SH SYNOPSIS diff --git a/man/cupsaddsmb.man.in b/man/cupsaddsmb.man.in index 16a376f47..79d47266e 100644 --- a/man/cupsaddsmb.man.in +++ b/man/cupsaddsmb.man.in @@ -12,7 +12,7 @@ .\" 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 cupsaddsmb 8 "Common UNIX Printing System" "25 July 2007" "Apple Inc." +.TH cupsaddsmb 8 "CUPS" "25 July 2007" "Apple Inc." .SH NAME cupsaddsmb \- export printers to samba for windows clients diff --git a/man/cupsctl.man b/man/cupsctl.man index 391286135..f0472644b 100644 --- a/man/cupsctl.man +++ b/man/cupsctl.man @@ -12,7 +12,7 @@ .\" 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 cupsctl 8 "Common UNIX Printing System" "5 July 2007" "Apple Inc." +.TH cupsctl 8 "CUPS" "5 July 2007" "Apple Inc." .SH NAME cupsctl \- configure cupsd.conf options .SH SYNOPSIS diff --git a/man/cupsd.conf.man.in b/man/cupsd.conf.man.in index a2f15a36a..35b3bf48f 100644 --- a/man/cupsd.conf.man.in +++ b/man/cupsd.conf.man.in @@ -12,7 +12,7 @@ .\" 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 cupsd.conf 5 "Common UNIX Printing System" "28 January 2009" "Apple Inc." +.TH cupsd.conf 5 "CUPS" "28 January 2009" "Apple Inc." .SH NAME cupsd.conf \- server configuration file for cups .SH DESCRIPTION diff --git a/man/cupsd.man.in b/man/cupsd.man.in index 1d2ea933d..142259866 100644 --- a/man/cupsd.man.in +++ b/man/cupsd.man.in @@ -12,20 +12,19 @@ .\" 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 cupsd 8 "Common UNIX Printing System" "27 August 2006" "Apple Inc." +.TH cupsd 8 "CUPS" "9 March 2009" "Apple Inc." .SH NAME -cupsd \- common unix printing system daemon +cupsd \- cups scheduler .SH SYNOPSIS .B cupsd [ -c .I config-file ] [ -f ] [ -F ] [ -h ] [ -l ] [ -t ] .SH DESCRIPTION -\fIcupsd\fR is the scheduler for the Common UNIX Printing System. It -implements a printing system based upon the Internet Printing Protocol, -version 1.1. If no options are specified on the command-line then the -default configuration file \fI@CUPS_SERVERROOT@/cupsd.conf\fR will be -used. +\fIcupsd\fR is the scheduler for CUPS. It implements a printing system based +upon the Internet Printing Protocol, version 2.1. If no options are specified +on the command-line then the default configuration file +\fI@CUPS_SERVERROOT@/cupsd.conf\fR will be used. .SH OPTIONS .TP 5 -c config-file @@ -56,7 +55,7 @@ This option is passed to \fIcupsd\fR when it is run from .br Test the configuration file for syntax errors. .SH COMPATIBILITY -\fIcupsd\fR implements all of the required IPP/1.1 attributes and +\fIcupsd\fR implements all of the required IPP/2.1 attributes and operations. It also implements several CUPS-specific administration operations. .SH SEE ALSO diff --git a/man/cupsenable.man b/man/cupsenable.man index 32f137e72..fa40973b7 100644 --- a/man/cupsenable.man +++ b/man/cupsenable.man @@ -13,7 +13,7 @@ .\" 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 cupsenable 8 "Common UNIX Printing System" "9 October 2008" "Apple Inc." +.TH cupsenable 8 "CUPS" "9 October 2008" "Apple Inc." .SH NAME cupsdisable, cupsenable \- stop/start printers and classes .SH SYNOPSIS diff --git a/man/cupsfilter.man b/man/cupsfilter.man index 9bd428d9f..b2e797276 100644 --- a/man/cupsfilter.man +++ b/man/cupsfilter.man @@ -11,7 +11,7 @@ .\" 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 "Common UNIX Printing System" "26 February 2009" "Apple Inc." +.TH cupsfilter 8 "CUPS" "26 February 2009" "Apple Inc." .SH NAME cupsfilter \- convert a file to another format using cups filters .SH SYNOPSIS diff --git a/man/cupstestdsc.man b/man/cupstestdsc.man index 3d8c292da..302493da4 100644 --- a/man/cupstestdsc.man +++ b/man/cupstestdsc.man @@ -12,7 +12,7 @@ .\" 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 cupstestdsc 1 "Common UNIX Printing System" "20 March 2006" "Apple Inc." +.TH cupstestdsc 1 "CUPS" "20 March 2006" "Apple Inc." .SH NAME cupstestdsc \- test conformance of postscript files .SH SYNOPSIS diff --git a/man/cupstestppd.man b/man/cupstestppd.man index fd2b878b5..fbfb46b47 100644 --- a/man/cupstestppd.man +++ b/man/cupstestppd.man @@ -12,7 +12,7 @@ .\" 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 cupstestppd 1 "Common UNIX Printing System" "2 March 2009" "Apple Inc." +.TH cupstestppd 1 "CUPS" "2 March 2009" "Apple Inc." .SH NAME cupstestppd \- test conformance of ppd files .SH SYNOPSIS diff --git a/man/drv.man.in b/man/drv.man.in index 04ef610c7..d28a58877 100644 --- a/man/drv.man.in +++ b/man/drv.man.in @@ -11,7 +11,7 @@ .\" 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 drv 1 "Common UNIX Printing System" "20 May 2008" "Apple Inc." +.TH drv 1 "CUPS" "9 March 2009" "Apple Inc." .SH NAME drv \- cups driver interface for ppd compiler files .SH SYNOPSIS @@ -21,7 +21,7 @@ drv \- cups driver interface for ppd compiler files .I drv:///filename.drv/pcfilename .SH DESCRIPTION \fIdrv\fR lists and compiles PPDC source files installed in the -@CUPS_DATADIR@/drv and (on Mac OS X) /Library/Printers/PPDs.drv +@CUPS_DATADIR@/drv and (on Mac OS X) /Library/Printers/PPDs/Contents/Resources directories on behalf of the scheduler, \fIcupsd(8)\fR. .PP The first form of the command lists all of the PPD files that can be produced diff --git a/man/filter.man b/man/filter.man index c2a3fd052..4d8bec9dd 100644 --- a/man/filter.man +++ b/man/filter.man @@ -12,7 +12,7 @@ .\" 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 filter 7 "Common UNIX Printing System" "18 September 2008" "Apple Inc." +.TH filter 7 "CUPS" "18 September 2008" "Apple Inc." .SH NAME filter \- cups file conversion filter interface .SH SYNOPSIS diff --git a/man/lp.man b/man/lp.man index 0f8605227..853b1e757 100644 --- a/man/lp.man +++ b/man/lp.man @@ -12,7 +12,7 @@ .\" 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 lp 1 "Common UNIX Printing System" "17 November 2008" "Apple Inc." +.TH lp 1 "CUPS" "17 November 2008" "Apple Inc." .SH NAME lp - print files .SH SYNOPSIS diff --git a/man/lpadmin.man b/man/lpadmin.man index 1075800ac..cf34cd474 100644 --- a/man/lpadmin.man +++ b/man/lpadmin.man @@ -12,7 +12,7 @@ .\" 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 lpadmin 8 "Common UNIX Printing System" "3 November 2008" "Apple Inc." +.TH lpadmin 8 "CUPS" "3 November 2008" "Apple Inc." .SH NAME lpadmin \- configure cups printers and classes .SH SYNOPSIS diff --git a/man/lpc.man b/man/lpc.man index 1ca8939bc..70ebea44e 100644 --- a/man/lpc.man +++ b/man/lpc.man @@ -12,7 +12,7 @@ .\" 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 lpc 8 "Common UNIX Printing System" "3 November 2008" "Apple Inc." +.TH lpc 8 "CUPS" "3 November 2008" "Apple Inc." .SH NAME lpc \- line printer control program .SH SYNOPSIS diff --git a/man/lpinfo.man b/man/lpinfo.man index 34cf5f0b5..c845a7113 100644 --- a/man/lpinfo.man +++ b/man/lpinfo.man @@ -12,7 +12,7 @@ .\" 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 lpinfo 8 "Common UNIX Printing System" "5 December 2008" "Apple Inc." +.TH lpinfo 8 "CUPS" "5 December 2008" "Apple Inc." .SH NAME lpinfo \- show available devices or drivers .SH SYNOPSIS diff --git a/man/lpmove.man b/man/lpmove.man index b355b0b8f..8c1dde52e 100644 --- a/man/lpmove.man +++ b/man/lpmove.man @@ -12,7 +12,7 @@ .\" 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 lpmove 8 "Common UNIX Printing System" "12 February 2006" "Apple Inc." +.TH lpmove 8 "CUPS" "12 February 2006" "Apple Inc." .SH NAME lpmove \- move a job or all jobs to a new destination .SH SYNOPSIS diff --git a/man/lpoptions.man.in b/man/lpoptions.man.in index 94b21b46b..c1f327d4b 100644 --- a/man/lpoptions.man.in +++ b/man/lpoptions.man.in @@ -12,7 +12,7 @@ .\" 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 lpoptions 1 "Common UNIX Printing System" "29 August 2008" "Apple Inc." +.TH lpoptions 1 "CUPS" "29 August 2008" "Apple Inc." .SH NAME lpoptions \- display or set printer options and defaults .SH SYNOPSIS diff --git a/man/lppasswd.man b/man/lppasswd.man index 15fd92db2..fc4eef87e 100644 --- a/man/lppasswd.man +++ b/man/lppasswd.man @@ -12,7 +12,7 @@ .\" 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 lppasswd 1 "Common UNIX Printing System" "22 February 2008" "Apple Inc." +.TH lppasswd 1 "CUPS" "22 February 2008" "Apple Inc." .SH NAME lppasswd \- add, change, or delete digest passwords. .SH SYNOPSIS diff --git a/man/lpq.man b/man/lpq.man index 98e59628e..0b91720f1 100644 --- a/man/lpq.man +++ b/man/lpq.man @@ -12,7 +12,7 @@ .\" 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 lpq 1 "Common UNIX Printing System" "16 June 2008" "Apple Inc." +.TH lpq 1 "CUPS" "16 June 2008" "Apple Inc." .SH NAME lpq \- show printer queue status .SH SYNOPSIS diff --git a/man/lpr.man b/man/lpr.man index c8de2af1c..351abc9f1 100644 --- a/man/lpr.man +++ b/man/lpr.man @@ -12,7 +12,7 @@ .\" 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 lpr 1 "Common UNIX Printing System" "29 August 2008" "Apple Inc." +.TH lpr 1 "CUPS" "29 August 2008" "Apple Inc." .SH NAME lpr \- print files .SH SYNOPSIS diff --git a/man/lprm.man b/man/lprm.man index 2eb87f43d..e8da74e6d 100644 --- a/man/lprm.man +++ b/man/lprm.man @@ -12,7 +12,7 @@ .\" 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 lprm 1 "Common UNIX Printing System" "12 February 2006" "Apple Inc." +.TH lprm 1 "CUPS" "12 February 2006" "Apple Inc." .SH NAME lprm \- cancel print jobs .SH SYNOPSIS diff --git a/man/lpstat.man b/man/lpstat.man index ba831f5ae..8d163f2da 100644 --- a/man/lpstat.man +++ b/man/lpstat.man @@ -12,7 +12,7 @@ .\" 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 lpstat 1 "Common UNIX Printing System" "10 September 2008" "Apple Inc." +.TH lpstat 1 "CUPS" "10 September 2008" "Apple Inc." .SH NAME lpstat \- print cups status information .SH SYNOPSIS diff --git a/man/mailto.conf.man b/man/mailto.conf.man index 88aad2140..548574544 100644 --- a/man/mailto.conf.man +++ b/man/mailto.conf.man @@ -12,7 +12,7 @@ .\" 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 mailto.conf 5 "Common UNIX Printing System" "12 July 2006" "Apple Inc." +.TH mailto.conf 5 "CUPS" "12 July 2006" "Apple Inc." .SH NAME mailto.conf \- configuration file for cups email notifier .SH DESCRIPTION diff --git a/man/mime.convs.man b/man/mime.convs.man index 0072a383a..648c0531c 100644 --- a/man/mime.convs.man +++ b/man/mime.convs.man @@ -12,7 +12,7 @@ .\" 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 mime.convs 5 "Common UNIX Printing System" "20 March 2006" "Apple Inc." +.TH mime.convs 5 "CUPS" "20 March 2006" "Apple Inc." .SH NAME mime.convs \- mime type conversion file for cups .SH DESCRIPTION diff --git a/man/mime.types.man b/man/mime.types.man index ba387e562..7fd16f05b 100644 --- a/man/mime.types.man +++ b/man/mime.types.man @@ -12,7 +12,7 @@ .\" 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 mime.types 5 "Common UNIX Printing System" "17 June 2008" "Apple Inc." +.TH mime.types 5 "CUPS" "17 June 2008" "Apple Inc." .SH NAME mime.types \- mime type description file for cups .SH DESCRIPTION diff --git a/man/ppdc.man b/man/ppdc.man index bf0489bfd..bfd81c423 100644 --- a/man/ppdc.man +++ b/man/ppdc.man @@ -12,7 +12,7 @@ .\" 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 ppdc 1 "Common UNIX Printing System" "10 October 2008" "Apple Inc." +.TH ppdc 1 "CUPS" "10 October 2008" "Apple Inc." .SH NAME ppdc \- cups ppd compiler .SH SYNOPSIS diff --git a/man/ppdcfile.man b/man/ppdcfile.man index 1c6734306..a0235f2fc 100644 --- a/man/ppdcfile.man +++ b/man/ppdcfile.man @@ -12,7 +12,7 @@ .\" 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 ppdcfile 5 "Common UNIX Printing System" "20 May 2008" "Apple Inc." +.TH ppdcfile 5 "CUPS" "20 May 2008" "Apple Inc." .SH NAME ppdcfile \- cups ppd compiler source file format .SH DESCRIPTION diff --git a/man/ppdhtml.man b/man/ppdhtml.man index 1f3e49191..b447e5905 100644 --- a/man/ppdhtml.man +++ b/man/ppdhtml.man @@ -12,7 +12,7 @@ .\" 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 ppdhtml 1 "Common UNIX Printing System" "10 October 2008" "Apple Inc." +.TH ppdhtml 1 "CUPS" "10 October 2008" "Apple Inc." .SH NAME ppdhtml \- cups html summary generator .SH SYNOPSIS diff --git a/man/ppdi.man b/man/ppdi.man index a9e1a0294..7af3254a2 100644 --- a/man/ppdi.man +++ b/man/ppdi.man @@ -12,7 +12,7 @@ .\" 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 ppdi 1 "Common UNIX Printing System" "20 May 2008" "Apple Inc." +.TH ppdi 1 "CUPS" "20 May 2008" "Apple Inc." .SH NAME ppdi \- import ppd files .SH SYNOPSIS diff --git a/man/ppdmerge.man b/man/ppdmerge.man index ccbd0ca02..0a33a20c3 100644 --- a/man/ppdmerge.man +++ b/man/ppdmerge.man @@ -12,7 +12,7 @@ .\" 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 ppdmerge 1 "Common UNIX Printing System" "20 May 2008" "Apple Inc." +.TH ppdmerge 1 "CUPS" "20 May 2008" "Apple Inc." .SH NAME ppdmerge \- merge ppd files .SH SYNOPSIS diff --git a/man/ppdpo.man b/man/ppdpo.man index 04efb61a1..1fd8e4515 100644 --- a/man/ppdpo.man +++ b/man/ppdpo.man @@ -12,7 +12,7 @@ .\" 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 ppdpo 1 "Common UNIX Printing System" "10 October 2008" "Apple Inc." +.TH ppdpo 1 "CUPS" "10 October 2008" "Apple Inc." .SH NAME ppdpo \- ppd message catalog generator .SH SYNOPSIS diff --git a/man/printers.conf.man b/man/printers.conf.man index 6171e03b9..674923d22 100644 --- a/man/printers.conf.man +++ b/man/printers.conf.man @@ -12,7 +12,7 @@ .\" 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 printers.conf 5 "Common UNIX Printing System" "12 February 2006" "Apple Inc." +.TH printers.conf 5 "CUPS" "12 February 2006" "Apple Inc." .SH NAME printers.conf \- printer configuration file for cups .SH DESCRIPTION diff --git a/man/rastertoescpx.man b/man/rastertoescpx.man index 0d0f4def5..042ce66be 100644 --- a/man/rastertoescpx.man +++ b/man/rastertoescpx.man @@ -12,7 +12,7 @@ .\" 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 rastertoescpx 1 "Common UNIX Printing System" "20 May 2008" "Apple Inc." +.TH rastertoescpx 1 "CUPS" "20 May 2008" "Apple Inc." .SH NAME rastertoescpx \- enhanced esc/p raster driver for cups .SH SYNOPSIS diff --git a/man/rastertopclx.man b/man/rastertopclx.man index 3c1c82385..aa9ee567e 100644 --- a/man/rastertopclx.man +++ b/man/rastertopclx.man @@ -12,7 +12,7 @@ .\" 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 rastertopclx 1 "Common UNIX Printing System" "20 May 2008" "Apple Inc." +.TH rastertopclx 1 "CUPS" "20 May 2008" "Apple Inc." .SH NAME rastertopclx \- enhanced pcl raster driver for cups .SH SYNOPSIS diff --git a/man/subscriptions.conf.man b/man/subscriptions.conf.man index 87e039abd..6ebe75028 100644 --- a/man/subscriptions.conf.man +++ b/man/subscriptions.conf.man @@ -12,7 +12,7 @@ .\" 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 subscriptions.conf 5 "Common UNIX Printing System" "30 April 2006" "Apple Inc." +.TH subscriptions.conf 5 "CUPS" "30 April 2006" "Apple Inc." .SH NAME subscriptions.conf \- subscriptions file for cups .SH DESCRIPTION diff --git a/packaging/LICENSE.rtf b/packaging/LICENSE.rtf index e41bee71a..55d7de1f5 100644 --- a/packaging/LICENSE.rtf +++ b/packaging/LICENSE.rtf @@ -1,24 +1,24 @@ -{\rtf1\ansi\ansicpg1252\cocoartf915 +{\rtf1\ansi\ansicpg1252\cocoartf1009\cocoasubrtf300 {\fonttbl\f0\froman\fcharset0 Times-Roman;\f1\fnil\fcharset0 LucidaGrande;\f2\fmodern\fcharset0 Courier; \f3\fmodern\fcharset0 Courier-Oblique;} {\colortbl;\red255\green255\blue255;\red0\green0\blue238;} -{\*\listtable{\list\listtemplateid1\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid0\'02\'05.;}{\levelnumbers\'01;}}{\listname ;}\listid1} -{\list\listtemplateid2\listhybrid{\listlevel\levelnfc0\levelnfcn0\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{decimal\}.}{\leveltext\leveltemplateid0\'02\'05.;}{\levelnumbers\'01;}}{\listlevel\levelnfc0\levelnfcn0\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{decimal\}.}{\leveltext\leveltemplateid1\'02\'05.;}{\levelnumbers\'01;}}{\listname ;}\listid2} -{\list\listtemplateid3\listhybrid{\listlevel\levelnfc0\levelnfcn0\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{decimal\}.}{\leveltext\leveltemplateid0\'02\'05.;}{\levelnumbers\'01;}}{\listlevel\levelnfc0\levelnfcn0\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{decimal\}.}{\leveltext\leveltemplateid1\'02\'05.;}{\levelnumbers\'01;}}{\listname ;}\listid3} -{\list\listtemplateid4\listhybrid{\listlevel\levelnfc0\levelnfcn0\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{decimal\}.}{\leveltext\leveltemplateid0\'02\'05.;}{\levelnumbers\'01;}}{\listname ;}\listid4} -{\list\listtemplateid5\listhybrid{\listlevel\levelnfc0\levelnfcn0\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{decimal\}.}{\leveltext\leveltemplateid0\'02\'05.;}{\levelnumbers\'01;}}{\listname ;}\listid5} -{\list\listtemplateid6\listhybrid{\listlevel\levelnfc0\levelnfcn0\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{decimal\}.}{\leveltext\leveltemplateid0\'02\'05.;}{\levelnumbers\'01;}}{\listname ;}\listid6} -{\list\listtemplateid7\listhybrid{\listlevel\levelnfc0\levelnfcn0\leveljc2\leveljcn2\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{decimal\}.}{\leveltext\leveltemplateid0\'02\'05.;}{\levelnumbers\'01;}}{\listname ;}\listid7}} +{\*\listtable{\list\listtemplateid1\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid1\'01\uc0\u8226 ;}{\levelnumbers;}\fi-360\li720\lin720 }{\listname ;}\listid1} +{\list\listtemplateid2\listhybrid{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{decimal\}.}{\leveltext\leveltemplateid101\'02\'00.;}{\levelnumbers\'01;}\fi-360\li720\lin720 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{decimal\}.}{\leveltext\leveltemplateid102\'02\'01.;}{\levelnumbers\'01;}\fi-360\li1440\lin1440 }{\listname ;}\listid2} +{\list\listtemplateid3\listhybrid{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{decimal\}.}{\leveltext\leveltemplateid201\'02\'00.;}{\levelnumbers\'01;}\fi-360\li720\lin720 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{decimal\}.}{\leveltext\leveltemplateid202\'02\'01.;}{\levelnumbers\'01;}\fi-360\li1440\lin1440 }{\listname ;}\listid3} +{\list\listtemplateid4\listhybrid{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{decimal\}.}{\leveltext\leveltemplateid301\'02\'00.;}{\levelnumbers\'01;}\fi-360\li720\lin720 }{\listname ;}\listid4} +{\list\listtemplateid5\listhybrid{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{decimal\}.}{\leveltext\leveltemplateid401\'02\'00.;}{\levelnumbers\'01;}\fi-360\li720\lin720 }{\listname ;}\listid5} +{\list\listtemplateid6\listhybrid{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{decimal\}.}{\leveltext\leveltemplateid501\'02\'00.;}{\levelnumbers\'01;}\fi-360\li720\lin720 }{\listname ;}\listid6} +{\list\listtemplateid7\listhybrid{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{decimal\}.}{\leveltext\leveltemplateid601\'02\'00.;}{\levelnumbers\'01;}\fi-360\li720\lin720 }{\listname ;}\listid7}} {\*\listoverridetable{\listoverride\listid1\listoverridecount0\ls1}{\listoverride\listid2\listoverridecount0\ls2}{\listoverride\listid3\listoverridecount0\ls3}{\listoverride\listid4\listoverridecount0\ls4}{\listoverride\listid5\listoverridecount0\ls5}{\listoverride\listid6\listoverridecount0\ls6}{\listoverride\listid7\listoverridecount0\ls7}} {\info -{\title Software License Agreement - Common UNIX Printing System}}\vieww15960\viewh16860\viewkind0 +{\title Software License Agreement - Common UNIX Printing System}}\margl1440\margr1440\margb1800\margt1800\vieww15960\viewh16860\viewkind0 \deftab720 \pard\pardeftab720\sa280\qc \f0\b\fs36 \cf0 Common UNIX Printing System License Agreement\ \pard\pardeftab720\sa240\qc -\b0\fs24 \cf0 Copyright 2007 by Apple Inc. +\b0\fs24 \cf0 Copyright 2007-2009 by Apple Inc. \f1 \uc0\u8232 \f0 1 Infinite Loop \f1 \uc0\u8232 @@ -76,7 +76,7 @@ The GNU LGPL relaxes the "link-to" restriction, allowing you to develop applicat \b\fs28 \cf0 Trademarks\ \pard\pardeftab720\sa240\ql\qnatural -\b0\fs24 \cf0 Apple Inc. has trademarked the Common UNIX Printing System, CUPS, and CUPS logo. You may use these names and logos in any direct port or binary distribution of CUPS. Please contact Easy Software Products for written permission to use them in derivative products. Our intention is to protect the value of these trademarks and ensure that any derivative product meets the same high-quality standards as the original.\ +\b0\fs24 \cf0 CUPS and the CUPS logo are trademarks of Apple Inc. You may use the name and logo in any direct port or binary distribution of CUPS. Please contact Apple Inc. for written permission to use them in derivative products. Our intention is to protect the value of these trademarks and ensure that any derivative product meets the same high-quality standards as the original.\ \pard\pardeftab720\sa280\ql\qnatural \b\fs28 \cf0 \page \pard\pardeftab720\sa280\ql\qnatural diff --git a/packaging/WELCOME.rtf b/packaging/WELCOME.rtf index 2f73e34cc..aae117479 100644 --- a/packaging/WELCOME.rtf +++ b/packaging/WELCOME.rtf @@ -1,16 +1,16 @@ -{\rtf1\ansi\ansicpg1252\cocoartf915 +{\rtf1\ansi\ansicpg1252\cocoartf1009\cocoasubrtf300 {\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} -\margl1440\margr1440\vieww9000\viewh8400\viewkind0 +\margl1440\margr1440\margb1800\margt1800\vieww9000\viewh8400\viewkind0 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural -\f0\fs24 \cf0 This program will install CUPS @CUPS_VERSION@, replacing the CUPS 1.1.x software that is included with Mac OS X.\ +\f0\fs24 \cf0 This program will install CUPS @CUPS_VERSION@, replacing the CUPS software that is included with Mac OS X.\ \ \b WARNING\ \b0 \ -This is pre-release software and should not be used in production environments. Because Mac OS X packages cannot be uninstalled, you will need to reinstall Mac OS X to revert to the original CUPS 1.1.x software.\ +This is pre-release software and should not be used in production environments. Because Mac OS X packages cannot be uninstalled, you will need to reinstall Mac OS X to revert to the original CUPS software.\ \ Please report all problems using the Bugs & Features page on the CUPS home page:\ \ diff --git a/packaging/cups-desc.plist.in b/packaging/cups-desc.plist.in index 13f2b0145..4d1d29688 100644 --- a/packaging/cups-desc.plist.in +++ b/packaging/cups-desc.plist.in @@ -5,10 +5,9 @@ IFPkgDescriptionDeleteWarning IFPkgDescriptionDescription - The Common UNIX Printing System provides a portable printing layer for UNIX(r) operating systems. - + CUPS provides a portable printing layer for UNIX(r) operating systems. IFPkgDescriptionTitle - Common UNIX Printing System + CUPS IFPkgDescriptionVersion @CUPS_RELEASE@ diff --git a/packaging/cups-info.plist.in b/packaging/cups-info.plist.in index 9e193ae23..d1f61348b 100644 --- a/packaging/cups-info.plist.in +++ b/packaging/cups-info.plist.in @@ -13,9 +13,9 @@ CFBundleIdentifier org.cups.cups CFBundleName - Common UNIX Printing System + CUPS CFBundleGetInfoString - Common UNIX Printing System, @CUPS_VERSION@ + CUPS, @CUPS_VERSION@ CFBundleShortVersionString @CUPS_RELEASE@ IFPkgFlagAllowBackRev diff --git a/packaging/cups.list.in b/packaging/cups.list.in index 26b051a84..0fa0917fe 100644 --- a/packaging/cups.list.in +++ b/packaging/cups.list.in @@ -1,8 +1,7 @@ # # "$Id: cups.list.in 7930 2008-09-10 22:25:54Z mike $" # -# ESP Package Manager (EPM) file list for the Common UNIX Printing -# System (CUPS). +# ESP Package Manager (EPM) file list for CUPS. # # Copyright 2007-2009 by Apple Inc. # Copyright 1997-2007 by Easy Software Products, all rights reserved. @@ -15,8 +14,8 @@ # # Product information -%product Common UNIX Printing System -%copyright 2007-2008 by Apple Inc. +%product CUPS +%copyright 2007-2009 by Apple Inc. %vendor Apple Inc. #%license LICENSE.txt %readme LICENSE.txt @@ -26,11 +25,8 @@ %format !rpm %version @CUPS_VERSION@ %format all -%description The Common UNIX Printing System provides a portable printing -%description layer for UNIX(r) operating systems. It was developed by -%description Easy Software Products to promote a standard printing solution -%description for all UNIX vendors and users and is now owned by Apple Inc. -%description CUPS provides the System V and Berkeley command-line interfaces. +%description CUPS is the standards-based, open source printing system developed by +%description Apple Inc. for Mac OSÂ® X and other UNIXÂ®-like operating systems. %format rpm %provides lpd diff --git a/packaging/cups.spec.in b/packaging/cups.spec.in index e431b8c5e..237cffe4e 100644 --- a/packaging/cups.spec.in +++ b/packaging/cups.spec.in @@ -1,7 +1,7 @@ # # "$Id: cups.spec.in 7718 2008-07-10 23:04:22Z mike $" # -# RPM "spec" file for the Common UNIX Printing System (CUPS). +# RPM "spec" file for CUPS. # # Original version by Jason McMullan . # @@ -32,7 +32,7 @@ %{?_with_static: %define _static --enable-static} %{!?_with_static: %define _static --disable-static} -Summary: Common UNIX Printing System +Summary: CUPS Name: cups Version: @CUPS_VERSION@ Release: 0 @@ -56,51 +56,43 @@ Obsoletes: cups-id, cups-it, cups-ja, cups-ko, cups-nl, cups-no, cups-pl Obsoletes: cups-pt, cups-ru, cups-sv, cups-zh %package devel -Summary: Common UNIX Printing System - development environment +Summary: CUPS - development environment Group: Development/Libraries Requires: %{name}-libs = %{epoch}:%{version} %package libs -Summary: Common UNIX Printing System - shared libraries +Summary: CUPS - shared libraries Group: System Environment/Libraries Provides: libcups1 %package lpd -Summary: Common UNIX Printing System - LPD support +Summary: CUPS - LPD support Group: System Environment/Daemons Requires: %{name} = %{epoch}:%{version} xinetd %if %{?_with_php:1}%{!?_with_php:0} %package php -Summary: Common UNIX Printing System - PHP support +Summary: CUPS - PHP support Group: Development/Languages Requires: %{name}-libs = %{epoch}:%{version} %endif %description -The Common UNIX Printing System provides a portable printing layer for -UNIX® operating systems. It was developed by Easy Software Products -to promote a standard printing solution for all UNIX vendors and users -and is now owned by Apple Inc. CUPS provides the System V and Berkeley -command-line interfaces. +CUPS is the standards-based, open source printing system developed by +Apple Inc. for Mac OS¨ X and other UNIX¨-like operating systems. %description devel -The Common UNIX Printing System provides a portable printing layer for -UNIX® operating systems. This is the development package for creating -additional printer drivers and other CUPS services. +This package provides the CUPS headers and development environment. %description libs -The Common UNIX Printing System provides a portable printing layer for -UNIX® operating systems. This package contains the CUPS shared libraries. +This package provides the CUPS shared libraries. %description lpd -The Common UNIX Printing System provides a portable printing layer for -UNIX® operating systems. This package provides LPD client support. +This package provides LPD client support. %if %{?_with_php:1}%{!?_with_php:0} %description php -The Common UNIX Printing System provides a portable printing layer for -UNIX® operating systems. This package provides PHP support. +This package provides PHP support for CUPS. %endif %prep