diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2010-02-25 00:52:27 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2010-02-25 00:52:27 +0000 |
| commit | f8b3a85b79b8eb74c37c839079ecbf8266a6f4ed (patch) | |
| tree | ced1b724e207ab15c0c21c198bb3105639e57ff4 /conf | |
| parent | 41681883895f928191cfa6472b453d9753cc26ec (diff) | |
| download | cups-f8b3a85b79b8eb74c37c839079ecbf8266a6f4ed.tar.gz | |
Merge changes from CUPS 1.5svn-r9000.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1912 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/mime.convs.in | 3 | ||||
| -rw-r--r-- | conf/mime.types | 10 |
2 files changed, 2 insertions, 11 deletions
diff --git a/conf/mime.convs.in b/conf/mime.convs.in index a141b5c09..9e6796ad4 100644 --- a/conf/mime.convs.in +++ b/conf/mime.convs.in @@ -7,7 +7,7 @@ # # MIME converts file for the Common UNIX Printing System (CUPS). # -# Copyright 2007-2009 by Apple Inc. +# Copyright 2007-2010 by Apple Inc. # Copyright 1997-2007 by Easy Software Products. # # These coded instructions, statements, and computer programs are the @@ -40,7 +40,6 @@ application/pdf application/vnd.cups-postscript 66 pdftops application/postscript application/vnd.cups-postscript 66 pstops -application/vnd.hp-HPGL application/postscript 66 hpgltops application/x-cshell application/postscript 33 texttops application/x-csource application/postscript 33 texttops application/x-perl application/postscript 33 texttops diff --git a/conf/mime.types b/conf/mime.types index 8ef1c06a9..dd28daaf6 100644 --- a/conf/mime.types +++ b/conf/mime.types @@ -7,7 +7,7 @@ # VERSIONS OF CUPS. Instead, create a "local.types" file that # reflects your local configuration changes. # -# Copyright 2007-2009 by Apple Inc. +# Copyright 2007-2010 by Apple Inc. # Copyright 1997-2007 by Easy Software Products. # # These coded instructions, statements, and computer programs are the @@ -79,14 +79,6 @@ application/postscript ai eps ps string(0,%!) string(0,<04>%!) \ contains(0,4096,"LANGUAGE = POSTSCRIPT") \ (contains(0,4096,<0a>%!) + \ !contains(0,4096,"ENTER LANGUAGE"))) -application/vnd.hp-HPGL hpgl \ - 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,4096,"LANGUAGE=HPGL") \ - contains(0,4096,"LANGUAGE = HPGL"))) ######################################################################## # |