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

[andersca at apple.com]

The following commit has been merged in the debian/experimental branch:
commit a40f83f10fbb973824bd8614db480faadfec6ae9
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 21 18:21:37 2010 +0000

    * Configurations/WebKit2.xcconfig:
    Add a note about keeping the path in MainMac.cpp in sync with the install path.
    
    Reviewed by Mark Rowe.
    
    * mac/MainMac.cpp:
    (main):
    Use the correct framework path.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67968 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index a0b0235..684cc85 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,5 +1,16 @@
 2010-09-21  Anders Carlsson  <andersca at apple.com>
 
+        Reviewed by Mark Rowe.
+
+        * Configurations/WebKit2.xcconfig:
+        Add a note about keeping the path in MainMac.cpp in sync with the install path.
+
+        * mac/MainMac.cpp:
+        (main):
+        Use the correct framework path.
+
+2010-09-21  Anders Carlsson  <andersca at apple.com>
+
         Fix build.
 
         * mac/MainMac.cpp:
diff --git a/WebKit2/Configurations/WebKit2.xcconfig b/WebKit2/Configurations/WebKit2.xcconfig
index 988ead4..e9a7024 100644
--- a/WebKit2/Configurations/WebKit2.xcconfig
+++ b/WebKit2/Configurations/WebKit2.xcconfig
@@ -25,4 +25,6 @@
 
 PRODUCT_NAME = WebKit2;
 INFOPLIST_FILE = Info.plist;
+
+// The framework location specified in mac/MainMac.cpp needs to be kept in sync with the install path.
 INSTALL_PATH = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
diff --git a/WebKit2/mac/MainMac.cpp b/WebKit2/mac/MainMac.cpp
index 9ffdd4f..2f1764b 100644
--- a/WebKit2/mac/MainMac.cpp
+++ b/WebKit2/mac/MainMac.cpp
@@ -38,7 +38,7 @@ int main(int argc, char** argv)
 {
     closeUnusedFileDescriptors();
 
-    static void* frameworkLibrary = dlopen("/System/Library/Frameworks/WebKit2.framework/WebKit2", RTLD_NOW);
+    static void* frameworkLibrary = dlopen("/System/Library/PrivateFrameworks/WebKit2.framework/WebKit2", RTLD_NOW);
     if (!frameworkLibrary) {
         fprintf(stderr, "Unable to load WebKit2.framework: %s\n", dlerror());
         return EXIT_FAILURE;

-- 
WebKit Debian packaging