[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 e19fe9b4aa4ffa1101ddb11e12a07a7eaf1cb3b9
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Sep 3 06:20:11 2010 +0000

    2010-09-02  Lucas De Marchi  <lucas.demarchi at profusion.mobi>
    
            Reviewed by Antonio Gomes.
    
            [EFL] Name install directories according to library name
            https://bugs.webkit.org/show_bug.cgi?id=45126
    
            * cmake/OptionsEfl.cmake: Use library name in order to define the data
            directory.
    2010-09-02  Lucas De Marchi  <lucas.demarchi at profusion.mobi>
    
            Reviewed by Antonio Gomes.
    
            [EFL] Name install directories according to library name
            https://bugs.webkit.org/show_bug.cgi?id=45126
    
            * CMakeListsEfl.txt: include diretory follows library name.
            * ewebkit.pc.in: Ditto.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66716 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 8eca143..1140ad1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,16 @@
 
         Reviewed by Antonio Gomes.
 
+        [EFL] Name install directories according to library name
+        https://bugs.webkit.org/show_bug.cgi?id=45126
+
+        * cmake/OptionsEfl.cmake: Use library name in order to define the data
+        directory.
+
+2010-09-02  Lucas De Marchi  <lucas.demarchi at profusion.mobi>
+
+        Reviewed by Antonio Gomes.
+
         [EFL] Do not override custom compile flags
         https://bugs.webkit.org/show_bug.cgi?id=45125
 
diff --git a/WebKit/efl/CMakeListsEfl.txt b/WebKit/efl/CMakeListsEfl.txt
index 7b5865b..9734b88 100644
--- a/WebKit/efl/CMakeListsEfl.txt
+++ b/WebKit/efl/CMakeListsEfl.txt
@@ -225,4 +225,4 @@ FILE(GLOB EWebKit_HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/efl/ewk/*.h")
 LIST(REMOVE_ITEM EWebKit_HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/efl/ewk/ewk_private.h")
 
 INSTALL(FILES ${EWebKit_HEADERS}
-        DESTINATION include/EWebKit)
+        DESTINATION include/${WebKit_LIBRARY_NAME}-${PROJECT_VERSION_MAJOR})
diff --git a/WebKit/efl/ChangeLog b/WebKit/efl/ChangeLog
index bafa48d..7e93b93 100644
--- a/WebKit/efl/ChangeLog
+++ b/WebKit/efl/ChangeLog
@@ -1,3 +1,13 @@
+2010-09-02  Lucas De Marchi  <lucas.demarchi at profusion.mobi>
+
+        Reviewed by Antonio Gomes.
+
+        [EFL] Name install directories according to library name
+        https://bugs.webkit.org/show_bug.cgi?id=45126
+
+        * CMakeListsEfl.txt: include diretory follows library name.
+        * ewebkit.pc.in: Ditto.
+
 2010-08-31  Dave Hyatt  <hyatt at apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/WebKit/efl/ewebkit.pc.in b/WebKit/efl/ewebkit.pc.in
index d618e30..fb7d8ae 100644
--- a/WebKit/efl/ewebkit.pc.in
+++ b/WebKit/efl/ewebkit.pc.in
@@ -9,4 +9,4 @@ Version: @PROJECT_VERSION@
 Requires: cairo evas ecore
 Libs: -L${libdir} -lewebkit @EXTRA_EWEBKIT_LINK@
 Libs.private: @LIBS_PRIVATE@
-Cflags: -I${includedir}/EWebKit
+Cflags: -I${includedir}/@WebKit_LIBRARY_NAME at -@PROJECT_VERSION_MAJOR@
diff --git a/cmake/OptionsEfl.cmake b/cmake/OptionsEfl.cmake
index 38c8fba..bd6236b 100644
--- a/cmake/OptionsEfl.cmake
+++ b/cmake/OptionsEfl.cmake
@@ -3,9 +3,6 @@ SET(PROJECT_VERSION_MINOR 1)
 SET(PROJECT_VERSION_PATCH 0)
 SET(PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH})
 
-SET(DATA_DIR ${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}-${PROJECT_VERSION})
-ADD_DEFINITIONS(-DDATA_DIR="${DATA_DIR}")
-
 ADD_DEFINITIONS(-DWTF_PLATFORM_EFL=1)
 SET(WTF_PLATFORM_EFL 1)
 
@@ -46,6 +43,9 @@ SET(JavaScriptCore_LIBRARY_NAME javascriptcore_efl)
 SET(WebCore_LIBRARY_NAME webcore_efl)
 SET(WebKit_LIBRARY_NAME ewebkit)
 
+SET(DATA_DIR ${CMAKE_INSTALL_PREFIX}/share/${WebKit_LIBRARY_NAME}-${PROJECT_VERSION_MAJOR})
+ADD_DEFINITIONS(-DDATA_DIR="${DATA_DIR}")
+
 WEBKIT_FEATURE(ENABLE_AS_IMAGE "Enable SVG as image" DEFAULT ON SVG)
 WEBKIT_FEATURE(ENABLE_BLOB "Enable blob slice" DEFAULT OFF)
 WEBKIT_FEATURE(ENABLE_CHANNEL_MESSAGING "Enable channel messaging" DEFAULT ON)

-- 
WebKit Debian packaging