From: msweet Date: Wed, 3 Jul 2013 13:53:05 +0000 (+0000) Subject: Update version numbers. X-Git-Tag: release-1.7rc1~19 X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fcups.git;a=commitdiff_plain;h=9c0e8e5d83879f36c798e1d84a4a947109bc0204 Update version numbers. git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11085 a1ca3aef-8c08-0410-bb20-df032aa958be --- diff --git a/CHANGES.txt b/CHANGES.txt index db227a373..f0d18edbc 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,4 @@ -CHANGES.txt - 1.7rc1 - 2013-06-25 +CHANGES.txt - 1.7rc1 - 2013-07-03 --------------------------------- CHANGES IN CUPS V1.7rc1 diff --git a/README.txt b/README.txt index 136d9ed6d..eb82d1e4b 100644 --- a/README.txt +++ b/README.txt @@ -1,13 +1,13 @@ -README - CUPS v1.7b1 - 2013-04-18 ---------------------------------- - -************************************************ -************************************************ -**** **** -**** BETA SOFTWARE - USE AT YOUR OWN RISK **** -**** **** -************************************************ -************************************************ +README - CUPS v1.7rc1 - 2013-07-03 +---------------------------------- + +******************************************************* +******************************************************* +**** **** +**** PRE-RELEASE SOFTWARE - USE AT YOUR OWN RISK **** +**** **** +******************************************************* +******************************************************* Looking for compile instructions? Read the file "INSTALL.txt" instead... diff --git a/cups/dest-options.c b/cups/dest-options.c index 5201302a8..4b03189c5 100644 --- a/cups/dest-options.c +++ b/cups/dest-options.c @@ -713,7 +713,7 @@ cupsCopyDestInfo( * @code ippGetResolution@, @code ippGetString@, and @code ippGetValueTag@ * functions to inspect the default value(s) as needed. * - * @since CUPS 1.7@ + * @since CUPS 1.7/OS X 10.9@ */ ipp_attribute_t * /* O - Default attribute or @code NULL@ for none */ @@ -753,7 +753,7 @@ cupsFindDestDefault( * @code ippGetResolution@, @code ippGetString@, and @code ippGetValueTag@ * functions to inspect the default value(s) as needed. * - * @since CUPS 1.7@ + * @since CUPS 1.7/OS X 10.9@ */ ipp_attribute_t * /* O - Default attribute or @code NULL@ for none */ @@ -795,7 +795,7 @@ cupsFindDestReady( * @code ippGetResolution@, @code ippGetString@, and @code ippGetValueTag@ * functions to inspect the default value(s) as needed. * - * @since CUPS 1.7@ + * @since CUPS 1.7/OS X 10.9@ */ ipp_attribute_t * /* O - Default attribute or @code NULL@ for none */ @@ -874,7 +874,7 @@ cupsFreeDestInfo(cups_dinfo_t *dinfo) /* I - Destination information */ * example, passing @code CUPS_MEDIA_FLAGS_BORDERLESS@ will get the Nth * borderless size supported by the printer. * - * @since CUPS 1.7@ + * @since CUPS 1.7/OS X 10.9@ */ int /* O - 1 on success, 0 on failure */ @@ -1069,7 +1069,7 @@ cupsGetDestMediaBySize( * counted. For example, passing @code CUPS_MEDIA_FLAGS_BORDERLESS@ will return * the number of borderless sizes. * - * @since CUPS 1.7@ + * @since CUPS 1.7/OS X 10.9@ */ int /* O - Number of sizes */ @@ -1110,7 +1110,7 @@ cupsGetDestMediaCount( * example, passing @code CUPS_MEDIA_FLAGS_BORDERLESS@ will return the default * borderless size, typically US Letter or A4, but sometimes 4x6 photo media. * - * @since CUPS 1.7@ + * @since CUPS 1.7/OS X 10.9@ */ int /* O - 1 on success, 0 on failure */ diff --git a/cups/http-addr.c b/cups/http-addr.c index 00882baca..b49e5cbea 100644 --- a/cups/http-addr.c +++ b/cups/http-addr.c @@ -137,7 +137,7 @@ httpAddrLength(const http_addr_t *addr) /* I - Address */ * 'httpAddrListen()' - Create a listening socket bound to the specified * address and port. * - * @since CUPS 1.7@ + * @since CUPS 1.7/OS X 10.9@ */ int /* O - Socket or -1 on error */ @@ -364,7 +364,7 @@ httpAddrLookup( /* * 'httpAddrPort()' - Get the port number associated with an address. * - * @since CUPS 1.7@ + * @since CUPS 1.7/OS X 10.9@ */ int /* O - Port number */ diff --git a/cups/http-addrlist.c b/cups/http-addrlist.c index 4943b5867..a718ba347 100644 --- a/cups/http-addrlist.c +++ b/cups/http-addrlist.c @@ -59,7 +59,7 @@ httpAddrConnect( * 'httpAddrConnect2()' - Connect to any of the addresses in the list with a * timeout and optional cancel. * - * @since CUPS 1.7@ + * @since CUPS 1.7/OS X 10.9@ */ http_addrlist_t * /* O - Connected address or NULL on failure */ @@ -322,7 +322,7 @@ httpAddrConnect2( /* * 'httpAddrCopyList()' - Copy an address list. * - * @since CUPS 1.7@ + * @since CUPS 1.7/OS X 10.9@ */ http_addrlist_t * /* O - New address list or @code NULL@ on error */ diff --git a/cups/http-support.c b/cups/http-support.c index 24664d3c9..4fac9fe79 100644 --- a/cups/http-support.c +++ b/cups/http-support.c @@ -506,7 +506,7 @@ httpAssembleURIf( * * The buffer needs to be at least 46 bytes in size. * - * @since CUPS 1.7@ + * @since CUPS 1.7/OS X 10.9@ */ char * /* I - UUID string */ diff --git a/cups/http.c b/cups/http.c index d893bf7ed..523db01da 100644 --- a/cups/http.c +++ b/cups/http.c @@ -278,7 +278,7 @@ static BIO_METHOD http_bio_methods = * 'httpAcceptConnection()' - Accept a new HTTP client connection from the * specified listening socket. * - * @since CUPS 1.7@ + * @since CUPS 1.7/OS X 10.9@ */ http_t * /* O - HTTP connection or @code NULL@ */ @@ -582,7 +582,7 @@ httpConnect(const char *host, /* I - Host to connect to */ /* * 'httpConnect2()' - Connect to a HTTP server. * - * @since CUPS 1.7@ + * @since CUPS 1.7/OS X 10.9@ */ http_t * /* O - New HTTP connection */ @@ -1075,7 +1075,7 @@ httpGetBlocking(http_t *http) /* I - Connection to server */ * client. The value returned can be use in subsequent requests (for clients) * or in the response (for servers) in order to compress the content stream. * - * @since CUPS 1.7@ + * @since CUPS 1.7/OS X 10.9@ */ const char * /* O - Content-Coding value or @@ -1173,7 +1173,7 @@ httpGetCookie(http_t *http) /* I - HTTP connecion */ * Returns @code HTTP_STATUS_NONE@ if there is no Expect header, otherwise * returns the expected HTTP status code, typically @code HTTP_STATUS_CONTINUE@. * - * @since CUPS 1.7@ + * @since CUPS 1.7/OS X 10.9@ */ http_status_t /* O - Expect: status, if any */ @@ -1807,7 +1807,7 @@ httpOptions(http_t *http, /* I - Connection to server */ * * For non-blocking connections the usual timeouts apply. * - * @since CUPS 1.7@ + * @since CUPS 1.7/OS X 10.9@ */ ssize_t /* O - Number of bytes copied */ @@ -2472,7 +2472,7 @@ _httpReadGNUTLS( /* * 'httpReadRequest()' - Read a HTTP request from a connection. * - * @since CUPS 1.7@ + * @since CUPS 1.7/OS X 10.9@ */ http_state_t /* O - New state of connection */ @@ -2893,7 +2893,7 @@ httpSetCookie(http_t *http, /* I - Connection */ * Currently only @code HTTP_FIELD_ACCEPT_ENCODING@, @code HTTP_FIELD_SERVER@, * and @code HTTP_FIELD_USER_AGENT@ can be set. * - * @since CUPS 1.7@ + * @since CUPS 1.7/OS X 10.9@ */ void @@ -3824,7 +3824,7 @@ _httpWriteGNUTLS( /* * 'httpWriteResponse()' - Write a HTTP response to a client connection. * - * @since CUPS 1.7@ + * @since CUPS 1.7/OS X 10.9@ */ int /* O - 0 on success, -1 on error */ diff --git a/cups/http.h b/cups/http.h index 92953fc95..a7a25753d 100644 --- a/cups/http.h +++ b/cups/http.h @@ -182,9 +182,9 @@ typedef enum http_field_e /**** HTTP field names ****/ HTTP_FIELD_UPGRADE, /* Upgrade field */ HTTP_FIELD_USER_AGENT, /* User-Agent field */ HTTP_FIELD_WWW_AUTHENTICATE, /* WWW-Authenticate field */ - HTTP_FIELD_ACCEPT_ENCODING, /* Accepting-Encoding field @since CUPS 1.7@ */ - HTTP_FIELD_ALLOW, /* Allow field @since CUPS 1.7@ */ - HTTP_FIELD_SERVER, /* Server field @since CUPS 1.7@ */ + HTTP_FIELD_ACCEPT_ENCODING, /* Accepting-Encoding field @since CUPS 1.7/OS X 10.9@ */ + HTTP_FIELD_ALLOW, /* Allow field @since CUPS 1.7/OS X 10.9@ */ + HTTP_FIELD_SERVER, /* Server field @since CUPS 1.7/OS X 10.9@ */ HTTP_FIELD_MAX /* Maximum field index */ } http_field_t; @@ -213,8 +213,8 @@ typedef enum http_state_e /**** HTTP state values; states HTTP_STATE_TRACE, /* TRACE command, waiting for blank line */ HTTP_STATE_CONNECT, /* CONNECT command, waiting for blank line */ HTTP_STATE_STATUS, /* Command complete, sending status */ - HTTP_STATE_UNKNOWN_METHOD, /* Unknown request method, waiting for blank line @since CUPS 1.7@ */ - HTTP_STATE_UNKNOWN_VERSION /* Unknown request method, waiting for blank line @since CUPS 1.7@ */ + HTTP_STATE_UNKNOWN_METHOD, /* Unknown request method, waiting for blank line @since CUPS 1.7/OS X 10.9@ */ + HTTP_STATE_UNKNOWN_VERSION /* Unknown request method, waiting for blank line @since CUPS 1.7/OS X 10.9@ */ # ifndef _CUPS_NO_DEPRECATED # define HTTP_WAITING HTTP_STATE_WAITING @@ -237,7 +237,7 @@ typedef enum http_state_e /**** HTTP state values; states typedef enum http_status_e /**** HTTP status codes ****/ { HTTP_STATUS_ERROR = -1, /* An error response from httpXxxx() */ - HTTP_STATUS_NONE = 0, /* No Expect value @since CUPS 1.7@ */ + HTTP_STATUS_NONE = 0, /* No Expect value @since CUPS 1.7/OS X 10.9@ */ HTTP_STATUS_CONTINUE = 100, /* Everything OK, keep going... */ HTTP_STATUS_SWITCHING_PROTOCOLS, /* HTTP upgrade to TLS/SSL */ diff --git a/cups/ipp-support.c b/cups/ipp-support.c index 4f82e5d0b..f6380d8ac 100644 --- a/cups/ipp-support.c +++ b/cups/ipp-support.c @@ -838,7 +838,7 @@ ippAttributeString( * "attribute-name")@ will return a non-NULL pointer. The array must be freed * using the @code cupsArrayDelete@ function. * - * @since CUPS 1.7@ + * @since CUPS 1.7/OS X 10.9@ */ cups_array_t * /* O - CUPS array or @code NULL@ if all */ diff --git a/cups/ipp.c b/cups/ipp.c index 2fa574115..409a0ec82 100644 --- a/cups/ipp.c +++ b/cups/ipp.c @@ -1131,7 +1131,7 @@ ippAddString(ipp_t *ipp, /* I - IPP message */ * needed. The formatted string is truncated as needed to the maximum length of * the corresponding value type. * - * @since CUPS 1.7@ + * @since CUPS 1.7/OS X 10.9@ */ ipp_attribute_t * /* O - New attribute */ @@ -1184,7 +1184,7 @@ ippAddStringf(ipp_t *ipp, /* I - IPP message */ * stdarg pointer @code ap@. The formatted string is truncated as needed to the * maximum length of the corresponding value type. * - * @since CUPS 1.7@ + * @since CUPS 1.7/OS X 10.9@ */ ipp_attribute_t * /* O - New attribute */ @@ -1466,7 +1466,7 @@ ippAddStrings( * enum value, or the value falls within one of the rangeOfInteger values for * the attribute. * - * @since CUPS 1.7@ + * @since CUPS 1.7/OS X 10.9@ */ int /* O - 1 on a match, 0 on no match */ @@ -1517,7 +1517,7 @@ ippContainsInteger( * Returns non-zero when the attribute contains a matching charset, keyword, * language, mimeMediaType, name, text, URI, or URI scheme value. * - * @since CUPS 1.7@ + * @since CUPS 1.7/OS X 10.9@ */ int /* O - 1 on a match, 0 on no match */ @@ -2390,7 +2390,7 @@ ippGetName(ipp_attribute_t *attr) /* I - IPP attribute */ * The @code element@ parameter specifies which value to get from 0 to * @link ippGetCount(attr)@ - 1. * - * @since CUPS 1.7@ + * @since CUPS 1.7/OS X 10.9@ */ void * /* O - Pointer to octetString data */ @@ -2826,7 +2826,7 @@ ippNewRequest(ipp_op_t op) /* I - Operation code */ * "utf-8" and a value derived from the current locale are substituted, * respectively. * - * @since CUPS 1.7@ + * @since CUPS 1.7/OS X 10.9@ */ ipp_t * /* O - IPP response message */ @@ -4009,7 +4009,7 @@ ippSetName(ipp_t *ipp, /* I - IPP message */ * The @code element@ parameter specifies which value to set from 0 to * @link ippGetCount(attr)@. * - * @since CUPS 1.7@ + * @since CUPS 1.7/OS X 10.9@ */ int /* O - 1 on success, 0 on failure */ @@ -4382,7 +4382,7 @@ ippSetString(ipp_t *ipp, /* I - IPP message */ * needed. The formatted string is truncated as needed to the maximum length of * the corresponding value type. * - * @since CUPS 1.7@ + * @since CUPS 1.7/OS X 10.9@ */ int /* O - 1 on success, 0 on failure */ @@ -4420,7 +4420,7 @@ ippSetStringf(ipp_t *ipp, /* I - IPP message */ * needed. The formatted string is truncated as needed to the maximum length of * the corresponding value type. * - * @since CUPS 1.7@ + * @since CUPS 1.7/OS X 10.9@ */ int /* O - 1 on success, 0 on failure */ @@ -4810,7 +4810,7 @@ ippTimeToDate(time_t t) /* I - UNIX time value */ * value tag. 1 is returned if the attribute is valid, 0 otherwise. On * failure, cupsLastErrorString() is set to a human-readable message. * - * @since CUPS 1.7@ + * @since CUPS 1.7/OS X 10.9@ */ int /* O - 1 if valid, 0 otherwise */ @@ -5449,7 +5449,7 @@ ippValidateAttribute( * attribute. Like @link ippValidateAttribute@, cupsLastErrorString() is set * to a human-readable message on failure. * - * @since CUPS 1.7@ + * @since CUPS 1.7/OS X 10.9@ */ int /* O - 1 if valid, 0 otherwise */ diff --git a/cups/ipp.h b/cups/ipp.h index b43ee8552..10ff50c1a 100644 --- a/cups/ipp.h +++ b/cups/ipp.h @@ -504,12 +504,12 @@ typedef enum ipp_status_e /**** IPP status codes ****/ /* Proposed extensions for paid printing */ IPP_STATUS_ERROR_CUPS_ACCOUNT_INFO_NEEDED = 0x049C, - /* cups-error-account-info-needed @since CUPS 1.7@ */ - IPP_STATUS_ERROR_CUPS_ACCOUNT_CLOSED, /* cups-error-account-closed @since CUPS 1.7@ */ + /* cups-error-account-info-needed @since CUPS 1.7/OS X 10.9@ */ + IPP_STATUS_ERROR_CUPS_ACCOUNT_CLOSED, /* cups-error-account-closed @since CUPS 1.7/OS X 10.9@ */ IPP_STATUS_ERROR_CUPS_ACCOUNT_LIMIT_REACHED, - /* cups-error-account-limit-reached @since CUPS 1.7@ */ + /* cups-error-account-limit-reached @since CUPS 1.7/OS X 10.9@ */ IPP_STATUS_ERROR_CUPS_ACCOUNT_AUTHORIZATION_FAILED, - /* cups-error-account-authorization-failed @since CUPS 1.7@ */ + /* cups-error-account-authorization-failed @since CUPS 1.7/OS X 10.9@ */ IPP_STATUS_ERROR_INTERNAL = 0x0500, /* server-error-internal-error */ IPP_STATUS_ERROR_OPERATION_NOT_SUPPORTED, diff --git a/cups/pwg-media.c b/cups/pwg-media.c index 49f69297f..264ca7135 100644 --- a/cups/pwg-media.c +++ b/cups/pwg-media.c @@ -278,7 +278,7 @@ static pwg_media_t const cups_pwg_media[] = * units string is @code NULL@, otherwise inches ("in") or millimeters ("mm") * are used. * - * @since CUPS 1.7@ + * @since CUPS 1.7/OS X 10.9@ */ int /* O - 1 on success, 0 on failure */ @@ -417,7 +417,7 @@ void _pwgGenerateSize(char *keyword, size_t keysize, const char *prefix, * member attribute was specified in the "media-col" Job Template attribute, * otherwise it is initialized to 0. * - * @since CUPS 1.7@ + * @since CUPS 1.7/OS X 10.9@ */ int /* O - 1 if size was initialized, 0 otherwise */ @@ -592,7 +592,7 @@ int _pwgInitSize(pwg_size_t *size, ipp_t *job, int *margins_set) * The "name" argument specifies the legacy ISO media size name, for example * "iso-a4" or "na-letter". * - * @since CUPS 1.7@ + * @since CUPS 1.7/OS X 10.9@ */ pwg_media_t * /* O - Matching size or NULL */ @@ -654,7 +654,7 @@ pwg_media_t *_pwgMediaForLegacy(const char *legacy) * thread. Custom names can be of the form "Custom.WIDTHxLENGTH[units]" or * "WIDTHxLENGTH[units]". * - * @since CUPS 1.7@ + * @since CUPS 1.7/OS X 10.9@ */ pwg_media_t * /* O - Matching size or NULL */ @@ -826,7 +826,7 @@ pwg_media_t *_pwgMediaForPPD(const char *ppd) * thread-local storage and is overwritten by each call to the function in the * thread. * - * @since CUPS 1.7@ + * @since CUPS 1.7/OS X 10.9@ */ pwg_media_t * /* O - Matching size or NULL */ @@ -926,7 +926,7 @@ pwg_media_t *_pwgMediaForPWG(const char *pwg) * thread-local storage and is overwritten by each call to the function in the * thread. * - * @since CUPS 1.7@ + * @since CUPS 1.7/OS X 10.9@ */ pwg_media_t * /* O - PWG media name */ diff --git a/cups/usersys.c b/cups/usersys.c index 1bcfe6423..d01fe08b5 100644 --- a/cups/usersys.c +++ b/cups/usersys.c @@ -453,7 +453,7 @@ cupsSetUser(const char *user) /* I - User name */ * Setting the string to NULL forces the default value containing the CUPS * version, IPP version, and operating system version and architecture. * - * @since CUPS 1.7@ + * @since CUPS 1.7/OS X 10.9@ */ void @@ -528,7 +528,7 @@ cupsUser(void) /* * 'cupsUserAgent()' - Return the default HTTP User-Agent string. * - * @since CUPS 1.7@ + * @since CUPS 1.7/OS X 10.9@ */ const char * /* O - User-Agent string */ diff --git a/doc/help/api-array.html b/doc/help/api-array.html index c5ab8f773..0c1998ee3 100644 --- a/doc/help/api-array.html +++ b/doc/help/api-array.html @@ -341,7 +341,7 @@ div.contents ul.subcontents li {