Import cups.org releases

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/tags/release-1.3.2@4306 a1ca3aef-8c08-0410-bb20-df032aa958be

CHANGES.txt

@@ -1,20 +1,6 @@
-CHANGES.txt - 2007-09-28
+CHANGES.txt - 2007-09-18
 ------------------------
 
-CHANGES IN CUPS V1.3.3
-
-	- The scheduler did not use the attributes-natural-language
-	  attribute when passing the LANG environment variable to
-	  cups-deviced or cups-driverd.
-	- The scheduler did not use the printer-op-policy when
-	  modifying classes or printers (STR #2525)
-	- The auth-info-required attribute was not always updated
-	  for remote queues that required authentication.
-	- The German web interface localization contained errors
-	  (STR #2523)
-	- The Swedish localization contained errors (STR #2522)
-
-
 CHANGES IN CUPS V1.3.2
 
 	- The 1.3.1 release was incorrectly created from the

backend/usb-darwin.c

@@ -105,7 +105,7 @@
  */
 #define WAIT_EOF_DELAY			7
 #define WAIT_SIDE_DELAY			3
-#define DEFAULT_TIMEOUT			5000L
+#define DEFAULT_TIMEOUT			60L
 
 #define	USB_INTERFACE_KIND		CFUUIDGetUUIDBytes(kIOUSBInterfaceInterfaceID190)
 #define kUSBLanguageEnglish		0x409
@@ -342,13 +342,6 @@ print_device(const char *uri,		/* I - Device URI */
   g.serial	= cfstr_create_trim(serial);
   g.location	= location;
 
-  if (!g.make || !g.model)
-  {
-    _cupsLangPrintf(stderr, 
-		    _("ERROR: Unable to create make and model strings\n"));
-    return CUPS_BACKEND_STOP;
-  }
-
   fputs("STATE: +connecting-to-device\n", stderr);
 
   countdown = INITIAL_LOG_INTERVAL;
@@ -1080,9 +1073,9 @@ static Boolean find_device_cb(void *refcon,
       CFStringRef make = NULL,  model = NULL, serial = NULL;
 
       copy_deviceinfo(idString, &make, &model, &serial);
-      if (make && CFStringCompare(make, g.make, kCFCompareCaseInsensitive) == kCFCompareEqualTo)
+      if (CFStringCompare(make, g.make, kCFCompareCaseInsensitive) == kCFCompareEqualTo)
       {
-	if (model && CFStringCompare(model, g.model, kCFCompareCaseInsensitive) == kCFCompareEqualTo)
+	if (CFStringCompare(model, g.model, kCFCompareCaseInsensitive) == kCFCompareEqualTo)
 	{
 	  if (g.serial != NULL && CFStringGetLength(g.serial) > 0)
 	  {
@@ -1979,7 +1972,7 @@ static void soft_reset()
   * Send the reset...
   */
 
-  (*g.classdriver)->SoftReset(g.classdriver, DEFAULT_TIMEOUT);
+  (*g.classdriver)->SoftReset(g.classdriver, 0);
 
  /*
   * Release the I/O lock...

config-scripts/cups-common.m4

@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-common.m4 6981 2007-09-19 21:51:55Z mike $"
+dnl "$Id: cups-common.m4 6965 2007-09-17 21:34:07Z mike $"
 dnl
 dnl   Common configuration stuff for the Common UNIX Printing System (CUPS).
 dnl
@@ -20,7 +20,7 @@ dnl Set the name of the config header file...
 AC_CONFIG_HEADER(config.h)
 
 dnl Versio number information...
-CUPS_VERSION="1.3.3"
+CUPS_VERSION="1.3.2"
 CUPS_REVISION=""
 #if test -z "$CUPS_REVISION" -a -d .svn; then
 #	CUPS_REVISION="-r`svnversion . | awk -F: '{print $NF}' | sed -e '1,$s/[[a-zA-Z]]*//g'`"
@@ -287,5 +287,5 @@ AC_SUBST(DEFAULT_IPP_PORT)
 AC_DEFINE_UNQUOTED(CUPS_DEFAULT_IPP_PORT,$DEFAULT_IPP_PORT)
 
 dnl
-dnl End of "$Id: cups-common.m4 6981 2007-09-19 21:51:55Z mike $".
+dnl End of "$Id: cups-common.m4 6965 2007-09-17 21:34:07Z mike $".
 dnl

cups/cups.h

@@ -59,10 +59,10 @@ extern "C" {
  * Constants...
  */
 
-#  define CUPS_VERSION		1.0303
+#  define CUPS_VERSION		1.0302
 #  define CUPS_VERSION_MAJOR	1
 #  define CUPS_VERSION_MINOR	3
-#  define CUPS_VERSION_PATCH	3
+#  define CUPS_VERSION_PATCH	2
 #  define CUPS_DATE_ANY		-1
 
 

doc/de/index.html.in

@@ -115,8 +115,8 @@ WIDTH="15" HEIGHT="15" ALT=""></TD>
 <TD COLSPAN="2" WIDTH="100%" STYLE="padding: 5;">
 
 <P><SMALL>Das Common UNIX Printing System, CUPS, und das CUPS Logo sind
-eingetragene Warenzeichen der <A HREF="http://www.apple.com">Apple Inc.</A>
-CUPS ist urheberrechtlich gesch&uuml;tzt 2007 von Apple Inc, alle Rechte vorbehalten.</SMALL></P>
+Warenzeichen der <A HREF="http://www.apple.com">Apple Inc./A> CUPS ist urheberrechtlich gesch&uuml;tzt 2007 von Apple Inc,
+Alle Rechte vorbehalten.</SMALL></P>
 
 </TD>
 

doc/help/spec-ppd.html

@@ -8,7 +8,7 @@
 </head>
 <body>
 <!--
-  "$Id: spec-ppd.html 6996 2007-09-28 18:30:31Z mike $"
+  "$Id: spec-ppd.html 6850 2007-08-23 18:29:04Z mike $"
 
   CUPS PPD extensions specification for the Common UNIX Printing System (CUPS).
 
@@ -95,7 +95,7 @@ PPD file to stdout.</p>
 "<br>
 *End</p>
 
-<p>The <tt>?<i>MainKeyword</i></tt> attribute defines PostScript code that
+<p>The <tt>?<i>MainKeyword</i><tt> attribute defines PostScript code that
 determines the currently selected/enabled option keyword (choice) for the
 main keyword (option). It is typically used when communicating with USB,
 serial, Appletalk, and AppSocket (port 9100) printers.</p>
@@ -152,7 +152,7 @@ printers.</p>
 
 <p>CUPS supports three types of color profiles. The first type is
 based on sRGB and is used by the standard CUPS raster filters and
-GPL Ghostscript. The second type is based on ICC profiles and is
+ESP Ghostscript. The second type is based on ICC profiles and is
 used by the Quartz-based filters on MacOS X. The final type is
 based on well-known colorspaces such as sRGB and Adobe RGB.</p>
 
@@ -866,7 +866,7 @@ PRE B {
 	<td><tt>cupsColorSpace</tt></td>
 	<td>Integer</td>
 	<td>Specifies the page image colorspace: 0 = W, 1 = RGB, 2 = RGBA, 3 = K, 4 = CMY, 5 = YMC, 6 = CMYK, 7 = YMCK, 8 = KCMY, 9 = KCMYcm, 10 = GMCK, 11 = GMCS, 12 = White, 13 = Gold, 14 = Silver, 15 = CIE XYZ, 16 = CIE Lab, 17 = RGBW, 32 to 46 = CIE Lab (1 to 15 inks)</td>
-	<td><tt>&lt;&lt;/cupsColorSpace 1 &gt;&gt;setpagedevice</tt></td>
+	<td><tt>&lt;&lt;/cupsColorSpace &gt;&gt;setpagedevice</tt></td>
 </tr>
 <tr valign='top'>
 	<td><tt>cupsCompression</tt></td>

locale/Makefile

@@ -16,7 +16,7 @@
 include ../Makedefs
 
 
-OBJS	=	checkpo.o po2strings.o strings2po.o translate.o
+OBJS	=	checkpo po2strings.o strings2po.o translate.o
 TARGETS	=	checkpo po2strings strings2po translate
 
 

scheduler/client.c

@@ -4235,7 +4235,6 @@ pipe_command(cupsd_client_t *con,	/* I - Client connection */
 		script_name[1024],	/* SCRIPT_NAME environment variable */
 		server_name[1024],	/* SERVER_NAME environment variable */
 		server_port[1024];	/* SERVER_PORT environment variable */
-  ipp_attribute_t *attr;		/* attributes-natural-language attribute */
 
 
  /*
@@ -4371,45 +4370,8 @@ pipe_command(cupsd_client_t *con,	/* I - Client connection */
   else
     auth_type[0] = '\0';
 
-  if (con->request &&
-      (attr = ippFindAttribute(con->request, "attributes-natural-language",
-                               IPP_TAG_LANGUAGE)) != NULL)
-  {
-    switch (strlen(attr->values[0].string.text))
-    {
-      default :
-	 /*
-	  * This is an unknown or badly formatted language code; use
-	  * the POSIX locale...
-	  */
-
-	  strcpy(lang, "LANG=C");
-	  break;
-
-      case 2 :
-	 /*
-	  * Just the language code (ll)...
-	  */
-
-	  snprintf(lang, sizeof(lang), "LANG=%s.UTF8",
-		   attr->values[0].string.text);
-	  break;
-
-      case 5 :
-	 /*
-	  * Language and country code (ll-cc)...
-	  */
-
-	  snprintf(lang, sizeof(lang), "LANG=%c%c_%c%c.UTF8",
-		   attr->values[0].string.text[0],
-		   attr->values[0].string.text[1],
-		   toupper(attr->values[0].string.text[3] & 255),
-		   toupper(attr->values[0].string.text[4] & 255));
-	  break;
-    }
-  }
-  else if (con->language)
-    snprintf(lang, sizeof(lang), "LANG=%s.UTF8", con->language->language);
+  if (con->language)
+    snprintf(lang, sizeof(lang), "LANG=%s.UTF-8", con->language->language);
   else
     strcpy(lang, "LANG=C");
 

scheduler/job.c

@@ -3007,7 +3007,7 @@ start_job(cupsd_job_t     *job,		/* I - Job ID */
         * Just the language code (ll)...
 	*/
 
-        snprintf(lang, sizeof(lang), "LANG=%s.UTF8",
+        snprintf(lang, sizeof(lang), "LANG=%s",
 	         attr->values[0].string.text);
         break;
 
@@ -3016,7 +3016,7 @@ start_job(cupsd_job_t     *job,		/* I - Job ID */
         * Language and country code (ll-cc)...
 	*/
 
-        snprintf(lang, sizeof(lang), "LANG=%c%c_%c%c.UTF8",
+        snprintf(lang, sizeof(lang), "LANG=%c%c_%c%c",
 	         attr->values[0].string.text[0],
 		 attr->values[0].string.text[1],
 		 toupper(attr->values[0].string.text[3] & 255),
@@ -3610,7 +3610,6 @@ update_job(cupsd_job_t *job)		/* I - Job to check */
                                 attrs)) != NULL)
       {
         cupsdSetAuthInfoRequired(job->printer, attr, NULL);
-	cupsdSetPrinterAttrs(job->printer);
 	cupsdSaveAllPrinters();
       }
 

scheduler/process.c

@@ -135,7 +135,6 @@ cupsdStartProcess(
   {
     cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to execute %s: %s", command,
                     strerror(errno));
-    *pid = 0;
     return (0);
   }
 

templates/de/trailer.tmpl

@@ -7,8 +7,9 @@ WIDTH="15" HEIGHT="15" ALT=""></TD>
 <TD COLSPAN="2" WIDTH="100%" STYLE="padding: 5;">
 
 <P><SMALL>Das Common UNIX Printing System, CUPS, und das CUPS Logo sind
-eingetragene Warenzeichen der <A HREF="http://www.apple.com">Apple Inc.</A> CUPS
-ist urheberrechtlich gesch&uuml;tzt 2007 von Apple Inc, alle Rechte vorbehalten.</SMALL></P>
+eingetragene Warenzeichen der <A HREF="http://www.easysw.com">Easy Software
+Products</A>. CUPS ist urheberrechtlich geschützt 1997-2006 von Easy Software Products,
+Alle Rechte vorbehalten.</SMALL></P>
 
 </TD>