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

[andreas.kling at nokia.com]

The following commit has been merged in the debian/experimental branch:
commit 99458a5a5ca2193b4b5b573ca6ae270cea8aae97
Author: andreas.kling at nokia.com <andreas.kling at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 9 16:06:27 2010 +0000

    2010-12-09  Koan-Sin Tan  <koansin.tan at gmail.com>
    
            Reviewed by Tor Arne Vestbø
    
            [Qt] run-launcher doesn't start the browser on Mac OS X 10.6
            https://bugs.webkit.org/show_bug.cgi?id=50742
    
            check not only QtWebKit.framework/QtWebKit but also libQtWebKit.dylib
    
            * Scripts/webkitdirs.pm:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73611 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index afab861..a3aa4c9 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,14 @@
+2010-12-09  Koan-Sin Tan  <koansin.tan at gmail.com>
+
+        Reviewed by Tor Arne Vestbø
+
+        [Qt] run-launcher doesn't start the browser on Mac OS X 10.6
+        https://bugs.webkit.org/show_bug.cgi?id=50742
+
+        check not only QtWebKit.framework/QtWebKit but also libQtWebKit.dylib
+
+        * Scripts/webkitdirs.pm:
+
 2010-12-09  Joone Hur  <joone at kldp.org>
 
          Reviewed by Martin Robinson.
diff --git a/WebKitTools/Scripts/webkitdirs.pm b/WebKitTools/Scripts/webkitdirs.pm
index 73288e0..538271e 100644
--- a/WebKitTools/Scripts/webkitdirs.pm
+++ b/WebKitTools/Scripts/webkitdirs.pm
@@ -570,6 +570,8 @@ sub builtDylibPathForName
         $libraryName = "QtWebKit";
         if (isDarwin() and -d "$configurationProductDir/lib/$libraryName.framework") {
             return "$configurationProductDir/lib/$libraryName.framework/$libraryName";
+        } elsif (isDarwin() and -d "$configurationProductDir/lib") {
+            return "$configurationProductDir/lib/lib$libraryName.dylib";
         } elsif (isWindows()) {
             if (configuration() eq "Debug") {
                 # On Windows, there is a "d" suffix to the library name. See <http://trac.webkit.org/changeset/53924/>.

-- 
WebKit Debian packaging