]> git.ipfire.org Git - thirdparty/cups.git/commitdiff
Update documentation and dependencies for 1.5b1.
authormike <mike@7a7537e8-13f0-0310-91df-b6672ffda945>
Thu, 12 May 2011 05:46:30 +0000 (05:46 +0000)
committermike <mike@7a7537e8-13f0-0310-91df-b6672ffda945>
Thu, 12 May 2011 05:46:30 +0000 (05:46 +0000)
git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@9772 7a7537e8-13f0-0310-91df-b6672ffda945

28 files changed:
INSTALL.txt
IPPTOOL.txt
LICENSE.txt
README.txt
backend/Dependencies
config-scripts/cups-common.m4
cups/Dependencies
cups/array.c
cups/cups.h
cups/http-private.h
cups/http.c
cups/http.h
cups/ipp.h
cups/ppd.h
cups/raster.h
cups/sidechannel.h
cups/usersys.c
doc/help/api-array.html
doc/help/api-cups.html
doc/help/api-filedir.html
doc/help/api-filter.html
doc/help/api-httpipp.html
doc/help/api-mime.html
doc/help/api-overview.html
doc/help/api-ppd.html
doc/help/api-raster.html
doc/help/license.html
scheduler/Dependencies

index ec242f999533e4eef61c65402f162bd80a7eabfb..85757f0b7d2104cf858e42233a987c008a5a0d8d 100644 (file)
@@ -1,4 +1,4 @@
-INSTALL - CUPS v1.5.0 - 2011-05-06
+INSTALL - CUPS v1.5b1 - 2011-05-11
 ----------------------------------
 
 This file describes how to compile and install CUPS from source code. For more
index c13da01ae7cdcc675c97fbdc521b77e38adfd947..f4e218a87317b2b2b1d9e311959954ea13388cdb 100644 (file)
@@ -1,4 +1,4 @@
-IPPTOOL.txt - 2010-10-17
+IPPTOOL.txt - 2011-05-11
 ------------------------
 
 
@@ -72,7 +72,7 @@ GETTING SUPPORT AND OTHER RESOURCES
 
 LEGAL STUFF
 
-    CUPS is Copyright 2007-2010 by Apple Inc.  CUPS and the CUPS logo are
+    CUPS is Copyright 2007-2011 by Apple Inc.  CUPS and the CUPS logo are
     trademarks of Apple Inc.
 
     The MD5 Digest code is Copyright 1999 Aladdin Enterprises.
index 2c386e0f959de66d25afd38ec0f8ecf10df23985..7d80518a35470130fe3e6404ff5428e8db63583e 100644 (file)
@@ -1,6 +1,6 @@
                           CUPS License Agreement
 
-                     Copyright 2007-2010 by Apple Inc.
+                     Copyright 2007-2011 by Apple Inc.
                             1 Infinite Loop
                          Cupertino, CA 95014 USA
 
@@ -129,7 +129,7 @@ redistribute it freely, subject to the following restrictions:
        software.
 
      3. This notice may not be removed or altered from any source
-       distribution. 
+       distribution.
 
 
 TRADEMARKS
index 3e9c6d8b5beadc96d78aa3340a4a951f974bcba0..38875d9d1b112bc58c752a83282029da65721cfa 100644 (file)
@@ -1,5 +1,5 @@
-README - CUPS v1.5svn - 2011-05-06
-----------------------------------
+README - CUPS v1.5b1 - 2011-05-11
+---------------------------------
 
 Looking for compile instructions?  Read the file "INSTALL.txt"
 instead...
index b195e61e980badd023ec53a587a06aa0494fb71e..4f99c17ef9ad5288ac3e09a335390898ed188b13 100644 (file)
@@ -8,7 +8,7 @@ ipp.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h
 ipp.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h
 ipp.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h
 ipp.o: ../cups/thread-private.h ../cups/snmp-private.h ../cups/backend.h
-ipp.o: ../cups/sidechannel.h
+ipp.o: ../cups/sidechannel.h ../cups/array-private.h
 lpd.o: ../cups/http-private.h ../config.h ../cups/http.h
 lpd.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h
 lpd.o: backend-private.h ../cups/cups-private.h ../cups/cups.h ../cups/file.h
index 7ed55d579fee21b256300780d35550877245e3b8..5fd9143dcbeb664a159e009145e95f588de1a6e5 100644 (file)
@@ -20,11 +20,11 @@ dnl Set the name of the config header file...
 AC_CONFIG_HEADER(config.h)
 
 dnl Version number information...
-CUPS_VERSION="1.5svn"
+CUPS_VERSION="1.5b1"
 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'`"
-fi
+#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'`"
+#fi
 CUPS_BUILD="cups-$CUPS_VERSION"
 
 AC_ARG_WITH(cups_build, [  --with-cups-build       set "cups-config --build" string ],
index 5b374f882565627d754cca9f74f09f6f226b1d0d..5e6359f7de3c0415394911de4806bf0097fedacb 100644 (file)
@@ -6,7 +6,8 @@ adminutil.o: ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
 adminutil.o: ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
 adminutil.o: language-private.h ../cups/transcode.h thread-private.h
 adminutil.o: adminutil.h
-array.o: string-private.h ../config.h debug-private.h array.h versioning.h
+array.o: string-private.h ../config.h debug-private.h array-private.h array.h
+array.o: versioning.h
 attr.o: cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
 attr.o: array.h language.h string-private.h ../config.h debug-private.h
 attr.o: ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
@@ -250,7 +251,8 @@ adminutil.32.o: adminutil.c  ppd-private.h ../cups/ppd.h cups.h pwg-private.h ht
 adminutil.32.o: adminutil.c  ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
 adminutil.32.o: adminutil.c  language-private.h ../cups/transcode.h thread-private.h
 adminutil.32.o: adminutil.c  adminutil.h
-array.32.o: array.c  string-private.h ../config.h debug-private.h array.h versioning.h
+array.32.o: array.c  string-private.h ../config.h debug-private.h array-private.h array.h
+array.32.o: array.c  versioning.h
 attr.32.o: attr.c  cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
 attr.32.o: attr.c  array.h language.h string-private.h ../config.h debug-private.h
 attr.32.o: attr.c  ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
@@ -494,7 +496,8 @@ adminutil.64.o: adminutil.c  ppd-private.h ../cups/ppd.h cups.h pwg-private.h ht
 adminutil.64.o: adminutil.c  ../cups/http.h md5-private.h ipp-private.h ../cups/ipp.h
 adminutil.64.o: adminutil.c  language-private.h ../cups/transcode.h thread-private.h
 adminutil.64.o: adminutil.c  adminutil.h
-array.64.o: array.c  string-private.h ../config.h debug-private.h array.h versioning.h
+array.64.o: array.c  string-private.h ../config.h debug-private.h array-private.h array.h
+array.64.o: array.c  versioning.h
 attr.64.o: attr.c  cups-private.h ../cups/cups.h file.h versioning.h ipp.h http.h
 attr.64.o: attr.c  array.h language.h string-private.h ../config.h debug-private.h
 attr.64.o: attr.c  ppd-private.h ../cups/ppd.h cups.h pwg-private.h http-private.h
index 1ffe14236ab2bd0284b47283862af4f40691e793..71c161c7d60ae2334a8e2f18763c9ad632a268f3 100644 (file)
@@ -722,7 +722,7 @@ cupsArrayNew2(cups_array_func_t  f, /* I - Comparison function or @code NULL@ fo
  * The free function ("cf") is used to automatically free/release elements when
  * removed or the array is deleted.
  *
- * @since CUPS 1.5@
+ * @since CUPS 1.5/Mac OS X 10.7@
  */
 
 cups_array_t *                         /* O - Array */
index 198e04a74a667293b9f91bdf1ee698fccc404fb1..37619aa778930c4efc4f24174df1a6a64ded0a5b 100644 (file)
@@ -3,7 +3,7 @@
  *
  *   API definitions for CUPS.
  *
- *   Copyright 2007-2010 by Apple Inc.
+ *   Copyright 2007-2011 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -170,13 +170,13 @@ typedef struct cups_job_s         /**** Job ****/
 } cups_job_t;
 
 typedef int (*cups_client_cert_cb_t)(http_t *http, void *tls,
-                                    cups_array_t *distinguished_names, 
+                                    cups_array_t *distinguished_names,
                                     void *user_data);
-                                       /**** Client credentials callback @since CUPS 1.5@ ****/
+                                       /**** Client credentials callback @since CUPS 1.5/Mac OS X 10.7@ ****/
 
 typedef int (*cups_server_cert_cb_t)(http_t *http, void *tls,
                                     cups_array_t *certs, void *user_data);
-                                       /**** Server credentials callback @since CUPS 1.5@ ****/
+                                       /**** Server credentials callback @since CUPS 1.5/Mac OS X 10.7@ ****/
 
 
 /*
index e40ba734c6272a6c398317052103ca71919f5ed2..c93807a617e36ed8caac8c4f96a0a48194f61180 100644 (file)
@@ -296,9 +296,9 @@ struct _http_s                              /**** HTTP connection structure. ****/
 #  endif /* HAVE_AUTHORIZATION_H */
   /**** New in CUPS 1.5 ****/
   http_tls_credentials_t tls_credentials;
-                                       /* TLS credentials @since CUPS 1.5@ */
-  _http_timeout_cb_t   timeout_cb;     /* Timeout callback @since CUPS 1.5@ */
-  void                 *timeout_data;  /* User data pointer @since CUPS 1.5@ */
+                                       /* TLS credentials @since CUPS 1.5/Mac OS X 10.7@ */
+  _http_timeout_cb_t   timeout_cb;     /* Timeout callback @since CUPS 1.5/Mac OS X 10.7@ */
+  void                 *timeout_data;  /* User data pointer @since CUPS 1.5/Mac OS X 10.7@ */
   struct timeval       timeout_value;  /* Timeout in seconds */
 #  ifdef HAVE_GSSAPI
   char                 gsshost[256];   /* Hostname for Kerberos */
index 9e637ee094299cd349e43035d6d21a47bf1e2872..c4e7718e1f5432be0bbe7693879d5b3467af6bad 100644 (file)
@@ -259,7 +259,7 @@ static BIO_METHOD   http_bio_methods =
  *
  * Use @code cupsArrayNew(NULL, NULL)@ to create a credentials array.
  *
- * @since CUPS 1.5@
+ * @since CUPS 1.5/Mac OS X 10.7@
  */
 
 int                                    /* O - 0 on success, -1 on error */
@@ -492,7 +492,7 @@ httpConnectEncrypt(
  * 'httpCopyCredentials()' - Copy the credentials associated with an encrypted
  *                          connection.
  *
- * @since CUPS 1.5@
+ * @since CUPS 1.5/Mac OS X 10.7@
  */
 
 int                                    /* O - Status of call (0 = success) */
@@ -2364,7 +2364,7 @@ httpSetAuthString(http_t     *http,       /* I - Connection to server */
  * 'httpSetCredentials()' - Set the credentials associated with an encrypted
  *                         connection.
  *
- * @since CUPS 1.5@
+ * @since CUPS 1.5/Mac OS X 10.7@
  */
 
 int                                            /* O - Status of call (0 = success) */
index 0ede1169dbbac1123c2074d8dcdd6b6936f359d4..8c4f93533935f4bf32993b19c045757b899ea338 100644 (file)
@@ -251,7 +251,7 @@ typedef enum http_status_e          /**** HTTP status codes ****/
   HTTP_NOT_SUPPORTED,                  /* HTTP version not supported */
 
   HTTP_AUTHORIZATION_CANCELED = 1000,  /* User canceled authorization @since CUPS 1.4@ */
-  HTTP_PKI_ERROR,                      /* Error negotiating a secure connection @since CUPS 1.5@ */
+  HTTP_PKI_ERROR,                      /* Error negotiating a secure connection @since CUPS 1.5/Mac OS X 10.7@ */
   HTTP_WEBIF_DISABLED                  /* Web interface is disabled @private@ */
 } http_status_t;
 
@@ -318,7 +318,7 @@ typedef struct http_addrlist_s              /**** Socket address list, which is
 
 typedef struct _http_s http_t;         /**** HTTP connection type ****/
 
-typedef struct http_credential_s       /**** Credential data @since CUPS 1.5@ ****/
+typedef struct http_credential_s       /**** Credential data @since CUPS 1.5/Mac OS X 10.7@ ****/
 {
   void         *data;                  /* Pointer to credential data */
   size_t       datalen;                /* Credential length */
@@ -451,8 +451,8 @@ extern void         httpSetAuthString(http_t *http, const char *scheme,
 extern int             httpAddCredential(cups_array_t *credentials,
                                          const void *data, size_t datalen)
                                          _CUPS_API_1_5;
-extern int             httpCopyCredentials(http_t *http, 
-                                           cups_array_t **credentials) 
+extern int             httpCopyCredentials(http_t *http,
+                                           cups_array_t **credentials)
                                            _CUPS_API_1_5;
 extern void            httpFreeCredentials(cups_array_t *certs) _CUPS_API_1_5;
 extern int             httpSetCredentials(http_t *http, cups_array_t *certs)
index e72cf5ace180051123a63c444574dd01788c2077..b3e9eb92ea757debe864ca0a0bb747778d7744db 100644 (file)
@@ -3,7 +3,7 @@
  *
  *   Internet Printing Protocol definitions for CUPS.
  *
- *   Copyright 2007-2010 by Apple Inc.
+ *   Copyright 2007-2011 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -313,8 +313,8 @@ typedef enum ipp_status_e           /**** IPP status codes ****/
   IPP_MULTIPLE_JOBS_NOT_SUPPORTED,     /* server-error-multiple-document-jobs-not-supported */
   IPP_PRINTER_IS_DEACTIVATED,          /* server-error-printer-is-deactivated */
 
-  IPP_AUTHENTICATION_CANCELED = 0x1000,        /* Authentication canceled by user @since CUPS 1.5@ */
-  IPP_PKI_ERROR,                       /* Error negotiating a secure connection @since CUPS 1.5@ */
+  IPP_AUTHENTICATION_CANCELED = 0x1000,        /* Authentication canceled by user @since CUPS 1.5/Mac OS X 10.7@ */
+  IPP_PKI_ERROR,                       /* Error negotiating a secure connection @since CUPS 1.5/Mac OS X 10.7@ */
   IPP_UPGRADE_REQUIRED                 /* TLS upgrade required */
 } ipp_status_t;
 #define IPP_ERROR_JOB_CANCELLED IPP_ERROR_JOB_CANCELED
index 32a2f1e4eb67ea1a9a4f6137dc66d14ff32e6528..1aaa139bc9aafd4ff852e4e9f11386f6c5fe8793 100644 (file)
@@ -274,7 +274,7 @@ typedef struct ppd_coption_s                /**** Custom Option @since CUPS 1.2/Mac OS X 10.5@
 } ppd_coption_t;
 
 typedef struct _ppd_cache_s _ppd_cache_t;
-                                       /**** PPD cache and mapping data @since CUPS 1.5@ @private@ ****/
+                                       /**** PPD cache and mapping data @since CUPS 1.5/Mac OS X 10.7@ @private@ ****/
 
 typedef struct ppd_file_s              /**** PPD File ****/
 {
@@ -340,7 +340,7 @@ typedef struct ppd_file_s           /**** PPD File ****/
   cups_array_t *cups_uiconstraints;    /* cupsUIConstraints @since CUPS 1.4/Mac OS X 10.6@ @private@ */
 
   /**** New in CUPS 1.5 ****/
-  _ppd_cache_t *cache;                 /* PPD cache and mapping data @since CUPS 1.5@ @private@ */
+  _ppd_cache_t *cache;                 /* PPD cache and mapping data @since CUPS 1.5/Mac OS X 10.7@ @private@ */
 } ppd_file_t;
 
 
index 4437accb5ef384d5174c58c777f29897938d0e55..1510df2d6eaab9263f4b0a5658845a048e9d3184 100644 (file)
@@ -187,7 +187,7 @@ enum cups_mode_e                    /**** cupsRasterOpen modes ****/
   CUPS_RASTER_READ = 0,                        /* Open stream for reading */
   CUPS_RASTER_WRITE = 1,               /* Open stream for writing */
   CUPS_RASTER_WRITE_COMPRESSED = 2,    /* Open stream for compressed writing @since CUPS 1.3/Mac OS X 10.5@ */
-  CUPS_RASTER_WRITE_PWG = 3            /* Open stream for compressed writing in PWG mode @since CUPS 1.5@ */
+  CUPS_RASTER_WRITE_PWG = 3            /* Open stream for compressed writing in PWG mode @since CUPS 1.5/Mac OS X 10.7@ */
 };
 
 typedef enum cups_mode_e cups_mode_t;  /**** cupsRasterOpen modes ****/
index a16b330b6435c07b2abb0e4b5a81a6eb8d001cbd..ac91a5292c1c060bcdd3133bf4517d9bdd426997 100644 (file)
@@ -63,7 +63,7 @@ enum cups_sc_command_e                        /**** Request command codes ****/
   CUPS_SC_CMD_GET_STATE = 5,           /* Return the device state */
   CUPS_SC_CMD_SNMP_GET = 6,            /* Query an SNMP OID @since CUPS 1.4/Mac OS X 10.6@ */
   CUPS_SC_CMD_SNMP_GET_NEXT = 7,       /* Query the next SNMP OID @since CUPS 1.4/Mac OS X 10.6@ */
-  CUPS_SC_CMD_GET_CONNECTED = 8,       /* Return whether the backend is "connected" to the printer @since CUPS 1.5@ */
+  CUPS_SC_CMD_GET_CONNECTED = 8,       /* Return whether the backend is "connected" to the printer @since CUPS 1.5/Mac OS X 10.7@ */
   CUPS_SC_CMD_MAX                      /* End of valid values @private@ */
 };
 typedef enum cups_sc_command_e cups_sc_command_t;
index b925bea7dd9ab6ff33b63d27ce076b7e5bb5877d..c635ac9e687c9e8db684979816c00e2f235d5729 100644 (file)
@@ -185,7 +185,7 @@ cupsServer(void)
  * in a program. Multi-threaded programs that override the callback need to do
  * so in each thread for the same callback to be used.
  *
- * @since CUPS 1.5@
+ * @since CUPS 1.5/Mac OS X 10.7@
  */
 
 void
@@ -209,7 +209,7 @@ cupsSetClientCertCB(
  * program. Multi-threaded programs that override the setting need to do so in
  * each thread for the same setting to be used.
  *
- * @since CUPS 1.5@
+ * @since CUPS 1.5/Mac OS X 10.7@
  */
 
 int                                    /* O - Status of call (0 = success) */
@@ -376,7 +376,7 @@ cupsSetServer(const char *server)   /* I - Server name */
  * in a program. Multi-threaded programs that override the callback need to do
  * so in each thread for the same callback to be used.
  *
- * @since CUPS 1.5@
+ * @since CUPS 1.5/Mac OS X 10.7@
  */
 
 void
index 459f9c41705e50a10238c3a074ea9cd1e1943b8a..147251ebdc767c077c996cef3d80281861c2ea50 100644 (file)
@@ -343,9 +343,9 @@ div.contents ul.subcontents li {
 <!--
   "$Id$"
 
-  Array API header for the Common UNIX Printing System (CUPS).
+  Array API header for CUPS.
 
-  Copyright 2008-2009 by Apple Inc.
+  Copyright 2008-2011 by Apple Inc.
 
   These coded instructions, statements, and computer programs are the
   property of Apple Inc. and are protected by Federal copyright
@@ -874,7 +874,7 @@ The hash function (&quot;h&quot;) is used to implement cached lookups with the
 specified hash size (&quot;hsize&quot;).
 
 </p>
-<h3 class="function"><span class="info">&nbsp;CUPS 1.5&nbsp;</span><a name="cupsArrayNew3">cupsArrayNew3</a></h3>
+<h3 class="function"><span class="info">&nbsp;CUPS 1.5/Mac OS X 10.7&nbsp;</span><a name="cupsArrayNew3">cupsArrayNew3</a></h3>
 <p class="description">Create a new array with hash and/or free function.</p>
 <p class="code">
 <a href="#cups_array_t">cups_array_t</a> *cupsArrayNew3 (<br>
index d9bea4eea8c34ac488ac2870f46a3093891716cf..5ebd932dc9d8c07159035bfb0c41916814823f27 100644 (file)
@@ -343,9 +343,9 @@ div.contents ul.subcontents li {
 <!--
   "$Id$"
 
-  CUPS API header for the Common UNIX Printing System (CUPS).
+  CUPS API header for CUPS.
 
-  Copyright 2008-2009 by Apple Inc.
+  Copyright 2008-2011 by Apple Inc.
 
   These coded instructions, statements, and computer programs are the
   property of Apple Inc. and are protected by Federal copyright
@@ -1991,7 +1991,7 @@ Note: The current server is tracked separately for each thread in a program.
 Multi-threaded programs that override the server via the
 <a href="#cupsSetServer"><code>cupsSetServer</code></a> function need to do so in each thread for the same
 server to be used.</p>
-<h3 class="function"><span class="info">&nbsp;CUPS 1.5&nbsp;</span><a name="cupsSetClientCertCB">cupsSetClientCertCB</a></h3>
+<h3 class="function"><span class="info">&nbsp;CUPS 1.5/Mac OS X 10.7&nbsp;</span><a name="cupsSetClientCertCB">cupsSetClientCertCB</a></h3>
 <p class="description">Set the client certificate callback.</p>
 <p class="code">
 void cupsSetClientCertCB (<br>
@@ -2013,7 +2013,7 @@ in a program. Multi-threaded programs that override the callback need to do
 so in each thread for the same callback to be used.
 
 </p>
-<h3 class="function"><span class="info">&nbsp;CUPS 1.5&nbsp;</span><a name="cupsSetCredentials">cupsSetCredentials</a></h3>
+<h3 class="function"><span class="info">&nbsp;CUPS 1.5/Mac OS X 10.7&nbsp;</span><a name="cupsSetCredentials">cupsSetCredentials</a></h3>
 <p class="description">Set the default credentials to be used for SSL/TLS
 connections.</p>
 <p class="code">
@@ -2180,7 +2180,7 @@ default server name and port.<br>
 Note: The current server is tracked separately for each thread in a program.
 Multi-threaded programs that override the server need to do so in each
 thread for the same server to be used.</p>
-<h3 class="function"><span class="info">&nbsp;CUPS 1.5&nbsp;</span><a name="cupsSetServerCertCB">cupsSetServerCertCB</a></h3>
+<h3 class="function"><span class="info">&nbsp;CUPS 1.5/Mac OS X 10.7&nbsp;</span><a name="cupsSetServerCertCB">cupsSetServerCertCB</a></h3>
 <p class="description">Set the server certificate callback.</p>
 <p class="code">
 void cupsSetServerCertCB (<br>
@@ -2331,7 +2331,7 @@ program. Multi-threaded programs that override the user name with the
 <a href="#cupsSetUser"><code>cupsSetUser</code></a> function need to do so in each thread for the same user
 name to be used.</p>
 <h2 class="title"><a name="TYPES">Data Types</a></h2>
-<h3 class="typedef"><span class="info">&nbsp;CUPS 1.5&nbsp;</span><a name="cups_client_cert_cb_t">cups_client_cert_cb_t</a></h3>
+<h3 class="typedef"><span class="info">&nbsp;CUPS 1.5/Mac OS X 10.7&nbsp;</span><a name="cups_client_cert_cb_t">cups_client_cert_cb_t</a></h3>
 <p class="description">Client credentials callback </p>
 <p class="code">
 typedef int (*cups_client_cert_cb_t)(http_t *http, void *tls, cups_array_t *distinguished_names, void *user_data);
@@ -2371,7 +2371,7 @@ typedef const char *(*cups_password_cb_t)(const char *prompt);
 <p class="code">
 typedef unsigned cups_ptype_t;
 </p>
-<h3 class="typedef"><span class="info">&nbsp;CUPS 1.5&nbsp;</span><a name="cups_server_cert_cb_t">cups_server_cert_cb_t</a></h3>
+<h3 class="typedef"><span class="info">&nbsp;CUPS 1.5/Mac OS X 10.7&nbsp;</span><a name="cups_server_cert_cb_t">cups_server_cert_cb_t</a></h3>
 <p class="description">Server credentials callback </p>
 <p class="code">
 typedef int (*cups_server_cert_cb_t)(http_t *http, void *tls, cups_array_t *certs, void *user_data);
index 0b3713c8626c0eeb46a360cb6664b38db08395a0..cca4bd94e6b08068cd326761be95317bede39437 100644 (file)
@@ -343,9 +343,9 @@ div.contents ul.subcontents li {
 <!--
   "$Id$"
 
-  File and Directory API header for the Common UNIX Printing System (CUPS).
+  File and Directory API header for CUPS.
 
-  Copyright 2008-2009 by Apple Inc.
+  Copyright 2008-2011 by Apple Inc.
 
   These coded instructions, statements, and computer programs are the
   property of Apple Inc. and are protected by Federal copyright
index e66df8daf2cab8a1cb32379ee576729c21877a0f..1746ff664f79a6858b1f744450d453963c2d4d28 100644 (file)
@@ -343,10 +343,9 @@ div.contents ul.subcontents li {
 <!--
   "$Id$"
 
-  Filter and backend programming header for the Common UNIX Printing System
-  (CUPS).
+  Filter and backend programming header for CUPS.
 
-  Copyright 2008-2009 by Apple Inc.
+  Copyright 2008-2011 by Apple Inc.
 
   These coded instructions, statements, and computer programs are the
   property of Apple Inc. and are protected by Federal copyright
@@ -1399,7 +1398,7 @@ typedef void (*cups_sc_walk_func_t)(const char *oid, const char *data, int datal
 <dd class="description">Drain all pending output</dd>
 <dt>CUPS_SC_CMD_GET_BIDI </dt>
 <dd class="description">Return bidirectional capabilities</dd>
-<dt>CUPS_SC_CMD_GET_CONNECTED <span class="info">&nbsp;CUPS 1.5&nbsp;</span></dt>
+<dt>CUPS_SC_CMD_GET_CONNECTED <span class="info">&nbsp;CUPS 1.5/Mac OS X 10.7&nbsp;</span></dt>
 <dd class="description">Return whether the backend is &quot;connected&quot; to the printer </dd>
 <dt>CUPS_SC_CMD_GET_DEVICE_ID </dt>
 <dd class="description">Return the IEEE-1284 device ID</dd>
index 263cb0263149e1f8eb619c3c6cb18b039800c304..9793c933115bda74e1a69a40f7dbf0b4a56f1309 100644 (file)
@@ -343,9 +343,9 @@ div.contents ul.subcontents li {
 <!--
   "$Id$"
 
-  HTTP and IPP API header for the Common UNIX Printing System (CUPS).
+  HTTP and IPP API header for CUPS.
 
-  Copyright 2007-2009 by Apple Inc.
+  Copyright 2007-2011 by Apple Inc.
   Copyright 1997-2006 by Easy Software Products, all rights reserved.
 
   These coded instructions, statements, and computer programs are the
@@ -1327,7 +1327,7 @@ request is not freed.
 after <a href="#cupsStartDocument"><code>cupsStartDocument</code></a> to provide a document file.
 
 </p>
-<h3 class="function"><span class="info">&nbsp;CUPS 1.5&nbsp;</span><a name="httpAddCredential">httpAddCredential</a></h3>
+<h3 class="function"><span class="info">&nbsp;CUPS 1.5/Mac OS X 10.7&nbsp;</span><a name="httpAddCredential">httpAddCredential</a></h3>
 <p class="description">Allocates and adds a single credential to an array.</p>
 <p class="code">
 int httpAddCredential (<br>
@@ -1630,7 +1630,7 @@ void httpClose (<br>
 </dl>
 <h4 class="returnvalue">Return Value</h4>
 <p class="description">New HTTP connection</p>
-<h3 class="function"><span class="info">&nbsp;CUPS 1.5&nbsp;</span><a name="httpCopyCredentials">httpCopyCredentials</a></h3>
+<h3 class="function"><span class="info">&nbsp;CUPS 1.5/Mac OS X 10.7&nbsp;</span><a name="httpCopyCredentials">httpCopyCredentials</a></h3>
 <p class="description">Copy the credentials associated with an encrypted
 connection.</p>
 <p class="code">
@@ -2447,7 +2447,7 @@ void httpSetCookie (<br>
 <dt>cookie</dt>
 <dd class="description">Cookie string</dd>
 </dl>
-<h3 class="function"><span class="info">&nbsp;CUPS 1.5&nbsp;</span><a name="httpSetCredentials">httpSetCredentials</a></h3>
+<h3 class="function"><span class="info">&nbsp;CUPS 1.5/Mac OS X 10.7&nbsp;</span><a name="httpSetCredentials">httpSetCredentials</a></h3>
 <p class="description">Set the credentials associated with an encrypted
 connection.</p>
 <p class="code">
@@ -3367,7 +3367,7 @@ typedef struct <a href="#http_addrlist_s">http_addrlist_s</a> / http_addrlist_t;
 <p class="code">
 typedef enum <a href="#http_auth_e">http_auth_e</a> http_auth_t;
 </p>
-<h3 class="typedef"><span class="info">&nbsp;CUPS 1.5&nbsp;</span><a name="http_credential_t">http_credential_t</a></h3>
+<h3 class="typedef"><span class="info">&nbsp;CUPS 1.5/Mac OS X 10.7&nbsp;</span><a name="http_credential_t">http_credential_t</a></h3>
 <p class="description">Credential data </p>
 <p class="code">
 typedef struct <a href="#http_credential_s">http_credential_s</a> http_credential_t;
@@ -3534,7 +3534,7 @@ with a hostname. </p>
 <dt>next </dt>
 <dd class="description">Pointer to next address in list</dd>
 </dl>
-<h3 class="struct"><span class="info">&nbsp;CUPS 1.5&nbsp;</span><a name="http_credential_s">http_credential_s</a></h3>
+<h3 class="struct"><span class="info">&nbsp;CUPS 1.5/Mac OS X 10.7&nbsp;</span><a name="http_credential_s">http_credential_s</a></h3>
 <p class="description">Credential data </p>
 <p class="code">struct http_credential_s {<br>
 &nbsp;&nbsp;&nbsp;&nbsp;void *data;<br>
@@ -3835,7 +3835,7 @@ are server-oriented...</p>
 <dd class="description">Only a partial file was recieved/sent</dd>
 <dt>HTTP_PAYMENT_REQUIRED </dt>
 <dd class="description">Payment required</dd>
-<dt>HTTP_PKI_ERROR <span class="info">&nbsp;CUPS 1.5&nbsp;</span></dt>
+<dt>HTTP_PKI_ERROR <span class="info">&nbsp;CUPS 1.5/Mac OS X 10.7&nbsp;</span></dt>
 <dd class="description">Error negotiating a secure connection </dd>
 <dt>HTTP_PRECONDITION </dt>
 <dd class="description">Precondition failed</dd>
@@ -4171,7 +4171,7 @@ are server-oriented...</p>
 <dd class="description">client-error-attributes-or-values-not-supported</dd>
 <dt>IPP_ATTRIBUTES_NOT_SETTABLE </dt>
 <dd class="description">client-error-attributes-not-settable</dd>
-<dt>IPP_AUTHENTICATION_CANCELED <span class="info">&nbsp;CUPS 1.5&nbsp;</span></dt>
+<dt>IPP_AUTHENTICATION_CANCELED <span class="info">&nbsp;CUPS 1.5/Mac OS X 10.7&nbsp;</span></dt>
 <dd class="description">Authentication canceled by user </dd>
 <dt>IPP_BAD_REQUEST </dt>
 <dd class="description">client-error-bad-request</dd>
@@ -4233,7 +4233,7 @@ are server-oriented...</p>
 <dd class="description">successful-ok-too-many-events</dd>
 <dt>IPP_OPERATION_NOT_SUPPORTED </dt>
 <dd class="description">server-error-operation-not-supported</dd>
-<dt>IPP_PKI_ERROR <span class="info">&nbsp;CUPS 1.5&nbsp;</span></dt>
+<dt>IPP_PKI_ERROR <span class="info">&nbsp;CUPS 1.5/Mac OS X 10.7&nbsp;</span></dt>
 <dd class="description">Error negotiating a secure connection </dd>
 <dt>IPP_PRINTER_BUSY </dt>
 <dd class="description">server-error-busy</dd>
index 7631e6a7d98b647dc61a6ebc80c1e0c0d898a28a..78838b85ac68eb73657d1c0182e586d9d86acb4f 100644 (file)
@@ -394,13 +394,16 @@ including file size.">mimeFilter2</a></li>
        <li><a href="#mimeLoad" title="Create a new MIME database from disk.">mimeLoad</a></li>
        <li><a href="#mimeLoadFilters" title="Load filter definitions from disk.">mimeLoadFilters</a></li>
        <li><a href="#mimeLoadTypes" title="Load type definitions from disk.">mimeLoadTypes</a></li>
+       <li><a href="#mimeNew" title="Create a new, empty MIME database.">mimeNew</a></li>
        <li><a href="#mimeNextFilter" title="Get the next filter in the MIME database.">mimeNextFilter</a></li>
        <li><a href="#mimeNextType" title="Get the next type in the MIME database.">mimeNextType</a></li>
        <li><a href="#mimeNumFilters" title="Next type">mimeNumFilters</a></li>
        <li><a href="#mimeNumTypes" title="MIME database">mimeNumTypes</a></li>
+       <li><a href="#mimeSetErrorCallback" title="Set the callback for error messages.">mimeSetErrorCallback</a></li>
        <li><a href="#mimeType" title="Lookup a file type.">mimeType</a></li>
 </ul></li>
 <li><a href="#TYPES">Data Types</a><ul class="code">
+       <li><a href="#const" title="MIME Database">const</a></li>
        <li><a href="#mime_filter_t" title="MIME Conversion Filter Data">mime_filter_t</a></li>
        <li><a href="#mime_magic_t" title="MIME Magic Data">mime_magic_t</a></li>
        <li><a href="#mime_op_t" title="Types/structures...">mime_op_t</a></li>
@@ -434,7 +437,7 @@ including file size.">mimeFilter2</a></li>
 &nbsp;&nbsp;&nbsp;&nbsp;<a href="#mime_type_t">mime_type_t</a> *src,<br>
 &nbsp;&nbsp;&nbsp;&nbsp;<a href="#mime_type_t">mime_type_t</a> *dst,<br>
 &nbsp;&nbsp;&nbsp;&nbsp;int cost,<br>
-&nbsp;&nbsp;&nbsp;&nbsp;const char *filter<br>
+&nbsp;&nbsp;&nbsp;&nbsp;<a href="#const">const</a> char *filter<br>
 );</p>
 <h4 class="parameters">Parameters</h4>
 <dl>
@@ -456,8 +459,8 @@ including file size.">mimeFilter2</a></li>
 <p class="code">
 <a href="#mime_type_t">mime_type_t</a> *mimeAddType (<br>
 &nbsp;&nbsp;&nbsp;&nbsp;<a href="#mime_t">mime_t</a> *mime,<br>
-&nbsp;&nbsp;&nbsp;&nbsp;const char *super,<br>
-&nbsp;&nbsp;&nbsp;&nbsp;const char *type<br>
+&nbsp;&nbsp;&nbsp;&nbsp;<a href="#const">const</a> char *super,<br>
+&nbsp;&nbsp;&nbsp;&nbsp;<a href="#const">const</a> char *type<br>
 );</p>
 <h4 class="parameters">Parameters</h4>
 <dl>
@@ -475,7 +478,7 @@ including file size.">mimeFilter2</a></li>
 <p class="code">
 int mimeAddTypeRule (<br>
 &nbsp;&nbsp;&nbsp;&nbsp;<a href="#mime_type_t">mime_type_t</a> *mt,<br>
-&nbsp;&nbsp;&nbsp;&nbsp;const char *rule<br>
+&nbsp;&nbsp;&nbsp;&nbsp;<a href="#const">const</a> char *rule<br>
 );</p>
 <h4 class="parameters">Parameters</h4>
 <dl>
@@ -530,8 +533,8 @@ void mimeDeleteType (<br>
 <p class="code">
 <a href="#mime_type_t">mime_type_t</a> *mimeFileType (<br>
 &nbsp;&nbsp;&nbsp;&nbsp;<a href="#mime_t">mime_t</a> *mime,<br>
-&nbsp;&nbsp;&nbsp;&nbsp;const char *pathname,<br>
-&nbsp;&nbsp;&nbsp;&nbsp;const char *filename,<br>
+&nbsp;&nbsp;&nbsp;&nbsp;<a href="#const">const</a> char *pathname,<br>
+&nbsp;&nbsp;&nbsp;&nbsp;<a href="#const">const</a> char *filename,<br>
 &nbsp;&nbsp;&nbsp;&nbsp;int *compression<br>
 );</p>
 <h4 class="parameters">Parameters</h4>
@@ -644,8 +647,8 @@ cups_array_t *mimeFilter2 (<br>
 <p class="description">Create a new MIME database from disk.</p>
 <p class="code">
 <a href="#mime_t">mime_t</a> *mimeLoad (<br>
-&nbsp;&nbsp;&nbsp;&nbsp;const char *pathname,<br>
-&nbsp;&nbsp;&nbsp;&nbsp;const char *filterpath<br>
+&nbsp;&nbsp;&nbsp;&nbsp;<a href="#const">const</a> char *pathname,<br>
+&nbsp;&nbsp;&nbsp;&nbsp;<a href="#const">const</a> char *filterpath<br>
 );</p>
 <h4 class="parameters">Parameters</h4>
 <dl>
@@ -664,8 +667,8 @@ create a MIME database from a single directory.</p>
 <p class="code">
 <a href="#mime_t">mime_t</a> *mimeLoadFilters (<br>
 &nbsp;&nbsp;&nbsp;&nbsp;<a href="#mime_t">mime_t</a> *mime,<br>
-&nbsp;&nbsp;&nbsp;&nbsp;const char *pathname,<br>
-&nbsp;&nbsp;&nbsp;&nbsp;const char *filterpath<br>
+&nbsp;&nbsp;&nbsp;&nbsp;<a href="#const">const</a> char *pathname,<br>
+&nbsp;&nbsp;&nbsp;&nbsp;<a href="#const">const</a> char *filterpath<br>
 );</p>
 <h4 class="parameters">Parameters</h4>
 <dl>
@@ -686,7 +689,7 @@ Use <a href="#mimeLoadTypes"><code>mimeLoadTypes</code></a> to load all types be
 <p class="code">
 <a href="#mime_t">mime_t</a> *mimeLoadTypes (<br>
 &nbsp;&nbsp;&nbsp;&nbsp;<a href="#mime_t">mime_t</a> *mime,<br>
-&nbsp;&nbsp;&nbsp;&nbsp;const char *pathname<br>
+&nbsp;&nbsp;&nbsp;&nbsp;<a href="#const">const</a> char *pathname<br>
 );</p>
 <h4 class="parameters">Parameters</h4>
 <dl>
@@ -700,6 +703,12 @@ Use <a href="#mimeLoadTypes"><code>mimeLoadTypes</code></a> to load all types be
 <h4 class="discussion">Discussion</h4>
 <p class="discussion">This function loads all of the .types files from the specified directory.
 Use <a href="#mimeLoadFilters"><code>mimeLoadFilters</code></a> to load all filters after you load the types.</p>
+<h3 class="function"><a name="mimeNew">mimeNew</a></h3>
+<p class="description">Create a new, empty MIME database.</p>
+<p class="code">
+<a href="#mime_t">mime_t</a> *mimeNew (void);</p>
+<h4 class="returnvalue">Return Value</h4>
+<p class="description">MIME database</p>
 <h3 class="function"><a name="mimeNextFilter">mimeNextFilter</a></h3>
 <p class="description">Get the next filter in the MIME database.</p>
 <p class="code">
@@ -752,13 +761,30 @@ int mimeNumTypes (<br>
 </dl>
 <h4 class="returnvalue">Return Value</h4>
 <p class="description">Get the number of types in a MIME database.</p>
+<h3 class="function"><a name="mimeSetErrorCallback">mimeSetErrorCallback</a></h3>
+<p class="description">Set the callback for error messages.</p>
+<p class="code">
+void mimeSetErrorCallback (<br>
+&nbsp;&nbsp;&nbsp;&nbsp;<a href="#mime_t">mime_t</a> *mime,<br>
+&nbsp;&nbsp;&nbsp;&nbsp;mime_error_cb_t cb,<br>
+&nbsp;&nbsp;&nbsp;&nbsp;void *ctx<br>
+);</p>
+<h4 class="parameters">Parameters</h4>
+<dl>
+<dt>mime</dt>
+<dd class="description">MIME database</dd>
+<dt>cb</dt>
+<dd class="description">Callback function</dd>
+<dt>ctx</dt>
+<dd class="description">Context pointer for callback</dd>
+</dl>
 <h3 class="function"><a name="mimeType">mimeType</a></h3>
 <p class="description">Lookup a file type.</p>
 <p class="code">
 <a href="#mime_type_t">mime_type_t</a> *mimeType (<br>
 &nbsp;&nbsp;&nbsp;&nbsp;<a href="#mime_t">mime_t</a> *mime,<br>
-&nbsp;&nbsp;&nbsp;&nbsp;const char *super,<br>
-&nbsp;&nbsp;&nbsp;&nbsp;const char *type<br>
+&nbsp;&nbsp;&nbsp;&nbsp;<a href="#const">const</a> char *super,<br>
+&nbsp;&nbsp;&nbsp;&nbsp;<a href="#const">const</a> char *type<br>
 );</p>
 <h4 class="parameters">Parameters</h4>
 <dl>
@@ -772,6 +798,11 @@ int mimeNumTypes (<br>
 <h4 class="returnvalue">Return Value</h4>
 <p class="description">Matching file type definition</p>
 <h2 class="title"><a name="TYPES">Data Types</a></h2>
+<h3 class="typedef"><a name="const">const</a></h3>
+<p class="description">MIME Database</p>
+<p class="code">
+typedef void (*constmime_error_cb_t)(void *;
+</p>
 <h3 class="typedef"><a name="mime_filter_t">mime_filter_t</a></h3>
 <p class="description">MIME Conversion Filter Data</p>
 <p class="code">
index 90726bf6454e81477a22b7fbe98d7cbfa6660f50..dad6ab279916d961864f1e433c36046c4f6e7e74 100644 (file)
@@ -343,10 +343,9 @@ div.contents ul.subcontents li {
 <!--
   "$Id$"
 
-  Introduction to CUPS programming header for the Common UNIX Printing System
-  (CUPS).
+  Introduction to CUPS programming header for CUPS.
 
-  Copyright 2008-2009 by Apple Inc.
+  Copyright 2008-2011 by Apple Inc.
 
   These coded instructions, statements, and computer programs are the
   property of Apple Inc. and are protected by Federal copyright
index 626b25d127b93b5de8d2f019c7dd074c135ba8ee..c7b7a61195de09ca44db747d976f929afdd9d803 100644 (file)
@@ -343,9 +343,9 @@ div.contents ul.subcontents li {
 <!--
   "$Id$"
 
-  PPD API header for the Common UNIX Printing System (CUPS).
+  PPD API header for CUPS.
 
-  Copyright 2008-2009 by Apple Inc.
+  Copyright 2008-2011 by Apple Inc.
 
   These coded instructions, statements, and computer programs are the
   property of Apple Inc. and are protected by Federal copyright
index 3659e1ae8b6a1ebc7c51b9ae780563ba02d31200..ebeb8d82941a3dfdbb65f71b532240cdefd6d8d4 100644 (file)
@@ -1384,7 +1384,7 @@ factor not applied) </dd>
 <dd class="description">Open stream for writing</dd>
 <dt>CUPS_RASTER_WRITE_COMPRESSED <span class="info">&nbsp;CUPS 1.3/Mac OS X 10.5&nbsp;</span></dt>
 <dd class="description">Open stream for compressed writing </dd>
-<dt>CUPS_RASTER_WRITE_PWG <span class="info">&nbsp;CUPS 1.5&nbsp;</span></dt>
+<dt>CUPS_RASTER_WRITE_PWG <span class="info">&nbsp;CUPS 1.5/Mac OS X 10.7&nbsp;</span></dt>
 <dd class="description">Open stream for compressed writing in PWG mode </dd>
 </dl>
 <h3 class="enumeration"><a name="cups_order_e">cups_order_e</a></h3>
index 35749f2b94e56455834fd12fdc0eec4476a9c314..2b7c2460f7123fe987f73b9ae781eedd5fcbd737 100644 (file)
@@ -8,7 +8,7 @@
 
 <H1 CLASS="title">Software License Agreement</H1>
 
-<P ALIGN="CENTER">Copyright 2007-2010 by Apple Inc.<BR>
+<P ALIGN="CENTER">Copyright 2007-2011 by Apple Inc.<BR>
 1 Infinite Loop<BR>
 Cupertino, CA 95014 USA<BR>
 <BR>
@@ -523,7 +523,7 @@ when it starts in an interactive mode:
 Gnomovision version 69, Copyright (C) <VAR>year</VAR> <VAR>name of author</VAR>
 Gnomovision comes with ABSOLUTELY NO WARRANTY; for details
 type `show w'.  This is free software, and you are welcome
-to redistribute it under certain conditions; type `show c' 
+to redistribute it under certain conditions; type `show c'
 for details.
 </PRE>
 
@@ -540,7 +540,7 @@ necessary.  Here is a sample; alter the names:
 <PRE>
 Yoyodyne, Inc., hereby disclaims all copyright
 interest in the program `Gnomovision'
-(which makes passes at compilers) written 
+(which makes passes at compilers) written
 by James Hacker.
 
 <VAR>signature of Ty Coon</VAR>, 1 April 1989
index 97f567cde0b2bde0c0a823c8d503bf6f5f0ac6bf..1cbb24ae14496a56e15acbc4bb38b2f3e5ea3cd5 100644 (file)
@@ -7,8 +7,9 @@ auth.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h
 auth.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h
 auth.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h
 auth.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h
-auth.o: ../cups/thread-private.h mime.h ../cups/array.h ../cups/file.h
-auth.o: sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h
+auth.o: ../cups/thread-private.h ../cups/file-private.h
+auth.o: ../cups/cups-private.h mime.h ../cups/array.h ../cups/file.h sysman.h
+auth.o: statbuf.h cert.h auth.h client.h policy.h printers.h
 auth.o: ../cups/pwg-private.h classes.h job.h conf.h banners.h dirsvc.h
 auth.o: network.h subscriptions.h
 banners.o: cupsd.h ../cups/cups-private.h ../cups/cups.h ../cups/file.h
@@ -18,7 +19,8 @@ banners.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h
 banners.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h
 banners.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h
 banners.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h
-banners.o: ../cups/thread-private.h mime.h ../cups/array.h ../cups/file.h
+banners.o: ../cups/thread-private.h ../cups/file-private.h
+banners.o: ../cups/cups-private.h mime.h ../cups/array.h ../cups/file.h
 banners.o: sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h
 banners.o: ../cups/pwg-private.h classes.h job.h conf.h banners.h dirsvc.h
 banners.o: network.h subscriptions.h ../cups/dir.h
@@ -29,8 +31,9 @@ cert.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h
 cert.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h
 cert.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h
 cert.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h
-cert.o: ../cups/thread-private.h mime.h ../cups/array.h ../cups/file.h
-cert.o: sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h
+cert.o: ../cups/thread-private.h ../cups/file-private.h
+cert.o: ../cups/cups-private.h mime.h ../cups/array.h ../cups/file.h sysman.h
+cert.o: statbuf.h cert.h auth.h client.h policy.h printers.h
 cert.o: ../cups/pwg-private.h classes.h job.h conf.h banners.h dirsvc.h
 cert.o: network.h subscriptions.h
 classes.o: cupsd.h ../cups/cups-private.h ../cups/cups.h ../cups/file.h
@@ -40,7 +43,8 @@ classes.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h
 classes.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h
 classes.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h
 classes.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h
-classes.o: ../cups/thread-private.h mime.h ../cups/array.h ../cups/file.h
+classes.o: ../cups/thread-private.h ../cups/file-private.h
+classes.o: ../cups/cups-private.h mime.h ../cups/array.h ../cups/file.h
 classes.o: sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h
 classes.o: ../cups/pwg-private.h classes.h job.h conf.h banners.h dirsvc.h
 classes.o: network.h subscriptions.h
@@ -51,7 +55,8 @@ client.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h
 client.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h
 client.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h
 client.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h
-client.o: ../cups/thread-private.h mime.h ../cups/array.h ../cups/file.h
+client.o: ../cups/thread-private.h ../cups/file-private.h
+client.o: ../cups/cups-private.h mime.h ../cups/array.h ../cups/file.h
 client.o: sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h
 client.o: ../cups/pwg-private.h classes.h job.h conf.h banners.h dirsvc.h
 client.o: network.h subscriptions.h
@@ -62,8 +67,9 @@ conf.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h
 conf.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h
 conf.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h
 conf.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h
-conf.o: ../cups/thread-private.h mime.h ../cups/array.h ../cups/file.h
-conf.o: sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h
+conf.o: ../cups/thread-private.h ../cups/file-private.h
+conf.o: ../cups/cups-private.h mime.h ../cups/array.h ../cups/file.h sysman.h
+conf.o: statbuf.h cert.h auth.h client.h policy.h printers.h
 conf.o: ../cups/pwg-private.h classes.h job.h conf.h banners.h dirsvc.h
 conf.o: network.h subscriptions.h
 dirsvc.o: cupsd.h ../cups/cups-private.h ../cups/cups.h ../cups/file.h
@@ -73,7 +79,8 @@ dirsvc.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h
 dirsvc.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h
 dirsvc.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h
 dirsvc.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h
-dirsvc.o: ../cups/thread-private.h mime.h ../cups/array.h ../cups/file.h
+dirsvc.o: ../cups/thread-private.h ../cups/file-private.h
+dirsvc.o: ../cups/cups-private.h mime.h ../cups/array.h ../cups/file.h
 dirsvc.o: sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h
 dirsvc.o: ../cups/pwg-private.h classes.h job.h conf.h banners.h dirsvc.h
 dirsvc.o: network.h subscriptions.h
@@ -84,10 +91,22 @@ env.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h
 env.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h
 env.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h
 env.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h
-env.o: ../cups/thread-private.h mime.h ../cups/array.h ../cups/file.h
-env.o: sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h
-env.o: ../cups/pwg-private.h classes.h job.h conf.h banners.h dirsvc.h
-env.o: network.h subscriptions.h
+env.o: ../cups/thread-private.h ../cups/file-private.h ../cups/cups-private.h
+env.o: mime.h ../cups/array.h ../cups/file.h sysman.h statbuf.h cert.h auth.h
+env.o: client.h policy.h printers.h ../cups/pwg-private.h classes.h job.h
+env.o: conf.h banners.h dirsvc.h network.h subscriptions.h
+file.o: cupsd.h ../cups/cups-private.h ../cups/cups.h ../cups/file.h
+file.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h
+file.o: ../cups/language.h ../cups/string-private.h ../config.h
+file.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h
+file.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h
+file.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h
+file.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h
+file.o: ../cups/thread-private.h ../cups/file-private.h
+file.o: ../cups/cups-private.h mime.h ../cups/array.h ../cups/file.h sysman.h
+file.o: statbuf.h cert.h auth.h client.h policy.h printers.h
+file.o: ../cups/pwg-private.h classes.h job.h conf.h banners.h dirsvc.h
+file.o: network.h subscriptions.h ../cups/dir.h
 main.o: cupsd.h ../cups/cups-private.h ../cups/cups.h ../cups/file.h
 main.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h
 main.o: ../cups/language.h ../cups/string-private.h ../config.h
@@ -95,10 +114,11 @@ main.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h
 main.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h
 main.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h
 main.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h
-main.o: ../cups/thread-private.h mime.h ../cups/array.h ../cups/file.h
-main.o: sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h
+main.o: ../cups/thread-private.h ../cups/file-private.h
+main.o: ../cups/cups-private.h mime.h ../cups/array.h ../cups/file.h sysman.h
+main.o: statbuf.h cert.h auth.h client.h policy.h printers.h
 main.o: ../cups/pwg-private.h classes.h job.h conf.h banners.h dirsvc.h
-main.o: network.h subscriptions.h ../cups/dir.h
+main.o: network.h subscriptions.h
 ipp.o: cupsd.h ../cups/cups-private.h ../cups/cups.h ../cups/file.h
 ipp.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h
 ipp.o: ../cups/language.h ../cups/string-private.h ../config.h
@@ -106,10 +126,11 @@ ipp.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h
 ipp.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h
 ipp.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h
 ipp.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h
-ipp.o: ../cups/thread-private.h mime.h ../cups/array.h ../cups/file.h
-ipp.o: sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h
-ipp.o: ../cups/pwg-private.h classes.h job.h conf.h banners.h dirsvc.h
-ipp.o: network.h subscriptions.h ../cups/ppd-private.h
+ipp.o: ../cups/thread-private.h ../cups/file-private.h ../cups/cups-private.h
+ipp.o: mime.h ../cups/array.h ../cups/file.h sysman.h statbuf.h cert.h auth.h
+ipp.o: client.h policy.h printers.h ../cups/pwg-private.h classes.h job.h
+ipp.o: conf.h banners.h dirsvc.h network.h subscriptions.h
+ipp.o: ../cups/ppd-private.h
 listen.o: cupsd.h ../cups/cups-private.h ../cups/cups.h ../cups/file.h
 listen.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h
 listen.o: ../cups/language.h ../cups/string-private.h ../config.h
@@ -117,7 +138,8 @@ listen.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h
 listen.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h
 listen.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h
 listen.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h
-listen.o: ../cups/thread-private.h mime.h ../cups/array.h ../cups/file.h
+listen.o: ../cups/thread-private.h ../cups/file-private.h
+listen.o: ../cups/cups-private.h mime.h ../cups/array.h ../cups/file.h
 listen.o: sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h
 listen.o: ../cups/pwg-private.h classes.h job.h conf.h banners.h dirsvc.h
 listen.o: network.h subscriptions.h
@@ -128,10 +150,11 @@ job.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h
 job.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h
 job.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h
 job.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h
-job.o: ../cups/thread-private.h mime.h ../cups/array.h ../cups/file.h
-job.o: sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h
-job.o: ../cups/pwg-private.h classes.h job.h conf.h banners.h dirsvc.h
-job.o: network.h subscriptions.h ../cups/backend.h ../cups/dir.h
+job.o: ../cups/thread-private.h ../cups/file-private.h ../cups/cups-private.h
+job.o: mime.h ../cups/array.h ../cups/file.h sysman.h statbuf.h cert.h auth.h
+job.o: client.h policy.h printers.h ../cups/pwg-private.h classes.h job.h
+job.o: conf.h banners.h dirsvc.h network.h subscriptions.h ../cups/backend.h
+job.o: ../cups/dir.h
 log.o: cupsd.h ../cups/cups-private.h ../cups/cups.h ../cups/file.h
 log.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h
 log.o: ../cups/language.h ../cups/string-private.h ../config.h
@@ -139,10 +162,10 @@ log.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h
 log.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h
 log.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h
 log.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h
-log.o: ../cups/thread-private.h mime.h ../cups/array.h ../cups/file.h
-log.o: sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h
-log.o: ../cups/pwg-private.h classes.h job.h conf.h banners.h dirsvc.h
-log.o: network.h subscriptions.h
+log.o: ../cups/thread-private.h ../cups/file-private.h ../cups/cups-private.h
+log.o: mime.h ../cups/array.h ../cups/file.h sysman.h statbuf.h cert.h auth.h
+log.o: client.h policy.h printers.h ../cups/pwg-private.h classes.h job.h
+log.o: conf.h banners.h dirsvc.h network.h subscriptions.h
 network.o: ../cups/http-private.h ../config.h ../cups/http.h
 network.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h cupsd.h
 network.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h
@@ -151,7 +174,8 @@ network.o: ../cups/language.h ../cups/string-private.h
 network.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h
 network.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h
 network.o: ../cups/language-private.h ../cups/transcode.h
-network.o: ../cups/thread-private.h mime.h ../cups/array.h ../cups/file.h
+network.o: ../cups/thread-private.h ../cups/file-private.h
+network.o: ../cups/cups-private.h mime.h ../cups/array.h ../cups/file.h
 network.o: sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h
 network.o: ../cups/pwg-private.h classes.h job.h conf.h banners.h dirsvc.h
 network.o: network.h subscriptions.h
@@ -162,7 +186,8 @@ policy.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h
 policy.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h
 policy.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h
 policy.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h
-policy.o: ../cups/thread-private.h mime.h ../cups/array.h ../cups/file.h
+policy.o: ../cups/thread-private.h ../cups/file-private.h
+policy.o: ../cups/cups-private.h mime.h ../cups/array.h ../cups/file.h
 policy.o: sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h
 policy.o: ../cups/pwg-private.h classes.h job.h conf.h banners.h dirsvc.h
 policy.o: network.h subscriptions.h
@@ -173,7 +198,8 @@ printers.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h
 printers.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h
 printers.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h
 printers.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h
-printers.o: ../cups/thread-private.h mime.h ../cups/array.h ../cups/file.h
+printers.o: ../cups/thread-private.h ../cups/file-private.h
+printers.o: ../cups/cups-private.h mime.h ../cups/array.h ../cups/file.h
 printers.o: sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h
 printers.o: ../cups/pwg-private.h classes.h job.h conf.h banners.h dirsvc.h
 printers.o: network.h subscriptions.h ../cups/dir.h
@@ -184,7 +210,8 @@ process.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h
 process.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h
 process.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h
 process.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h
-process.o: ../cups/thread-private.h mime.h ../cups/array.h ../cups/file.h
+process.o: ../cups/thread-private.h ../cups/file-private.h
+process.o: ../cups/cups-private.h mime.h ../cups/array.h ../cups/file.h
 process.o: sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h
 process.o: ../cups/pwg-private.h classes.h job.h conf.h banners.h dirsvc.h
 process.o: network.h subscriptions.h
@@ -195,21 +222,11 @@ quotas.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h
 quotas.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h
 quotas.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h
 quotas.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h
-quotas.o: ../cups/thread-private.h mime.h ../cups/array.h ../cups/file.h
+quotas.o: ../cups/thread-private.h ../cups/file-private.h
+quotas.o: ../cups/cups-private.h mime.h ../cups/array.h ../cups/file.h
 quotas.o: sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h
 quotas.o: ../cups/pwg-private.h classes.h job.h conf.h banners.h dirsvc.h
 quotas.o: network.h subscriptions.h
-removefile.o: cupsd.h ../cups/cups-private.h ../cups/cups.h ../cups/file.h
-removefile.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h
-removefile.o: ../cups/array.h ../cups/language.h ../cups/string-private.h
-removefile.o: ../config.h ../cups/debug-private.h ../cups/ppd-private.h
-removefile.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h
-removefile.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h
-removefile.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h
-removefile.o: ../cups/transcode.h ../cups/thread-private.h mime.h
-removefile.o: ../cups/array.h ../cups/file.h sysman.h statbuf.h cert.h auth.h
-removefile.o: client.h policy.h printers.h ../cups/pwg-private.h classes.h
-removefile.o: job.h conf.h banners.h dirsvc.h network.h subscriptions.h
 select.o: cupsd.h ../cups/cups-private.h ../cups/cups.h ../cups/file.h
 select.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h
 select.o: ../cups/language.h ../cups/string-private.h ../config.h
@@ -217,7 +234,8 @@ select.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h
 select.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h
 select.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h
 select.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h
-select.o: ../cups/thread-private.h mime.h ../cups/array.h ../cups/file.h
+select.o: ../cups/thread-private.h ../cups/file-private.h
+select.o: ../cups/cups-private.h mime.h ../cups/array.h ../cups/file.h
 select.o: sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h
 select.o: ../cups/pwg-private.h classes.h job.h conf.h banners.h dirsvc.h
 select.o: network.h subscriptions.h
@@ -229,7 +247,8 @@ server.o: ../cups/language.h ../cups/string-private.h ../cups/debug-private.h
 server.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h
 server.o: ../cups/pwg-private.h ../cups/http-private.h
 server.o: ../cups/language-private.h ../cups/transcode.h
-server.o: ../cups/thread-private.h mime.h ../cups/array.h ../cups/file.h
+server.o: ../cups/thread-private.h ../cups/file-private.h
+server.o: ../cups/cups-private.h mime.h ../cups/array.h ../cups/file.h
 server.o: sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h
 server.o: ../cups/pwg-private.h classes.h job.h conf.h banners.h dirsvc.h
 server.o: network.h subscriptions.h
@@ -240,7 +259,8 @@ statbuf.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h
 statbuf.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h
 statbuf.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h
 statbuf.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h
-statbuf.o: ../cups/thread-private.h mime.h ../cups/array.h ../cups/file.h
+statbuf.o: ../cups/thread-private.h ../cups/file-private.h
+statbuf.o: ../cups/cups-private.h mime.h ../cups/array.h ../cups/file.h
 statbuf.o: sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h
 statbuf.o: ../cups/pwg-private.h classes.h job.h conf.h banners.h dirsvc.h
 statbuf.o: network.h subscriptions.h
@@ -252,10 +272,11 @@ subscriptions.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h
 subscriptions.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h
 subscriptions.o: ../cups/ipp-private.h ../cups/ipp.h
 subscriptions.o: ../cups/language-private.h ../cups/transcode.h
-subscriptions.o: ../cups/thread-private.h mime.h ../cups/array.h
-subscriptions.o: ../cups/file.h sysman.h statbuf.h cert.h auth.h client.h
-subscriptions.o: policy.h printers.h ../cups/pwg-private.h classes.h job.h
-subscriptions.o: conf.h banners.h dirsvc.h network.h subscriptions.h
+subscriptions.o: ../cups/thread-private.h ../cups/file-private.h
+subscriptions.o: ../cups/cups-private.h mime.h ../cups/array.h ../cups/file.h
+subscriptions.o: sysman.h statbuf.h cert.h auth.h client.h policy.h
+subscriptions.o: printers.h ../cups/pwg-private.h classes.h job.h conf.h
+subscriptions.o: banners.h dirsvc.h network.h subscriptions.h
 sysman.o: cupsd.h ../cups/cups-private.h ../cups/cups.h ../cups/file.h
 sysman.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h
 sysman.o: ../cups/language.h ../cups/string-private.h ../config.h
@@ -263,15 +284,16 @@ sysman.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h
 sysman.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h
 sysman.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h
 sysman.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h
-sysman.o: ../cups/thread-private.h mime.h ../cups/array.h ../cups/file.h
+sysman.o: ../cups/thread-private.h ../cups/file-private.h
+sysman.o: ../cups/cups-private.h mime.h ../cups/array.h ../cups/file.h
 sysman.o: sysman.h statbuf.h cert.h auth.h client.h policy.h printers.h
 sysman.o: ../cups/pwg-private.h classes.h job.h conf.h banners.h dirsvc.h
 sysman.o: network.h subscriptions.h
 filter.o: ../cups/string-private.h ../config.h ../cups/debug-private.h mime.h
 filter.o: ../cups/array.h ../cups/ipp.h ../cups/file.h
 mime.o: ../cups/string-private.h ../config.h ../cups/debug-private.h
-mime.o: ../cups/dir.h ../cups/versioning.h mime.h ../cups/array.h
-mime.o: ../cups/ipp.h ../cups/file.h
+mime.o: ../cups/dir.h ../cups/versioning.h mime-private.h mime.h
+mime.o: ../cups/array.h ../cups/ipp.h ../cups/file.h
 type.o: ../cups/string-private.h ../config.h ../cups/debug-private.h mime.h
 type.o: ../cups/array.h ../cups/ipp.h ../cups/file.h
 cupsfilter.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h
@@ -281,17 +303,12 @@ cupsfilter.o: ../config.h ../cups/debug-private.h ../cups/ppd-private.h
 cupsfilter.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h
 cupsfilter.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h
 cupsfilter.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h
-cupsfilter.o: ../cups/transcode.h ../cups/thread-private.h mime.h
-cupsfilter.o: ../cups/array.h ../cups/file.h
-cups-deviced.o: util.h ../cups/file-private.h ../cups/cups-private.h
-cups-deviced.o: ../cups/cups.h ../cups/file.h ../cups/versioning.h
-cups-deviced.o: ../cups/ipp.h ../cups/http.h ../cups/array.h
-cups-deviced.o: ../cups/language.h ../cups/string-private.h ../config.h
-cups-deviced.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h
-cups-deviced.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h
-cups-deviced.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h
-cups-deviced.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h
-cups-deviced.o: ../cups/thread-private.h ../cups/array.h ../cups/dir.h
+cupsfilter.o: ../cups/transcode.h ../cups/thread-private.h
+cupsfilter.o: ../cups/file-private.h ../cups/cups-private.h
+cupsfilter.o: ../cups/ppd-private.h mime.h ../cups/array.h ../cups/file.h
+cups-deviced.o: util.h ../cups/array-private.h ../cups/array.h
+cups-deviced.o: ../cups/versioning.h ../cups/file-private.h
+cups-deviced.o: ../cups/cups-private.h ../cups/array.h ../cups/dir.h
 cups-exec.o: ../cups/string-private.h ../config.h
 cups-lpd.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h
 cups-lpd.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h
@@ -316,7 +333,8 @@ testlpd.o: ../cups/cups.h ../cups/file.h ../cups/versioning.h ../cups/ipp.h
 testlpd.o: ../cups/http.h ../cups/array.h ../cups/language.h
 testlpd.o: ../cups/string-private.h ../config.h
 testmime.o: ../cups/string-private.h ../config.h ../cups/dir.h
-testmime.o: ../cups/versioning.h mime.h ../cups/array.h ../cups/ipp.h
+testmime.o: ../cups/versioning.h ../cups/debug-private.h
+testmime.o: ../cups/ppd-private.h mime.h ../cups/array.h ../cups/ipp.h
 testmime.o: ../cups/file.h
 testspeed.o: ../cups/string-private.h ../config.h ../cups/cups.h
 testspeed.o: ../cups/file.h ../cups/versioning.h ../cups/ipp.h ../cups/http.h
@@ -325,21 +343,10 @@ testspeed.o: ../cups/debug-private.h
 testsub.o: ../cups/cups.h ../cups/file.h ../cups/versioning.h ../cups/ipp.h
 testsub.o: ../cups/http.h ../cups/array.h ../cups/language.h
 testsub.o: ../cups/debug-private.h ../cups/string-private.h ../config.h
-util.o: util.h ../cups/file-private.h ../cups/cups-private.h ../cups/cups.h
-util.o: ../cups/file.h ../cups/versioning.h ../cups/ipp.h ../cups/http.h
-util.o: ../cups/array.h ../cups/language.h ../cups/string-private.h
-util.o: ../config.h ../cups/debug-private.h ../cups/ppd-private.h
-util.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h
-util.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h
-util.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h
-util.o: ../cups/transcode.h ../cups/thread-private.h
-cups-driverd.o: util.h ../cups/file-private.h ../cups/cups-private.h
-cups-driverd.o: ../cups/cups.h ../cups/file.h ../cups/versioning.h
-cups-driverd.o: ../cups/ipp.h ../cups/http.h ../cups/array.h
-cups-driverd.o: ../cups/language.h ../cups/string-private.h ../config.h
-cups-driverd.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h
-cups-driverd.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h
-cups-driverd.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h
-cups-driverd.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h
-cups-driverd.o: ../cups/thread-private.h ../cups/dir.h ../cups/ppd-private.h
-cups-driverd.o: ../ppdc/ppdc.h ../cups/file.h
+util.o: util.h ../cups/array-private.h ../cups/array.h ../cups/versioning.h
+util.o: ../cups/file-private.h ../cups/cups-private.h
+cups-driverd.o: util.h ../cups/array-private.h ../cups/array.h
+cups-driverd.o: ../cups/versioning.h ../cups/file-private.h
+cups-driverd.o: ../cups/cups-private.h ../cups/dir.h ../cups/transcode.h
+cups-driverd.o: ../cups/language.h ../cups/ppd-private.h ../ppdc/ppdc.h
+cups-driverd.o: ../cups/file.h