diff options
| author | jlovell <jlovell@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2007-06-23 05:26:17 +0000 |
|---|---|---|
| committer | jlovell <jlovell@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2007-06-23 05:26:17 +0000 |
| commit | 09a101d671d39312a756c325d8463a1a02f582a6 (patch) | |
| tree | 09a2338172d0eca839ad4f82524f2846aae6ffdd /conf | |
| parent | 3d8365b8dc12c660de084e4047b8648fc377ed16 (diff) | |
| download | cups-09a101d671d39312a756c325d8463a1a02f582a6.tar.gz | |
Load cups into easysw/current.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@334 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/mime.convs.in (renamed from conf/mime.convs) | 6 | ||||
| -rw-r--r-- | conf/mime.types | 20 |
2 files changed, 13 insertions, 13 deletions
diff --git a/conf/mime.convs b/conf/mime.convs.in index 97463d335..ec3291871 100644 --- a/conf/mime.convs +++ b/conf/mime.convs.in @@ -1,5 +1,5 @@ # -# "$Id: mime.convs 6405 2007-03-27 16:09:02Z mike $" +# "$Id: mime.convs.in 6566 2007-06-18 23:56:23Z mike $" # # DO NOT EDIT THIS FILE, AS IT IS OVERWRITTEN WHEN YOU INSTALL NEW # VERSIONS OF CUPS. Instead, create a "local.convs" file that @@ -115,8 +115,8 @@ image/x-sun-raster application/vnd.cups-raster 100 imagetoraster # without the -oraw option. # -#application/octet-stream application/vnd.cups-raw 0 - +@DEFAULT_RAW_PRINTING@application/octet-stream application/vnd.cups-raw 0 - # -# End of "$Id: mime.convs 6405 2007-03-27 16:09:02Z mike $". +# End of "$Id: mime.convs.in 6566 2007-06-18 23:56:23Z mike $". # diff --git a/conf/mime.types b/conf/mime.types index a0d33ed08..ed53e7947 100644 --- a/conf/mime.types +++ b/conf/mime.types @@ -1,5 +1,5 @@ # -# "$Id: mime.types 6405 2007-03-27 16:09:02Z mike $" +# "$Id: mime.types 6545 2007-06-04 14:24:01Z mike $" # # MIME types file for the Common UNIX Printing System (CUPS). # @@ -78,20 +78,20 @@ application/pdf pdf string(0,%PDF) application/postscript ai eps ps string(0,%!) string(0,<04>%!) \ contains(0,128,<1B>%-12345X) + \ - (contains(0,1024,"LANGUAGE=POSTSCRIPT") \ - contains(0,1024,"LANGUAGE = Postscript") \ - contains(0,1024,"LANGUAGE = PostScript") \ - contains(0,1024,"LANGUAGE = POSTSCRIPT") \ - (contains(0,1024,<0a>%!) + \ - !contains(0,1024,"ENTER LANGUAGE"))) + (contains(0,4096,"LANGUAGE=POSTSCRIPT") \ + contains(0,4096,"LANGUAGE = Postscript") \ + contains(0,4096,"LANGUAGE = PostScript") \ + contains(0,4096,"LANGUAGE = POSTSCRIPT") \ + (contains(0,4096,<0a>%!) + \ + !contains(0,4096,"ENTER LANGUAGE"))) application/vnd.hp-HPGL hpgl string(0,<1B>&)\ string(0,<1B>E<1B>%0B) \ string(0,<1B>%-1B) string(0,<201B>)\ string(0,BP;) string(0,IN;) string(0,DF;) \ string(0,BPINPS;) \ (contains(0,128,<1B>%-12345X) + \ - (contains(0,1024,"LANGUAGE=HPGL") \ - contains(0,1024,"LANGUAGE = HPGL"))) + (contains(0,4096,"LANGUAGE=HPGL") \ + contains(0,4096,"LANGUAGE = HPGL"))) ######################################################################## # @@ -180,5 +180,5 @@ application/vnd.cups-raw (string(0,<1B>E) + !string(2,<1B>%0B)) \ application/octet-stream # -# End of "$Id: mime.types 6405 2007-03-27 16:09:02Z mike $". +# End of "$Id: mime.types 6545 2007-06-04 14:24:01Z mike $". # |