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

[aroben at apple.com]

The following commit has been merged in the debian/experimental branch:
commit bd2ea49946eb05717d01c8a510664831ea01ab97
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 13 14:34:36 2010 +0000

    Fix a couple of issues with the TestWebKitAPI build
    
    * TestWebKitAPI/Configurations/TestWebKitAPICFLite.vsprops:
    * TestWebKitAPI/Configurations/TestWebKitAPICoreFoundation.vsprops:
    Fixed a typo.
    
    * TestWebKitAPI/win/TestWebKitAPIGenerated.vcproj: Use common.vsprops
    to set our output and intermediate directories so that we don't spew
    files into the source tree.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69659 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 90cbb27..d109bfd 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,15 @@
+2010-10-13  Adam Roben  <aroben at apple.com>
+
+        Fix a couple of issues with the TestWebKitAPI build
+
+        * TestWebKitAPI/Configurations/TestWebKitAPICFLite.vsprops:
+        * TestWebKitAPI/Configurations/TestWebKitAPICoreFoundation.vsprops:
+        Fixed a typo.
+
+        * TestWebKitAPI/win/TestWebKitAPIGenerated.vcproj: Use common.vsprops
+        to set our output and intermediate directories so that we don't spew
+        files into the source tree.
+
 2010-10-13  Balazs Kelemen  <kbalazs at webkit.org>
 
         Reviewed by Csaba Osztrogonác.
diff --git a/WebKitTools/TestWebKitAPI/Configurations/TestWebKitAPICFLite.vsprops b/WebKitTools/TestWebKitAPI/Configurations/TestWebKitAPICFLite.vsprops
index 2fefddc..61b6614 100644
--- a/WebKitTools/TestWebKitAPI/Configurations/TestWebKitAPICFLite.vsprops
+++ b/WebKitTools/TestWebKitAPI/Configurations/TestWebKitAPICFLite.vsprops
@@ -6,6 +6,6 @@
 	>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CFLite$(LibrariesConfigSuffix).lib"
+		AdditionalDependencies="CFLite$(LibraryConfigSuffix).lib"
 	/>
 </VisualStudioPropertySheet>
diff --git a/WebKitTools/TestWebKitAPI/Configurations/TestWebKitAPICoreFoundation.vsprops b/WebKitTools/TestWebKitAPI/Configurations/TestWebKitAPICoreFoundation.vsprops
index 4a9e507..ee139c0 100644
--- a/WebKitTools/TestWebKitAPI/Configurations/TestWebKitAPICoreFoundation.vsprops
+++ b/WebKitTools/TestWebKitAPI/Configurations/TestWebKitAPICoreFoundation.vsprops
@@ -6,6 +6,6 @@
 	>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalDependencies="CoreFoundation$(LibrariesConfigSuffix).lib"
+		AdditionalDependencies="CoreFoundation$(LibraryConfigSuffix).lib"
 	/>
 </VisualStudioPropertySheet>
diff --git a/WebKitTools/TestWebKitAPI/win/TestWebKitAPIGenerated.vcproj b/WebKitTools/TestWebKitAPI/win/TestWebKitAPIGenerated.vcproj
index 97556d8..ce5afeb 100644
--- a/WebKitTools/TestWebKitAPI/win/TestWebKitAPIGenerated.vcproj
+++ b/WebKitTools/TestWebKitAPI/win/TestWebKitAPIGenerated.vcproj
@@ -16,9 +16,8 @@
 	<Configurations>
 		<Configuration
 			Name="all|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="0"
+			InheritedPropertySheets="$(WebKitLibrariesDir)\tools\vsprops\common.vsprops"
 			>
 			<Tool
 				Name="VCNMakeTool"

-- 
WebKit Debian packaging