Merge changes from CUPS 1.6svn-r9939.

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

diff --git a/conf/mime.convs.in b/conf/mime.convs.in
index 83e7301ec28d4060c2bb60d75875add86b224429..533fd955ab8eff1df8842838c257bf52e3435289 100644 (file)
--- a/conf/mime.convs.in
+++ b/conf/mime.convs.in
@@ -38,51 +38,13 @@
 # PostScript filters
 #
 
-@DEFAULT_PDFTOPS@application/pdf                       application/vnd.cups-postscript 66      pdftops
 application/postscript         application/vnd.cups-postscript 66      pstops
-@DEFAULT_TEXTTOPS@application/x-cshell         application/postscript          33      texttops
-@DEFAULT_TEXTTOPS@application/x-csource                application/postscript          33      texttops
-@DEFAULT_TEXTTOPS@application/x-perl           application/postscript          33      texttops
-@DEFAULT_TEXTTOPS@application/x-shell          application/postscript          33      texttops
-@DEFAULT_TEXTTOPS@text/plain                   application/postscript          33      texttops
-@DEFAULT_TEXTTOPS@text/css                     application/postscript          33      texttops
-@DEFAULT_TEXTTOPS@text/html                    application/postscript          33      texttops
-@DEFAULT_IMAGEFILTERS@image/gif                        application/vnd.cups-postscript 66      imagetops
-@DEFAULT_IMAGEFILTERS@image/png                        application/vnd.cups-postscript 66      imagetops
-@DEFAULT_IMAGEFILTERS@image/jpeg                       application/vnd.cups-postscript 66      imagetops
-@DEFAULT_IMAGEFILTERS@image/tiff                       application/vnd.cups-postscript 66      imagetops
-@DEFAULT_IMAGEFILTERS@image/x-bitmap                   application/vnd.cups-postscript 66      imagetops
-@DEFAULT_IMAGEFILTERS@image/x-photocd                  application/vnd.cups-postscript 66      imagetops
-@DEFAULT_IMAGEFILTERS@image/x-portable-anymap          application/vnd.cups-postscript 66      imagetops
-@DEFAULT_IMAGEFILTERS@image/x-portable-bitmap          application/vnd.cups-postscript 66      imagetops
-@DEFAULT_IMAGEFILTERS@image/x-portable-graymap application/vnd.cups-postscript 66      imagetops
-@DEFAULT_IMAGEFILTERS@image/x-portable-pixmap          application/vnd.cups-postscript 66      imagetops
-@DEFAULT_IMAGEFILTERS@image/x-sgi-rgb                  application/vnd.cups-postscript 66      imagetops
-@DEFAULT_IMAGEFILTERS@image/x-xbitmap                  application/vnd.cups-postscript 66      imagetops
-@DEFAULT_IMAGEFILTERS@image/x-xpixmap                  application/vnd.cups-postscript 66      imagetops
-@DEFAULT_IMAGEFILTERS@image/x-sun-raster               application/vnd.cups-postscript 66      imagetops
-@DEFAULT_BANNERTOPS@application/vnd.cups-banner        application/postscript          33      bannertops
 
 ########################################################################
 #
 # Raster filters...
 #
 
-@DEFAULT_IMAGEFILTERS@image/gif                        application/vnd.cups-raster     100     imagetoraster
-@DEFAULT_IMAGEFILTERS@image/png                        application/vnd.cups-raster     100     imagetoraster
-@DEFAULT_IMAGEFILTERS@image/jpeg                       application/vnd.cups-raster     100     imagetoraster
-@DEFAULT_IMAGEFILTERS@image/tiff                       application/vnd.cups-raster     100     imagetoraster
-@DEFAULT_IMAGEFILTERS@image/x-bitmap                   application/vnd.cups-raster     100     imagetoraster
-@DEFAULT_IMAGEFILTERS@image/x-photocd                  application/vnd.cups-raster     100     imagetoraster
-@DEFAULT_IMAGEFILTERS@image/x-portable-anymap          application/vnd.cups-raster     100     imagetoraster
-@DEFAULT_IMAGEFILTERS@image/x-portable-bitmap          application/vnd.cups-raster     100     imagetoraster
-@DEFAULT_IMAGEFILTERS@image/x-portable-graymap application/vnd.cups-raster     100     imagetoraster
-@DEFAULT_IMAGEFILTERS@image/x-portable-pixmap          application/vnd.cups-raster     100     imagetoraster
-@DEFAULT_IMAGEFILTERS@image/x-sgi-rgb                  application/vnd.cups-raster     100     imagetoraster
-@DEFAULT_IMAGEFILTERS@image/x-xbitmap                  application/vnd.cups-raster     100     imagetoraster
-@DEFAULT_IMAGEFILTERS@image/x-xpixmap                  application/vnd.cups-raster     100     imagetoraster
-@DEFAULT_IMAGEFILTERS@image/x-sun-raster               application/vnd.cups-raster     100     imagetoraster
-
 # PWG Raster filter for IPP Everywhere...
 application/vnd.cups-raster    image/pwg-raster                100     rastertopwg