[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[mrowe at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit 25f625ee1364f1478203286d113488b88f7382aa
Author: mrowe at apple.com <mrowe at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 12 21:32:08 2009 +0000

    Land updated results for file-url-mimetypes-2.html and file-url-mimetypes-3.html.
    
    Rubber-stamped by Brady Eidson.
    
    * platform/mac-snowleopard/platform/mac/fast/loader/file-url-mimetypes-2-expected.txt: Copied from LayoutTests/platform/mac/fast/loader/file-url-mimetypes-2-expected.txt.
    * platform/mac-snowleopard/platform/mac/fast/loader/file-url-mimetypes-3-expected.txt: Copied from LayoutTests/platform/mac/fast/loader/file-url-mimetypes-3-expected.txt.
    * platform/mac/fast/loader/file-url-mimetypes-2-expected.txt:
    * platform/mac/fast/loader/file-url-mimetypes-3-expected.txt:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50899 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 9ac22a1..273be45 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2009-11-12  Mark Rowe  <mrowe at apple.com>
+
+        Rubber-stamped by Brady Eidson.
+
+        Land updated results for file-url-mimetypes-2.html and file-url-mimetypes-3.html.
+
+        * platform/mac-snowleopard/platform/mac/fast/loader/file-url-mimetypes-2-expected.txt: Copied from LayoutTests/platform/mac/fast/loader/file-url-mimetypes-2-expected.txt.
+        * platform/mac-snowleopard/platform/mac/fast/loader/file-url-mimetypes-3-expected.txt: Copied from LayoutTests/platform/mac/fast/loader/file-url-mimetypes-3-expected.txt.
+        * platform/mac/fast/loader/file-url-mimetypes-2-expected.txt:
+        * platform/mac/fast/loader/file-url-mimetypes-3-expected.txt:
+
 2009-11-12  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
 
         Unreviewed. Skipped new tests, a test that keeps failing despite
diff --git a/LayoutTests/platform/mac/fast/loader/file-url-mimetypes-2-expected.txt b/LayoutTests/platform/mac-snowleopard/platform/mac/fast/loader/file-url-mimetypes-2-expected.txt
similarity index 100%
copy from LayoutTests/platform/mac/fast/loader/file-url-mimetypes-2-expected.txt
copy to LayoutTests/platform/mac-snowleopard/platform/mac/fast/loader/file-url-mimetypes-2-expected.txt
diff --git a/LayoutTests/platform/mac/fast/loader/file-url-mimetypes-3-expected.txt b/LayoutTests/platform/mac-snowleopard/platform/mac/fast/loader/file-url-mimetypes-3-expected.txt
similarity index 100%
copy from LayoutTests/platform/mac/fast/loader/file-url-mimetypes-3-expected.txt
copy to LayoutTests/platform/mac-snowleopard/platform/mac/fast/loader/file-url-mimetypes-3-expected.txt
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 00a2da4..5f2c47e 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
@@ -57,7 +57,7 @@ example-odt.odt has MIME type application/vnd.oasis.opendocument.text
 example-omf.omf has MIME type application/octet-stream
 example-orf.orf has MIME type application/octet-stream
 example-otc.otc has MIME type application/vnd.oasis.opendocument.chart-template
-example-otf.otf has MIME type application/octet-stream
+example-otf.otf has MIME type application/vnd.oasis.opendocument.formula-template
 example-otg.otg has MIME type application/vnd.oasis.opendocument.graphics-template
 example-oth.oth has MIME type application/vnd.oasis.opendocument.text-web
 example-oti.oti has MIME type application/vnd.oasis.opendocument.image-template
@@ -84,7 +84,7 @@ example-php.php has MIME type text/php
 example-php3.php3 has MIME type text/php
 example-php4.php4 has MIME type text/php
 example-phtml.phtml has MIME type text/php
-example-pic.pic has MIME type application/octet-stream
+example-pic.pic has MIME type image/pict
 example-pict.pict has MIME type image/pict
 example-pl.pl has MIME type text/x-perl-script
 example-plist.plist has MIME type application/octet-stream
@@ -105,7 +105,7 @@ example-pptx.pptx has MIME type application/vnd.openxmlformats-officedocument.pr
 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 application/octet-stream
+example-qif.qif has MIME type text/qif
 example-qt.qt has MIME type video/quicktime
 example-qti.qti has MIME type image/x-quicktime
 example-qtif.qtif has MIME type image/x-quicktime
diff --git a/LayoutTests/platform/mac/fast/loader/file-url-mimetypes-3-expected.txt b/LayoutTests/platform/mac/fast/loader/file-url-mimetypes-3-expected.txt
index 0dae84c..bea1167 100644
--- a/LayoutTests/platform/mac/fast/loader/file-url-mimetypes-3-expected.txt
+++ b/LayoutTests/platform/mac/fast/loader/file-url-mimetypes-3-expected.txt
@@ -17,7 +17,7 @@ example-skm.skm has MIME type application/x-koan
 example-skp.skp has MIME type application/x-koan
 example-skt.skt has MIME type application/x-koan
 example-smf.smf has MIME type audio/midi
-example-smi.smi has MIME type application/x-diskcopy
+example-smi.smi has MIME type application/smil
 example-smil.smil has MIME type application/smil
 example-snd.snd has MIME type audio/basic
 example-so.so has MIME type application/octet-stream

-- 
WebKit Debian packaging