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

[leandro at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 7a0179dc7a15e392e05242cb91689ca7f9e415a1
Author: leandro at webkit.org <leandro at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 5 18:58:22 2010 +0000

    2010-10-05  Leandro Pereira  <leandro at profusion.mobi>
    
            Unreviewed. Build fix.
    
            Moved "jsc" directory to "shell", so that the name does not clash with the
            JavaScriptCore shell in some build systems.
            http://webkit.org/b/47049
    
            * CMakeLists.txt: Changed reference from "jsc" to "shell".
            * jsc: Removed.
            * jsc/CMakeLists.txt: Removed.
            * jsc/CMakeListsEfl.txt: Removed.
            * shell: Copied from JavaScriptCore/jsc.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69132 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/CMakeLists.txt b/JavaScriptCore/CMakeLists.txt
index 89c9ef1..3db1d09 100644
--- a/JavaScriptCore/CMakeLists.txt
+++ b/JavaScriptCore/CMakeLists.txt
@@ -254,7 +254,7 @@ SOURCE_GROUP(yarr "yarr/")
 SOURCE_GROUP(wtf "wtf/")
 
 ADD_SUBDIRECTORY(wtf)
-ADD_SUBDIRECTORY(jsc)
+ADD_SUBDIRECTORY(shell)
 
 WEBKIT_WRAP_SOURCELIST(${JavaScriptCore_SOURCES})
 INCLUDE_DIRECTORIES(${JavaScriptCore_INCLUDE_DIRECTORIES})
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 480851f..c590254 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-10-05  Leandro Pereira  <leandro at profusion.mobi>
+
+        Unreviewed. Build fix.
+
+        Moved "jsc" directory to "shell", so that the name does not clash with the
+        JavaScriptCore shell in some build systems.
+        http://webkit.org/b/47049
+
+        * CMakeLists.txt: Changed reference from "jsc" to "shell".
+        * jsc: Removed.
+        * jsc/CMakeLists.txt: Removed.
+        * jsc/CMakeListsEfl.txt: Removed.
+        * shell: Copied from JavaScriptCore/jsc.
+
 2010-10-05  Kwang Yul Seo  <skyul at company100.net>
 
         Reviewed by Kent Tamura.
diff --git a/JavaScriptCore/jsc/CMakeLists.txt b/JavaScriptCore/shell/CMakeLists.txt
similarity index 100%
rename from JavaScriptCore/jsc/CMakeLists.txt
rename to JavaScriptCore/shell/CMakeLists.txt
diff --git a/JavaScriptCore/jsc/CMakeListsEfl.txt b/JavaScriptCore/shell/CMakeListsEfl.txt
similarity index 100%
rename from JavaScriptCore/jsc/CMakeListsEfl.txt
rename to JavaScriptCore/shell/CMakeListsEfl.txt

-- 
WebKit Debian packaging