Load cups into easysw/current.

git-svn-id: svn+ssh:https://src.apple.com/svn/cups/easysw/current@326 a1ca3aef-8c08-0410-bb20-df032aa958be

CHANGES-1.2.txt

@@ -3,6 +3,9 @@ CHANGES-1.2.txt
 
 CHANGES IN CUPS V1.2.11
 
+ - Fixed the "relaying from" log message (STR #2376)
+ - Updated the launchd support on Mac OS X to better
+ support reconfiguration.
  - "make distclean" didn't remove all generated files
  (STR #2366)
  - Fixed a bug in the advertisement of classes (STR

CHANGES.txt

@@ -5,6 +5,8 @@ CHANGES IN CUPS V1.3
 
  - Documentation updates (STR #1775, STR #2130, STR #2131,
  STR #2263, STR #2356)
+ - The scheduler did not report Bonjour shared printers as
+ remote printers (STR #2384)
  - Added new -R and -W options to the cupstestppd program
  for greater control over the testing of PPDs.
  - Added a new cupsGetServerPPD() function for getting
@@ -14,11 +16,17 @@ CHANGES IN CUPS V1.3
  - Added a new CUPS_GET_PPD operation for getting an
  available PPD file on the server (STR #2334) 
  - CUPS_GET_PPDS now reports multiple ppd-product values
- if the corresponding PPD contains multiple products
- (STR #2334)
+ based on the PPD ModelName and Product strings (STR
+ #2334, STR #2383)
  - CUPS_GET_PPDS now reports the PSVersion attributes
  from a PPD file in the ppd-psversion attribute
  (STR #2334)
+ - CUPS_GET_PPDS now reports the cupsModelNumber attribute
+ from a PPD file in the ppd-model-number attribute (STR
+ #2383)
+ - CUPS_GET_PPDS now reports a driver type string in the
+ ppd-type attribute based on the cupsFax and cupsFilter
+ attributes in a PPD file (STR #2383)
  - Added a new printer attribute called "cups-version"
  which reports the version of CUPS that is running
  (STR #2240)

Makefile

@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 6500 2007-04-30 21:47:48Z mike $"
+# "$Id: Makefile 6513 2007-05-06 23:50:25Z mike $"
 #
 # Top-level Makefile for the Common UNIX Printing System (CUPS).
 #
@@ -132,12 +132,21 @@ install: installhdrs
  echo Installing StartupItems files...; \
  $(INSTALL_SCRIPT) init/PrintingServices $(BUILDROOT)$(INITDDIR)/PrintingServices; \
  $(INSTALL_DATA) init/StartupParameters.plist $(BUILDROOT)$(INITDDIR)/StartupParameters.plist; \
- $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDDIR)/Resources/English.lproj; \
+ $(INSTALL_DIR) $(BUILDROOT)$(INITDDIR)/Resources/English.lproj; \
  $(INSTALL_DATA) init/Localizable.strings $(BUILDROOT)$(INITDDIR)/Resources/English.lproj/Localizable.strings; \
  elif test "$(INITDDIR)" = "/System/Library/LaunchDaemons"; then \
  echo Installing LaunchDaemons configuration files...; \
  $(INSTALL_DATA) init/org.cups.cupsd.plist $(BUILDROOT)$(DEFAULT_LAUNCHD_CONF); \
  $(INSTALL_DATA) init/org.cups.cups-lpd.plist $(BUILDROOT)/System/Library/LaunchDaemons; \
+ case `uname -r` in \
+ 8.*) \
+ $(INSTALL_DIR) $(BUILDROOT)/System/Library/StartupItems/PrintingServices; \
+ $(INSTALL_SCRIPT) init/PrintingServices.launchd $(BUILDROOT)/System/Library/StartupItems/PrintingServices/PrintingServices; \
+ $(INSTALL_DATA) init/StartupParameters.plist $(BUILDROOT)/System/Library/StartupItems/PrintingServices/StartupParameters.plist; \
+ $(INSTALL_DIR) $(BUILDROOT)/System/Library/StartupItems/PrintingServices/Resources/English.lproj; \
+ $(INSTALL_DATA) init/Localizable.strings $(BUILDROOT)/System/Library/StartupItems/PrintingServices/Resources/English.lproj/Localizable.strings; \
+ ;; \
+ esac \
  else \
  echo Installing RC script...; \
  $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDDIR)/cups; \
@@ -215,7 +224,9 @@ uninstall:
  $(RM) $(BUILDROOT)$(INITDDIR)/Resources/English.lproj/Localizable.strings; \
  $(RMDIR) $(BUILDROOT)$(INITDDIR)/Resources/English.lproj; \
  elif test "$(INITDDIR)" = "/System/Library/LaunchDaemons"; then \
- $(RM) $(BUILDROOT)$(DEFAULT_LAUNCHD_CONF); \
+ $(RM) $(BUILDROOT)$(INITDDIR)/org.cups.cupsd.plist; \
+ $(RM) $(BUILDROOT)$(INITDDIR)/org.cups.cups-lpd.plist; \
+ $(RMDIR) $(BUILDROOT)/System/Library/StartupItems/PrintingServices; \
  else \
  $(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDDIR)/cups; \
  fi \
@@ -280,5 +291,5 @@ dist: all
 
 
 #
-# End of "$Id: Makefile 6500 2007-04-30 21:47:48Z mike $".
+# End of "$Id: Makefile 6513 2007-05-06 23:50:25Z mike $".
 #

config-scripts/cups-defaults.m4

@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-defaults.m4 6431 2007-04-02 14:31:49Z mike $"
+dnl "$Id: cups-defaults.m4 6529 2007-05-08 19:48:20Z mike $"
 dnl
 dnl Default cupsd configuration settings for the Common UNIX Printing System
 dnl (CUPS).
@@ -24,11 +24,11 @@ dnl WWW: http:https://www.cups.org
 dnl
 
 dnl Default langugages...
-AC_ARG_WITH(languages, [ --with-languages set installed languages, default="de es et fr he it ja pl sv" ],
+AC_ARG_WITH(languages, [ --with-languages set installed languages, default="de es et fr he it ja pl sv zh_TW" ],
  if test "x$withval" != xno; then
  LANGUAGES="$withval"
  fi,
- LANGUAGES="de es et fr he it ja pl sv")
+ LANGUAGES="de es et fr he it ja pl sv zh_TW")
 AC_SUBST(LANGUAGES)
 
 dnl Default ConfigFilePerm
@@ -294,5 +294,5 @@ AC_SUBST(CUPS_MAX_COPIES)
 AC_DEFINE_UNQUOTED(CUPS_DEFAULT_MAX_COPIES, $CUPS_MAX_COPIES)
 
 dnl
-dnl End of "$Id: cups-defaults.m4 6431 2007-04-02 14:31:49Z mike $".
+dnl End of "$Id: cups-defaults.m4 6529 2007-05-08 19:48:20Z mike $".
 dnl

cups/language.c

@@ -1,5 +1,5 @@
 /*
- * "$Id: language.c 6489 2007-04-30 17:55:15Z mike $"
+ * "$Id: language.c 6532 2007-05-09 18:54:23Z mike $"
  *
  * I18N/language support for the Common UNIX Printing System (CUPS).
  *
@@ -351,7 +351,7 @@ cupsLangGet(const char *language) /* I - Language or locale */
  * preference so we have to look it up this way...
  */
 
- if (!language)
+ if (!language && (language = getenv("LANG")) == NULL)
  language = appleLangDefault();
 
 #else
@@ -1363,5 +1363,5 @@ cups_unquote(char *d, /* O - Unquoted string */
 
 
 /*
- * End of "$Id: language.c 6489 2007-04-30 17:55:15Z mike $".
+ * End of "$Id: language.c 6532 2007-05-09 18:54:23Z mike $".
  */

desktop/cups.desktop

@@ -29,3 +29,5 @@ Name[it]=Gestione stampa
 Comment[it]=Interfaccia web di CUPS
 Name[he]=נהל הדפסות
 Comment[he]=ממשק דפדפן של CUPS
+Name[zh_TW]=印表管理
+Comment[zh_TW]=CUPS 網頁介面

doc/Makefile

@@ -1,9 +1,9 @@
 #
-# "$Id: Makefile 6431 2007-04-02 14:31:49Z mike $"
+# "$Id: Makefile 6519 2007-05-08 01:55:27Z mike $"
 #
 # Documentation makefile for the Common UNIX Printing System (CUPS).
 #
-# Copyright 1997-2006 by Easy Software Products.
+# Copyright 1997-2007 by Easy Software Products.
 #
 # These coded instructions, statements, and computer programs are the
 # property of Easy Software Products and are protected by Federal
@@ -38,9 +38,11 @@ WEBBUTTONS = \
  images/button-accept-jobs.gif \
  images/button-add-class.gif \
  images/button-add-printer.gif \
+ images/button-add-rss-subscription.gif \
  images/button-add-this-printer.gif \
  images/button-cancel-all-jobs.gif \
  images/button-cancel-job.gif \
+ images/button-cancel-subscription.gif \
  images/button-change-settings.gif \
  images/button-clean-print-heads.gif \
  images/button-clear.gif \
@@ -51,6 +53,7 @@ WEBBUTTONS = \
  images/button-export-samba.gif \
  images/button-help.gif \
  images/button-hold-job.gif \
+ images/button-list-available-printers.gif \
  images/button-manage-classes.gif \
  images/button-manage-jobs.gif \
  images/button-manage-printers.gif \

doc/help/spec-ipp.html

@@ -1512,20 +1512,39 @@ <h4>CUPS-Get-PPDs Request</h4>
 
  <dt>"limit" (integer (1:MAX)):
 
- <dd>The client OPTIONALLY supplies this attribute limiting the number of
- PPDs that are returned.
+ <dd>The client OPTIONALLY supplies this attribute limiting the number of PPDs that are returned.
 
  <dt>"ppd-make" (text(127)):
 
- <dd>The client OPTIONALLY supplies a printer manufacturer to select
- which PPDs are returned.
+ <dd>The client OPTIONALLY supplies a printer manufacturer to select which PPDs are returned.
+
+ <dt>"ppd-make-and-model" (text(127)):<span class='info'>CUPS 1.3</span>
+
+ <dd>The client OPTIONALLY supplies a make and model to select which PPDs are returned.
+
+ <dt>"ppd-model-number" (integer):<span class='info'>CUPS 1.3</span>
+
+ <dd>The client OPTIONALLY supplies a model number to select which PPDs are returned.
+
+ <dt>"ppd-natural-language" (naturalLanguage):<span class='info'>CUPS 1.3</span>
+
+ <dd>The client OPTIONALLY supplies a language to select which PPDs are returned.
+
+ <dt>"ppd-product" (text(127)):<span class='info'>CUPS 1.3</span>
+
+ <dd>The client OPTIONALLY supplies a PostScript product string to select which PPDs are returned.
+
+ <dt>"ppd-psversion" (text(127)):<span class='info'>CUPS 1.3</span>
+
+ <dd>The client OPTIONALLY supplies a PostScript version string to select which PPDs are returned.
+
+ <dt>"ppd-type" (type1 keyword):<span class='info'>CUPS 1.3</span>
+
+ <dd>The client OPTIONALLY supplies a driver type to select which PPDs are returned.
 
  <dt>"requested-attributes" (1setOf keyword) :
 
- <dd>The client OPTIONALLY supplies a set of attribute names and/or
- attribute group names in whose values the requester is interested. If
- the client omits this attribute, the server responds as if this
- attribute had been supplied with a value of 'all'.
+ <dd>The client OPTIONALLY supplies a set of attribute names and/or attribute group names in whose values the requester is interested. If the client omits this attribute, the server responds as if this attribute had been supplied with a value of 'all'. Specify "ppd-make" to get a list of manufacturers.
 
 </dl>
 
@@ -2135,11 +2154,13 @@ <h4><a name="ppd-make-and-model">ppd-make-and-model (text(127))</a></h4>
 make and model is not specified in the PPD file then the ModelName or
 ShortNickName attributes are used instead.
 
+<h4><a name="ppd-model-number">ppd-model-number (integer)</a><span class="info">CUPS 1.3</span></h4>
+
+<p>The ppd-model-number attribute provides the <tt>cupsModelNumber</tt> value from the PPD file.
+
 <h4><a name="ppd-name">ppd-name (name(255))</a></h4>
 
-<p>The ppd-name attribute specifies the PPD filename on the server
-relative to the model directory. The forward slash (/) is used to
-delineate directories.
+<p>The ppd-name attribute specifies either the PPD filename on the server relative to the model directory or a URI that maps to a specific driver interface in the driver directory. The forward slash (/) is used to delineate directories.
 
 <h4><a name="ppd-natural-language">ppd-natural-language (1setOf naturalLanguage)</a></h4>
 
@@ -2155,6 +2176,24 @@ <h4><a name="ppd-psversion">ppd-psversion (1setOf text(127))</a><span class="inf
 
 <p>The ppd-product attribute specifies the PSVersion attribute values in the PPD file.
 
+<h4><a name="ppd-type">ppd-type (type1 keyword)</a><span class="info">CUPS 1.3</span></h4>
+
+<p>The ppd-type attribute specifies the type of driver described by the PPD file:</p>
+
+<ul>
+
+ <li><tt>fax</tt> - A facsimile or multi-function device</li>
+
+ <li><tt>pdf</tt> - A PDF printer</li>
+
+ <li><tt>postscript</tt> - A PostScript printer (no filters)</li>
+
+ <li><tt>raster</tt> - A CUPS raster driver</li>
+
+ <li><tt>unknown</tt> - An unknown or hybrid driver</li>
+
+</ul>
+
 
 <h3 class='title'><a name='PRINTER_ATTRIBUTES'>Printer Attributes</a></h3>
 

doc/help/spec-ppd.html

@@ -8,7 +8,7 @@
 </head>
 <body>
 <!--
- "$Id: spec-ppd.html 6457 2007-04-17 18:40:55Z mike $"
+ "$Id: spec-ppd.html 6534 2007-05-16 17:51:03Z mike $"
 
  CUPS PPD extensions specification for the Common UNIX Printing System (CUPS).
 
@@ -109,6 +109,18 @@ <h3>APDuplexRequiresFlippedMargin</h3>
 
 <p>Also see the related <tt>cupsFlipDuplex</tt> attribute.</p>
 
+<h3>APRemoteQueueID</h3>
+
+<p class='summary'>*APRemoteQueueID: "string"</p>
+
+<p>This string attribute notifies the scheduler that this PPD is for a remote CUPS printer, typically shared via Bonjour.</p>
+
+<p>Example:</p>
+
+<pre class='command'>
+*APRemoteQueueID: "myprinter"
+</pre>
+
 <h3>cupsEvenDuplex</h3>
 
 <p class='summary'>*cupsEvenDuplex: boolean</p>
@@ -124,6 +136,18 @@ <h3>cupsEvenDuplex</h3>
 *cupsEvenDuplex: true
 </pre>
 
+<h3>cupsFax</h3>
+
+<p class='summary'>*cupsFax: boolean</p>
+
+<p>This boolean attribute specifies whether the PPD defines a facsimile device. The default is <tt>false</tt>.</p>
+
+<p>Examples:</p>
+
+<pre class='command'>
+*cupsFax: true
+</pre>
+
 <h3>cupsFilter</h3>
 
 <p class='summary'>*cupsFilter: "source/type cost program"</p>