[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[aroben at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 5900eb6b84d2c9f16a0f5b108af482f9bd6abbb9
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 10 17:04:50 2011 +0000

    Use the same name and description for TestNetscapePlugin on Windows and Mac
    
    Fixes <http://webkit.org/b/52151>
    fast/frames/iframe-reparenting-plugins.html fails on Windows
    
    Reviewed by Steve Falkenburg.
    
    * DumpRenderTree/TestNetscapePlugIn/win/TestNetscapePlugin.rc: Copied
    the name and description from Mac's Info.plist.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75379 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index b295783..6a7fb34 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,16 @@
+2011-01-10  Adam Roben  <aroben at apple.com>
+
+        Use the same name and description for TestNetscapePlugin on Windows and
+        Mac
+
+        Fixes <http://webkit.org/b/52151>
+        fast/frames/iframe-reparenting-plugins.html fails on Windows
+
+        Reviewed by Steve Falkenburg.
+
+        * DumpRenderTree/TestNetscapePlugIn/win/TestNetscapePlugin.rc: Copied
+        the name and description from Mac's Info.plist.
+
 2011-01-10  Siddharth Mathur <siddharth.mathur at nokia.com>
 
         Reviewed by Laszlo Gombos.
diff --git a/Tools/DumpRenderTree/TestNetscapePlugIn/win/TestNetscapePlugin.rc b/Tools/DumpRenderTree/TestNetscapePlugIn/win/TestNetscapePlugin.rc
index a8fbbcd..78754b9 100644
--- a/Tools/DumpRenderTree/TestNetscapePlugIn/win/TestNetscapePlugin.rc
+++ b/Tools/DumpRenderTree/TestNetscapePlugIn/win/TestNetscapePlugin.rc
@@ -70,12 +70,12 @@ BEGIN
         BLOCK "040904e4"
         BEGIN
             VALUE "CompanyName", "Apple Inc."
-            VALUE "FileDescription", "TestNetscapePlugIn"
+            VALUE "FileDescription", "Simple Netscape plug-in that handles test content for WebKit"
             VALUE "FileOpenName", "test netscape content"
             VALUE "LegalCopyright", "Copyright Apple Inc. 2007-2009"
             VALUE "MIMEType", "application/x-webkit-test-netscape"
             VALUE "OriginalFilename", "npTestNetscapePlugin.dll"
-            VALUE "ProductName", "TestNetscapePlugIn"
+            VALUE "ProductName", "WebKit Test PlugIn"
         END
     END
     BLOCK "VarFileInfo"

-- 
WebKit Debian packaging