Merge changes from CUPS 1.5svn-r9000.

[thirdparty/cups.git] / conf / mime.convs.in

diff --git a/conf/mime.convs.in b/conf/mime.convs.in
index 36c7b9c7e0c6ce7fde417ccc69421e6053124c5a..9e6796ad4888a5564469a13fcf75040f6491fa83 100644 (file)
--- 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-2008 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
@@ -38,14 +38,14 @@
 # PostScript filters
 #
 
-application/pdf                        application/postscript          33      pdftops
+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
 application/x-shell            application/postscript          33      texttops
 text/plain                     application/postscript          33      texttops
+text/css                       application/postscript          33      texttops
 text/html                      application/postscript          33      texttops
 image/gif                      application/vnd.cups-postscript 66      imagetops
 image/png                      application/vnd.cups-postscript 66      imagetops
@@ -62,7 +62,7 @@ image/x-xbitmap                       application/vnd.cups-postscript 66      imagetops
 image/x-xpixmap                        application/vnd.cups-postscript 66      imagetops
 #image/x-xwindowdump           application/vnd.cups-postscript 66      imagetops
 image/x-sun-raster             application/vnd.cups-postscript 66      imagetops
-application/vnd.cups-banner    application/vnd.cups-postscript 33      bannertops
+application/vnd.cups-banner    application/postscript          33      bannertops
 
 ########################################################################
 #