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

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit d01543407e4acfc6b164b8579447ef360a0a6fd1
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 3 14:00:23 2011 +0000

    2011-01-03  Koan-Sin Tan  <koansin.tan at gmail.com>
    
            Reviewed by Xan Lopez.
    
            "Tool/Scripts/run-launcher --gtk" stopped working after 74855
            https://bugs.webkit.org/show_bug.cgi?id=51806
    
            Originally, the $libraryName is 'JavaScriptCore'. When building release
            one, the $libraryDir was 'WebKitBuild/Release/JavaScriptCore/../.libs/'
            which doesn't exist anymore ('WebKitBuild/Release/JavaScriptCore'
            is 'WebKitBuild/Release/Source/JavaScriptCore' now), and
            'WebKitBuild/Release/Source/JavaScriptCore/../../.libs' looks weird,
            so make it 'WebKitBuild/Release/.libs'
    
            * Scripts/webkitdirs.pm:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74889 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index db46588..dc1a195 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,19 @@
+2011-01-03  Koan-Sin Tan  <koansin.tan at gmail.com>
+
+        Reviewed by Xan Lopez.
+
+        "Tool/Scripts/run-launcher --gtk" stopped working after 74855
+        https://bugs.webkit.org/show_bug.cgi?id=51806
+
+        Originally, the $libraryName is 'JavaScriptCore'. When building release 
+        one, the $libraryDir was 'WebKitBuild/Release/JavaScriptCore/../.libs/'
+        which doesn't exist anymore ('WebKitBuild/Release/JavaScriptCore'
+        is 'WebKitBuild/Release/Source/JavaScriptCore' now), and 
+        'WebKitBuild/Release/Source/JavaScriptCore/../../.libs' looks weird,
+        so make it 'WebKitBuild/Release/.libs'
+
+        * Scripts/webkitdirs.pm: 
+
 2011-01-02  Patrick Gansterer  <paroga at webkit.org>
 
         Reviewed by Adam Barth.
diff --git a/Tools/Scripts/webkitdirs.pm b/Tools/Scripts/webkitdirs.pm
index 3458f70..88d12fb 100644
--- a/Tools/Scripts/webkitdirs.pm
+++ b/Tools/Scripts/webkitdirs.pm
@@ -600,7 +600,7 @@ sub builtDylibPathForName
         return "$configurationProductDir/libwxwebkit.dylib";
     }
     if (isGtk()) {
-        my $libraryDir = "$configurationProductDir/$libraryName/../.libs/";
+        my $libraryDir = "$configurationProductDir/.libs/";
         if (-e $libraryDir . "libwebkitgtk-3.0.so") {
             return $libraryDir . "libwebkitgtk-3.0.so";
         }

-- 
WebKit Debian packaging