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

[demarchi at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit a73f71ed2dcf2d7003b5c1550fb5589a6146b6ed
Author: demarchi at webkit.org <demarchi at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Aug 20 14:48:31 2010 +0000

    2010-08-20  Lucas De Marchi  <lucas.demarchi at profusion.mobi>
    
            Unreviewed build fix.
    
            As opposed to WebCore, JavascriptCore and wtf, webkit is always a
            shared library. After r65366, libewebkit.so was not being installed
            anymore when building with SHARED_CORE=0 (which is the default). This
            partially reverts that revision in order to fix this issue.
    
            * CMakeLists.txt: always install webkit library.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65733 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/CMakeLists.txt b/WebKit/CMakeLists.txt
index 379c8e4..6bc5100 100644
--- a/WebKit/CMakeLists.txt
+++ b/WebKit/CMakeLists.txt
@@ -71,7 +71,5 @@ IF (WebKit_LINK_FLAGS)
     ADD_TARGET_PROPERTIES(${WebKit_LIBRARY_NAME} LINK_FLAGS "${WebKit_LINK_FLAGS}")
 ENDIF ()
 
-IF (SHARED_CORE)
-    SET_TARGET_PROPERTIES(${WebKit_LIBRARY_NAME} PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR})
-    INSTALL(TARGETS ${WebKit_LIBRARY_NAME} DESTINATION lib)
-ENDIF ()
+SET_TARGET_PROPERTIES(${WebKit_LIBRARY_NAME} PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR})
+INSTALL(TARGETS ${WebKit_LIBRARY_NAME} DESTINATION lib)
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index c7858fb..9747ffa 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2010-08-20  Lucas De Marchi  <lucas.demarchi at profusion.mobi>
+
+        Unreviewed build fix.
+
+        As opposed to WebCore, JavascriptCore and wtf, webkit is always a
+        shared library. After r65366, libewebkit.so was not being installed
+        anymore when building with SHARED_CORE=0 (which is the default). This
+        partially reverts that revision in order to fix this issue.
+
+        * CMakeLists.txt: always install webkit library.
+
 2010-08-17  Jesus Sanchez-Palencia  <jesus.palencia at openbossa.org>
 
         Reviewed by Darin Adler.

-- 
WebKit Debian packaging