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

[mrowe at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 8b0d107d3679cee2ba598262905c25a1c819dc75
Author: mrowe at apple.com <mrowe at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 1 00:56:49 2010 +0000

    Build fix.
    
    Reviewed by Sam Weinig.
    
    * Configurations/BaseTarget.xcconfig: Don't run Copy Files and Run Script build phases
    during installhdrs. It's not necessary, and it results in Xcode attempting to copy the
    plug-in shim dylib when it has not yet been built.
    * WebKit2.xcodeproj/project.pbxproj: Stop copying the .xcconfig file in to the application
    wrapper.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72981 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index fd5001b..be8ca62 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,15 @@
+2010-11-30  Mark Rowe  <mrowe at apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Build fix.
+
+        * Configurations/BaseTarget.xcconfig: Don't run Copy Files and Run Script build phases
+        during installhdrs. It's not necessary, and it results in Xcode attempting to copy the
+        plug-in shim dylib when it has not yet been built.
+        * WebKit2.xcodeproj/project.pbxproj: Stop copying the .xcconfig file in to the application
+        wrapper.
+
 2010-11-30  Anders Carlsson  <andersca at apple.com>
 
         Fix build.
diff --git a/WebKit2/Configurations/BaseTarget.xcconfig b/WebKit2/Configurations/BaseTarget.xcconfig
index bc1b230..b7d0798 100644
--- a/WebKit2/Configurations/BaseTarget.xcconfig
+++ b/WebKit2/Configurations/BaseTarget.xcconfig
@@ -28,8 +28,6 @@ FRAMEWORK_SEARCH_PATHS = $(UMBRELLA_FRAMEWORKS_DIR) $(SYSTEM_LIBRARY_DIR)/Framew
 GCC_PREFIX_HEADER = WebKit2Prefix.h;
 GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(FEATURE_DEFINES) FRAMEWORK_NAME=WebKit2
 HEADER_SEARCH_PATHS = $(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders $(WEBCORE_PRIVATE_HEADERS_DIR)/icu $(BUILT_PRODUCTS_DIR)/usr/local/include $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit2 $(HEADER_SEARCH_PATHS);
-INSTALLHDRS_COPY_PHASE = YES;
-INSTALLHDRS_SCRIPT_PHASE = YES;
 
 UMBRELLA_FRAMEWORKS_DIR = $(UMBRELLA_FRAMEWORKS_DIR_$(REAL_PLATFORM_NAME)_$(CONFIGURATION));
 UMBRELLA_FRAMEWORKS_DIR_macosx_Release = $(UMBRELLA_FRAMEWORKS_DIR_engineering);
diff --git a/WebKit2/WebKit2.xcodeproj/project.pbxproj b/WebKit2/WebKit2.xcodeproj/project.pbxproj
index 95ce692..6fcd838 100644
--- a/WebKit2/WebKit2.xcodeproj/project.pbxproj
+++ b/WebKit2/WebKit2.xcodeproj/project.pbxproj
@@ -167,7 +167,6 @@
 		1AB7D72D1288CAAD00CFD08C /* WebDownloadClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AB7D72B1288CAAD00CFD08C /* WebDownloadClient.cpp */; };
 		1AB7D78D1288CD9A00CFD08C /* WKDownload.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AB7D78B1288CD9A00CFD08C /* WKDownload.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		1AB7D78E1288CD9A00CFD08C /* WKDownload.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AB7D78C1288CD9A00CFD08C /* WKDownload.cpp */; };
-		1AC25FBC12A48EDA00BD2671 /* PluginProcessShim.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 1AC25FBB12A48EDA00BD2671 /* PluginProcessShim.xcconfig */; };
 		1AC25FC212A48F6000BD2671 /* PluginProcessShim.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC25F8A12A48E0300BD2671 /* PluginProcessShim.cpp */; };
 		1AC25FDC12A4902700BD2671 /* PluginProcessShim.dylib in Copy Plug-in Process Shim */ = {isa = PBXBuildFile; fileRef = 1AC25FB012A48EA700BD2671 /* PluginProcessShim.dylib */; };
 		1AC41AC71263C88300054E94 /* BinarySemaphore.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AC41AC51263C88300054E94 /* BinarySemaphore.h */; };
@@ -2584,7 +2583,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				8DC2EF530486A6940098B216 /* InfoPlist.strings in Resources */,
-				1AC25FBC12A48EDA00BD2671 /* PluginProcessShim.xcconfig in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

-- 
WebKit Debian packaging