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

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit c445f4dad38f16f2bdef7da873c4d3ab371fe1ca
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 20 09:08:26 2010 +0000

    2010-12-20  Ryuan Choi  <ryuan.choi at samsung.com>
    
            Reviewed by Antonio Gomes.
    
            [CMAKE] Rename WEBKITTOOLS_DIR to TOOLS_DIR
            https://bugs.webkit.org/show_bug.cgi?id=51319
    
            Change WEBKITTOOLS_DIR variable's name and value to TOOLS_DIR and tools/.
    
            * CMakeLists.txt:
    2010-12-20  Ryuan Choi  <ryuan.choi at samsung.com>
    
            Reviewed by Antonio Gomes.
    
            [CMAKE] Rename WEBKITTOOLS_DIR to TOOLS_DIR
            https://bugs.webkit.org/show_bug.cgi?id=51319
    
            * CMakeListsEfl.txt:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74334 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ca8dcf9..897120c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,7 +12,7 @@ SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
 SET(JAVASCRIPTCORE_DIR "${CMAKE_SOURCE_DIR}/JavaScriptCore")
 SET(WEBCORE_DIR "${CMAKE_SOURCE_DIR}/WebCore")
 SET(WEBKIT_DIR "${CMAKE_SOURCE_DIR}/WebKit")
-SET(WEBKITTOOLS_DIR "${CMAKE_SOURCE_DIR}/WebKitTools")
+SET(TOOLS_DIR "${CMAKE_SOURCE_DIR}/Tools")
 SET(DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources")
 
 INCLUDE(WebKitMacros)
@@ -111,7 +111,7 @@ ADD_SUBDIRECTORY(WebKit)
 # -----------------------------------------------------------------------------
 # Add test browser if exists
 # -----------------------------------------------------------------------------
-INCLUDE_IF_EXISTS(${WEBKITTOOLS_DIR}/CMakeLists${PORT}.txt)
+INCLUDE_IF_EXISTS(${TOOLS_DIR}/CMakeLists${PORT}.txt)
 
 # -----------------------------------------------------------------------------
 # Set compiler flags for all targets
diff --git a/ChangeLog b/ChangeLog
index 841b85d..1593475 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-12-20  Ryuan Choi  <ryuan.choi at samsung.com>
+
+        Reviewed by Antonio Gomes.
+
+        [CMAKE] Rename WEBKITTOOLS_DIR to TOOLS_DIR
+        https://bugs.webkit.org/show_bug.cgi?id=51319
+
+        Change WEBKITTOOLS_DIR variable's name and value to TOOLS_DIR and tools/.
+
+        * CMakeLists.txt:
+
 2010-12-18  Adam Barth  <abarth at webkit.org>
 
         Reviewed by Sam Weinig.
diff --git a/Tools/CMakeListsEfl.txt b/Tools/CMakeListsEfl.txt
index 732b4b3..24ef85c 100644
--- a/Tools/CMakeListsEfl.txt
+++ b/Tools/CMakeListsEfl.txt
@@ -1,5 +1,5 @@
 SET(EWebLauncher_SOURCES
-    ${WEBKITTOOLS_DIR}/EWebLauncher/main.c
+    ${TOOLS_DIR}/EWebLauncher/main.c
 )
 
 SET(EWebLauncher_LIBRARIES
diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 8e8947a..635bcd5 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,12 @@
+2010-12-20  Ryuan Choi  <ryuan.choi at samsung.com>
+
+        Reviewed by Antonio Gomes.
+
+        [CMAKE] Rename WEBKITTOOLS_DIR to TOOLS_DIR
+        https://bugs.webkit.org/show_bug.cgi?id=51319
+
+        * CMakeListsEfl.txt:
+
 2010-12-18  Adam Barth  <abarth at webkit.org>
 
         Reviewed by Sam Weinig.

-- 
WebKit Debian packaging