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

[eric.carlson at apple.com]

The following commit has been merged in the debian/experimental branch:
commit f8b915fbaa00c08f8bfac837f8b14f79b958a2e5
Author: eric.carlson at apple.com <eric.carlson at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Aug 28 00:16:31 2010 +0000

    2010-08-27  Eric Carlson  <eric.carlson at apple.com>
    
            Unreviewed, build fix.
    
            Copy video files back into http/tests/media/resources/ since some tests apparently
            can't load from test/resources/. Sigh.
    
            * http/tests/media/resources/test.mp4: Copied from LayoutTests/http/tests/resources/test.mp4.
            * http/tests/media/resources/test.ogv: Copied from LayoutTests/http/tests/resources/test.ogv.
            * http/tests/media/video-cookie.html:
            * http/tests/media/video-referer.html:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66283 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 1473abb..2dd9d12 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2010-08-27  Eric Carlson  <eric.carlson at apple.com>
+
+        Unreviewed, build fix.
+
+        Copy video files back into http/tests/media/resources/ since some tests apparently 
+        can't load from test/resources/. Sigh.
+
+        * http/tests/media/resources/test.mp4: Copied from LayoutTests/http/tests/resources/test.mp4.
+        * http/tests/media/resources/test.ogv: Copied from LayoutTests/http/tests/resources/test.ogv.
+        * http/tests/media/video-cookie.html:
+        * http/tests/media/video-referer.html:
+
 2010-08-26  Joseph Pecoraro  <joepeck at webkit.org>
 
         Reviewed by Pavel Feldman.
diff --git a/LayoutTests/http/tests/media/video-cookie.html b/LayoutTests/http/tests/media/video-cookie.html
index a804165..8d5408d 100644
--- a/LayoutTests/http/tests/media/video-cookie.html
+++ b/LayoutTests/http/tests/media/video-cookie.html
@@ -13,7 +13,7 @@
     }
 
     function loadCookie () {
-        var movie = findMediaFile("video", "../resources/test");
+        var movie = findMediaFile("video", "resources/test");
         var frame = document.createElement("iframe");
         document.body.appendChild(frame);
 
diff --git a/LayoutTests/http/tests/media/video-referer.html b/LayoutTests/http/tests/media/video-referer.html
index b3adf88..a4de911 100644
--- a/LayoutTests/http/tests/media/video-referer.html
+++ b/LayoutTests/http/tests/media/video-referer.html
@@ -13,7 +13,7 @@
     }
 
     function loadCookieAndReferer () {
-        var movie = findMediaFile("video", "../resources/test");
+        var movie = findMediaFile("video", "resources/test");
         var frame = document.createElement("iframe");
         document.body.appendChild(frame);
 

-- 
WebKit Debian packaging