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

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 4411a666b61f69e45d77e2015cd5052b36bc6a74
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jul 27 02:10:17 2010 +0000

    2010-07-26  Rafael Antognolli  <antognolli at profusion.mobi>
    
            Reviewed by Antonio Gomes.
    
            [EFL] Move CMakeListsEfl.txt to WebKit/efl/
            https://bugs.webkit.org/show_bug.cgi?id=43002
    
            This should reduce the noise in WebKit/ChangeLog that comes from EFL
            port. Most of the changes on EFL port should be logged in
            WebKit/efl/ChangeLog.
    
            * CMakeLists.txt: Just change the path from where to include the file.
    2010-07-26  Rafael Antognolli  <antognolli at profusion.mobi>
    
            Reviewed by Antonio Gomes.
    
            [EFL] Move CMakeListsEfl.txt to WebKit/efl/
            https://bugs.webkit.org/show_bug.cgi?id=43002
    
            This should reduce the noise in WebKit/ChangeLog that comes from EFL
            port. Most of the changes on EFL port should be logged in
            WebKit/efl/ChangeLog.
    
            * CMakeListsEfl.txt: Renamed from WebKit/CMakeListsEfl.txt.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64097 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/CMakeLists.txt b/WebKit/CMakeLists.txt
index ef850de..3ed3e9c 100644
--- a/WebKit/CMakeLists.txt
+++ b/WebKit/CMakeLists.txt
@@ -59,7 +59,8 @@ SET(WebKit_LIBRARIES
     ${WebCore_LIBRARY_NAME}
 )
 
-INCLUDE_IF_EXISTS(${WEBKIT_DIR}/CMakeLists${PORT}.txt)
+STRING(TOLOWER ${PORT} WEBKIT_PORT_DIR)
+INCLUDE_IF_EXISTS(${WEBKIT_DIR}/${WEBKIT_PORT_DIR}/CMakeLists${PORT}.txt)
 
 ADD_DEFINITIONS(-DBUILDING_WebKit)
 INCLUDE_DIRECTORIES(${WebKit_INCLUDE_DIRECTORIES})
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index ba7e36a..76b6fb4 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,16 @@
+2010-07-26  Rafael Antognolli  <antognolli at profusion.mobi>
+
+        Reviewed by Antonio Gomes.
+
+        [EFL] Move CMakeListsEfl.txt to WebKit/efl/
+        https://bugs.webkit.org/show_bug.cgi?id=43002
+
+        This should reduce the noise in WebKit/ChangeLog that comes from EFL
+        port. Most of the changes on EFL port should be logged in
+        WebKit/efl/ChangeLog.
+
+        * CMakeLists.txt: Just change the path from where to include the file.
+
 2010-07-23  Rafael Antognolli  <antognolli at profusion.mobi>
 
         Reviewed by Antonio Gomes.
diff --git a/WebKit/CMakeListsEfl.txt b/WebKit/efl/CMakeListsEfl.txt
similarity index 100%
rename from WebKit/CMakeListsEfl.txt
rename to WebKit/efl/CMakeListsEfl.txt
diff --git a/WebKit/efl/ChangeLog b/WebKit/efl/ChangeLog
index fc940d8..7534bfd 100644
--- a/WebKit/efl/ChangeLog
+++ b/WebKit/efl/ChangeLog
@@ -1,3 +1,16 @@
+2010-07-26  Rafael Antognolli  <antognolli at profusion.mobi>
+
+        Reviewed by Antonio Gomes.
+
+        [EFL] Move CMakeListsEfl.txt to WebKit/efl/
+        https://bugs.webkit.org/show_bug.cgi?id=43002
+
+        This should reduce the noise in WebKit/ChangeLog that comes from EFL
+        port. Most of the changes on EFL port should be logged in
+        WebKit/efl/ChangeLog.
+
+        * CMakeListsEfl.txt: Renamed from WebKit/CMakeListsEfl.txt.
+
 2010-07-23  Rafael Antognolli  <antognolli at profusion.mobi>
 
         Reviewed by Antonio Gomes.

-- 
WebKit Debian packaging