From 8fa5f1c6f768cbab4610315d1c91246091b46c20 Mon Sep 17 00:00:00 2001 From: mike Date: Mon, 12 May 2003 17:38:58 +0000 Subject: [PATCH] Mirror 1.1.x changes. git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/branches/branch-1.2@3710 7a7537e8-13f0-0310-91df-b6672ffda945 --- CHANGES-1.1.txt | 2 ++ conf/mime.convs | 10 ++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGES-1.1.txt b/CHANGES-1.1.txt index 7db7da4af0..49808c5a57 100644 --- a/CHANGES-1.1.txt +++ b/CHANGES-1.1.txt @@ -3,6 +3,8 @@ CHANGES-1.1.txt CHANGES IN CUPS V1.1.19rc5 + - The mime.convs file was missing the filter definition + for Windows BMP (image/x-bitmap) files (STR #85) - The scheduler allowed some READ-ONLY job attributes to be set, which could cause the scheduler to fail on the next restart (STR #82) diff --git a/conf/mime.convs b/conf/mime.convs index 4b6870784b..a24d36a9c1 100644 --- a/conf/mime.convs +++ b/conf/mime.convs @@ -1,5 +1,5 @@ # -# "$Id: mime.convs,v 1.12.2.4 2003/01/07 18:26:21 mike Exp $" +# "$Id: mime.convs,v 1.12.2.5 2003/05/12 17:38:58 mike Exp $" # # MIME converts file for the Common UNIX Printing System (CUPS). # @@ -55,6 +55,7 @@ image/gif application/vnd.cups-postscript 66 imagetops image/png application/vnd.cups-postscript 66 imagetops image/jpeg application/vnd.cups-postscript 66 imagetops image/tiff application/vnd.cups-postscript 66 imagetops +image/x-bitmap application/vnd.cups-postscript 66 imagetops image/x-photocd application/vnd.cups-postscript 66 imagetops image/x-portable-anymap application/vnd.cups-postscript 66 imagetops image/x-portable-bitmap application/vnd.cups-postscript 66 imagetops @@ -63,7 +64,7 @@ image/x-portable-pixmap application/vnd.cups-postscript 66 imagetops image/x-sgi-rgb application/vnd.cups-postscript 66 imagetops 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-xwindowdump application/vnd.cups-postscript 66 imagetops image/x-sun-raster application/vnd.cups-postscript 66 imagetops @@ -86,6 +87,7 @@ image/gif application/vnd.cups-raster 100 imagetoraster image/png application/vnd.cups-raster 100 imagetoraster image/jpeg application/vnd.cups-raster 100 imagetoraster image/tiff application/vnd.cups-raster 100 imagetoraster +image/x-bitmap application/vnd.cups-raster 100 imagetoraster image/x-photocd application/vnd.cups-raster 100 imagetoraster image/x-portable-anymap application/vnd.cups-raster 100 imagetoraster image/x-portable-bitmap application/vnd.cups-raster 100 imagetoraster @@ -94,7 +96,7 @@ image/x-portable-pixmap application/vnd.cups-raster 100 imagetoraster image/x-sgi-rgb application/vnd.cups-raster 100 imagetoraster image/x-xbitmap application/vnd.cups-raster 100 imagetoraster image/x-xpixmap application/vnd.cups-raster 100 imagetoraster -image/x-xwindowdump application/vnd.cups-raster 100 imagetoraster +#image/x-xwindowdump application/vnd.cups-raster 100 imagetoraster image/x-sun-raster application/vnd.cups-raster 100 imagetoraster # pstoraster is now part of ESP Ghostscript... @@ -112,5 +114,5 @@ image/x-sun-raster application/vnd.cups-raster 100 imagetoraster #application/octet-stream application/vnd.cups-raw 0 - # -# End of "$Id: mime.convs,v 1.12.2.4 2003/01/07 18:26:21 mike Exp $". +# End of "$Id: mime.convs,v 1.12.2.5 2003/05/12 17:38:58 mike Exp $". # -- 2.47.2