[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[abarth at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit eb6345888d785a343931e55fe208d4aaf403990a
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Sep 18 23:28:51 2010 +0000

    2010-09-18  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Eric Seidel.
    
            file-url-mimetypes-2.html fails on my Snow Leopard box
            https://bugs.webkit.org/show_bug.cgi?id=46042
    
            This line of this test seems to depend on something besides WebKit.  It
            fails on my Snow Leopard box because it reports text/plain instead of
            postscript.  This is blocking me from running a commit-cluster machine
            on my box.
    
            * platform/mac/fast/loader/file-url-mimetypes-2-expected.txt:
            * platform/mac/fast/loader/file-url-mimetypes-2.html:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67798 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index e10e535..e1e2bca 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,18 @@
+2010-09-18  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        file-url-mimetypes-2.html fails on my Snow Leopard box
+        https://bugs.webkit.org/show_bug.cgi?id=46042
+
+        This line of this test seems to depend on something besides WebKit.  It
+        fails on my Snow Leopard box because it reports text/plain instead of
+        postscript.  This is blocking me from running a commit-cluster machine
+        on my box.
+
+        * platform/mac/fast/loader/file-url-mimetypes-2-expected.txt:
+        * platform/mac/fast/loader/file-url-mimetypes-2.html:
+
 2010-09-18  Mihai Parparita  <mihaip at chromium.org>
 
         Reviewed by Simon Fraser.
diff --git a/LayoutTests/platform/mac/fast/loader/file-url-mimetypes-2-expected.txt b/LayoutTests/platform/mac/fast/loader/file-url-mimetypes-2-expected.txt
index 5f2c47e..168a0eb 100644
--- a/LayoutTests/platform/mac/fast/loader/file-url-mimetypes-2-expected.txt
+++ b/LayoutTests/platform/mac/fast/loader/file-url-mimetypes-2-expected.txt
@@ -102,7 +102,6 @@ example-ppsx.ppsx has MIME type application/vnd.openxmlformats-officedocument.pr
 example-ppt.ppt has MIME type application/vnd.ms-powerpoint
 example-pptm.pptm has MIME type application/vnd.ms-powerpoint.presentation.macroenabled.12
 example-pptx.pptx has MIME type application/vnd.openxmlformats-officedocument.presentationml.presentation
-example-ps.ps has MIME type application/postscript
 example-psd.psd has MIME type image/vnd.adobe.photoshop
 example-py.py has MIME type text/x-python-script
 example-qif.qif has MIME type text/qif
diff --git a/LayoutTests/platform/mac/fast/loader/file-url-mimetypes-2.html b/LayoutTests/platform/mac/fast/loader/file-url-mimetypes-2.html
index 43f4ddb..faa2cb5 100644
--- a/LayoutTests/platform/mac/fast/loader/file-url-mimetypes-2.html
+++ b/LayoutTests/platform/mac/fast/loader/file-url-mimetypes-2.html
@@ -114,7 +114,6 @@ var testURL = new Array("resources/mimeTypeExamples/example-js.js",
                         "resources/mimeTypeExamples/example-ppt.ppt", 
                         "resources/mimeTypeExamples/example-pptm.pptm", 
                         "resources/mimeTypeExamples/example-pptx.pptx", 
-                        "resources/mimeTypeExamples/example-ps.ps", 
                         "resources/mimeTypeExamples/example-psd.psd", 
                         "resources/mimeTypeExamples/example-py.py", 
                         "resources/mimeTypeExamples/example-qif.qif", 

-- 
WebKit Debian packaging