[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00

[dbates at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 645b6644083ebe16a04c9314eda2c74bb620c2b4
Author: dbates at webkit.org <dbates at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Mar 11 04:09:59 2010 +0000

    2010-03-10  Daniel Bates  <dbates at rim.com>
    
            Reviewed by Simon Hausmann.
    
            https://bugs.webkit.org/show_bug.cgi?id=35840
    
            Updates the subroutine builtDylibPathForName() so that it adds the "d" suffix to
            the QtWebKit library name on Windows. This change makes run-launcher work again
            under Windows. Moreover, this change corresponds to the change made in change-
            set 53924 <http://trac.webkit.org/changeset/53924>.
    
            * Scripts/webkitdirs.pm:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55829 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 615947f..5d74fd9 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,16 @@
+2010-03-10  Daniel Bates  <dbates at rim.com>
+
+        Reviewed by Simon Hausmann.
+
+        https://bugs.webkit.org/show_bug.cgi?id=35840
+
+        Updates the subroutine builtDylibPathForName() so that it adds the "d" suffix to
+        the QtWebKit library name on Windows. This change makes run-launcher work again
+        under Windows. Moreover, this change corresponds to the change made in change-
+        set 53924 <http://trac.webkit.org/changeset/53924>.
+
+        * Scripts/webkitdirs.pm:
+
 2010-03-10  Adam Roben  <aroben at apple.com>
 
         Roll out the prepare-ChangeLog part of r55870
diff --git a/WebKitTools/Scripts/webkitdirs.pm b/WebKitTools/Scripts/webkitdirs.pm
index 7985790..3f02f71 100644
--- a/WebKitTools/Scripts/webkitdirs.pm
+++ b/WebKitTools/Scripts/webkitdirs.pm
@@ -541,6 +541,11 @@ sub builtDylibPathForName
         if (isDarwin() and -d "$configurationProductDir/lib/$libraryName.framework") {
             return "$configurationProductDir/lib/$libraryName.framework/$libraryName";
         } elsif (isWindows()) {
+            if (configuration() eq "Debug") {
+                # On Windows, there is a "d" suffix to the library name. See <http://trac.webkit.org/changeset/53924/>.
+                $libraryName .= "d";
+            }
+
             my $mkspec = `qmake -query QMAKE_MKSPECS`;
             $mkspec =~ s/[\n|\r]$//g;
             my $qtMajorVersion = retrieveQMakespecVar("$mkspec/qconfig.pri", "QT_MAJOR_VERSION");

-- 
WebKit Debian packaging