[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 78c8e9753c11a0b4cbd2eaad6777cb348c980910
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 19 22:28:41 2009 +0000

    2009-10-19  Marshall Culpepper  <mculpepper at appcelerator.com>
    
            Reviewed by Eric Seidel.
    
            added cairo include and lib directories to debug_wincairo.vsprops
            https://bugs.webkit.org/show_bug.cgi?id=29831
    
            * win/tools/vsprops/debug_wincairo.vsprops:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49817 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog
index cf573c6..0d87e29 100644
--- a/WebKitLibraries/ChangeLog
+++ b/WebKitLibraries/ChangeLog
@@ -1,3 +1,12 @@
+2009-10-19  Marshall Culpepper  <mculpepper at appcelerator.com>
+
+        Reviewed by Eric Seidel.
+
+        added cairo include and lib directories to debug_wincairo.vsprops
+        https://bugs.webkit.org/show_bug.cgi?id=29831
+
+        * win/tools/vsprops/debug_wincairo.vsprops:
+
 2009-10-16  Steve Falkenburg  <sfalken at apple.com>
 
         Reviewed by Dan Bernstein.
diff --git a/WebKitLibraries/win/tools/vsprops/debug_wincairo.vsprops b/WebKitLibraries/win/tools/vsprops/debug_wincairo.vsprops
index 0e7db13..7d424e6 100644
--- a/WebKitLibraries/win/tools/vsprops/debug_wincairo.vsprops
+++ b/WebKitLibraries/win/tools/vsprops/debug_wincairo.vsprops
@@ -10,10 +10,12 @@
 		MinimalRebuild="true"
 		BasicRuntimeChecks="3"
 		RuntimeLibrary="2"
+		AdditionalIncludeDirectories="&quot;$(WebKitLibrariesDir)\include\cairo&quot;"
 	/>
 	<Tool
 		Name="VCLinkerTool"
 		LinkIncremental="2"
+		AdditionalLibraryDirectories="&quot;$(WebKitLibrariesDir)\lib&quot;"
 	/>
 	<UserMacro
 		Name="WebKitConfigSuffix"

-- 
WebKit Debian packaging