Merge changes from CUPS 1.5svn-r9105.

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

1 files changed, 29 insertions, 4 deletions

diff --git a/ppdc/Dependencies b/ppdc/Dependencies
index d5b07be19..42c909e10 100644
--- a/ppdc/Dependencies
+++ b/ppdc/Dependencies
@@ -8,6 +8,7 @@ ppdc-array.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h
 ppdc-array.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h
 ppdc-array.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h
 ppdc-array.o: ../cups/language-private.h ../cups/transcode.h
+ppdc-array.o: ../cups/thread-private.h
 ppdc-attr.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h
 ppdc-attr.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h
 ppdc-attr.o: ../cups/ipp.h ../cups/http.h ../cups/language.h ../cups/array.h
@@ -16,6 +17,7 @@ ppdc-attr.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h
 ppdc-attr.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h
 ppdc-attr.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h
 ppdc-attr.o: ../cups/language-private.h ../cups/transcode.h
+ppdc-attr.o: ../cups/thread-private.h
 ppdc-catalog.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h
 ppdc-catalog.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h
 ppdc-catalog.o: ../cups/ipp.h ../cups/http.h ../cups/language.h
@@ -24,6 +26,7 @@ ppdc-catalog.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h
 ppdc-catalog.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h
 ppdc-catalog.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h
 ppdc-catalog.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h
+ppdc-catalog.o: ../cups/thread-private.h
 ppdc-choice.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h
 ppdc-choice.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h
 ppdc-choice.o: ../cups/ipp.h ../cups/http.h ../cups/language.h
@@ -32,6 +35,7 @@ ppdc-choice.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h
 ppdc-choice.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h
 ppdc-choice.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h
 ppdc-choice.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h
+ppdc-choice.o: ../cups/thread-private.h
 ppdc-constraint.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h
 ppdc-constraint.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h
 ppdc-constraint.o: ../cups/ipp.h ../cups/http.h ../cups/language.h
@@ -41,6 +45,7 @@ ppdc-constraint.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h
 ppdc-constraint.o: ../cups/http-private.h ../cups/http.h
 ppdc-constraint.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h
 ppdc-constraint.o: ../cups/language-private.h ../cups/transcode.h
+ppdc-constraint.o: ../cups/thread-private.h
 ppdc-driver.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h
 ppdc-driver.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h
 ppdc-driver.o: ../cups/ipp.h ../cups/http.h ../cups/language.h
@@ -49,6 +54,7 @@ ppdc-driver.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h
 ppdc-driver.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h
 ppdc-driver.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h
 ppdc-driver.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h
+ppdc-driver.o: ../cups/thread-private.h
 ppdc-file.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h
 ppdc-file.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h
 ppdc-file.o: ../cups/ipp.h ../cups/http.h ../cups/language.h ../cups/array.h
@@ -57,6 +63,7 @@ ppdc-file.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h
 ppdc-file.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h
 ppdc-file.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h
 ppdc-file.o: ../cups/language-private.h ../cups/transcode.h
+ppdc-file.o: ../cups/thread-private.h
 ppdc-filter.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h
 ppdc-filter.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h
 ppdc-filter.o: ../cups/ipp.h ../cups/http.h ../cups/language.h
@@ -65,6 +72,7 @@ ppdc-filter.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h
 ppdc-filter.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h
 ppdc-filter.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h
 ppdc-filter.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h
+ppdc-filter.o: ../cups/thread-private.h
 ppdc-font.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h
 ppdc-font.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h
 ppdc-font.o: ../cups/ipp.h ../cups/http.h ../cups/language.h ../cups/array.h
@@ -73,6 +81,7 @@ ppdc-font.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h
 ppdc-font.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h
 ppdc-font.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h
 ppdc-font.o: ../cups/language-private.h ../cups/transcode.h
+ppdc-font.o: ../cups/thread-private.h
 ppdc-group.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h
 ppdc-group.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h
 ppdc-group.o: ../cups/ipp.h ../cups/http.h ../cups/language.h ../cups/array.h
@@ -81,6 +90,7 @@ ppdc-group.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h
 ppdc-group.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h
 ppdc-group.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h
 ppdc-group.o: ../cups/language-private.h ../cups/transcode.h
+ppdc-group.o: ../cups/thread-private.h
 ppdc-import.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h
 ppdc-import.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h
 ppdc-import.o: ../cups/ipp.h ../cups/http.h ../cups/language.h
@@ -89,6 +99,7 @@ ppdc-import.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h
 ppdc-import.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h
 ppdc-import.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h
 ppdc-import.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h
+ppdc-import.o: ../cups/thread-private.h
 ppdc-mediasize.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h
 ppdc-mediasize.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h
 ppdc-mediasize.o: ../cups/ipp.h ../cups/http.h ../cups/language.h
@@ -97,7 +108,7 @@ ppdc-mediasize.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h
 ppdc-mediasize.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h
 ppdc-mediasize.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h
 ppdc-mediasize.o: ../cups/ipp.h ../cups/language-private.h
-ppdc-mediasize.o: ../cups/transcode.h
+ppdc-mediasize.o: ../cups/transcode.h ../cups/thread-private.h
 ppdc-message.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h
 ppdc-message.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h
 ppdc-message.o: ../cups/ipp.h ../cups/http.h ../cups/language.h
@@ -106,6 +117,7 @@ ppdc-message.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h
 ppdc-message.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h
 ppdc-message.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h
 ppdc-message.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h
+ppdc-message.o: ../cups/thread-private.h
 ppdc-option.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h
 ppdc-option.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h
 ppdc-option.o: ../cups/ipp.h ../cups/http.h ../cups/language.h
@@ -114,6 +126,7 @@ ppdc-option.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h
 ppdc-option.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h
 ppdc-option.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h
 ppdc-option.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h
+ppdc-option.o: ../cups/thread-private.h
 ppdc-profile.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h
 ppdc-profile.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h
 ppdc-profile.o: ../cups/ipp.h ../cups/http.h ../cups/language.h
@@ -122,6 +135,7 @@ ppdc-profile.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h
 ppdc-profile.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h
 ppdc-profile.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h
 ppdc-profile.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h
+ppdc-profile.o: ../cups/thread-private.h
 ppdc-shared.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h
 ppdc-shared.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h
 ppdc-shared.o: ../cups/ipp.h ../cups/http.h ../cups/language.h
@@ -130,6 +144,7 @@ ppdc-shared.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h
 ppdc-shared.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h
 ppdc-shared.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h
 ppdc-shared.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h
+ppdc-shared.o: ../cups/thread-private.h
 ppdc-source.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h
 ppdc-source.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h
 ppdc-source.o: ../cups/ipp.h ../cups/http.h ../cups/language.h
@@ -138,8 +153,9 @@ ppdc-source.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h
 ppdc-source.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h
 ppdc-source.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h
 ppdc-source.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h
-ppdc-source.o: ../cups/raster.h ../cups/ppd.h ../data/epson.h ../data/escp.h
-ppdc-source.o: ../data/hp.h ../data/label.h ../data/pcl.h
+ppdc-source.o: ../cups/thread-private.h ../cups/raster.h ../cups/ppd.h
+ppdc-source.o: ../data/epson.h ../data/escp.h ../data/hp.h ../data/label.h
+ppdc-source.o: ../data/pcl.h
 ppdc-string.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h
 ppdc-string.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h
 ppdc-string.o: ../cups/ipp.h ../cups/http.h ../cups/language.h
@@ -148,6 +164,7 @@ ppdc-string.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h
 ppdc-string.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h
 ppdc-string.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h
 ppdc-string.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h
+ppdc-string.o: ../cups/thread-private.h
 ppdc-variable.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h
 ppdc-variable.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h
 ppdc-variable.o: ../cups/ipp.h ../cups/http.h ../cups/language.h
@@ -156,6 +173,7 @@ ppdc-variable.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h
 ppdc-variable.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h
 ppdc-variable.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h
 ppdc-variable.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h
+ppdc-variable.o: ../cups/thread-private.h
 genstrings.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h
 genstrings.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h
 genstrings.o: ../cups/ipp.h ../cups/http.h ../cups/language.h ../cups/array.h
@@ -164,6 +182,7 @@ genstrings.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h
 genstrings.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h
 genstrings.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h
 genstrings.o: ../cups/language-private.h ../cups/transcode.h
+genstrings.o: ../cups/thread-private.h
 ppdc.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h
 ppdc.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h ../cups/ipp.h
 ppdc.o: ../cups/http.h ../cups/language.h ../cups/array.h
@@ -172,6 +191,7 @@ ppdc.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h
 ppdc.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h
 ppdc.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h
 ppdc.o: ../cups/language-private.h ../cups/transcode.h
+ppdc.o: ../cups/thread-private.h
 ppdhtml.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h
 ppdhtml.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h ../cups/ipp.h
 ppdhtml.o: ../cups/http.h ../cups/language.h ../cups/array.h
@@ -180,6 +200,7 @@ ppdhtml.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h
 ppdhtml.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h
 ppdhtml.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h
 ppdhtml.o: ../cups/language-private.h ../cups/transcode.h
+ppdhtml.o: ../cups/thread-private.h
 ppdi.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h
 ppdi.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h ../cups/ipp.h
 ppdi.o: ../cups/http.h ../cups/language.h ../cups/array.h
@@ -188,6 +209,7 @@ ppdi.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h
 ppdi.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h
 ppdi.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h
 ppdi.o: ../cups/language-private.h ../cups/transcode.h
+ppdi.o: ../cups/thread-private.h
 ppdmerge.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h
 ppdmerge.o: ../cups/ipp.h ../cups/http.h ../cups/versioning.h
 ppdmerge.o: ../cups/language.h ../cups/array.h ../cups/string-private.h
@@ -195,7 +217,8 @@ ppdmerge.o: ../config.h ../cups/debug-private.h ../cups/ppd-private.h
 ppdmerge.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h
 ppdmerge.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h
 ppdmerge.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h
-ppdmerge.o: ../cups/transcode.h ../cups/ppd-private.h ../cups/array.h
+ppdmerge.o: ../cups/transcode.h ../cups/thread-private.h
+ppdmerge.o: ../cups/ppd-private.h ../cups/array.h
 ppdpo.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h
 ppdpo.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h ../cups/ipp.h
 ppdpo.o: ../cups/http.h ../cups/language.h ../cups/array.h
@@ -204,6 +227,7 @@ ppdpo.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h
 ppdpo.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h
 ppdpo.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h
 ppdpo.o: ../cups/language-private.h ../cups/transcode.h
+ppdpo.o: ../cups/thread-private.h
 testcatalog.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h
 testcatalog.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h
 testcatalog.o: ../cups/ipp.h ../cups/http.h ../cups/language.h
@@ -212,3 +236,4 @@ testcatalog.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h
 testcatalog.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h
 testcatalog.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h
 testcatalog.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h
+testcatalog.o: ../cups/thread-private.h