[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[abarth at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit e8547d70a5cb7eb406b64b1e9e6d44b3979ea111
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Jan 2 06:40:17 2011 +0000

    2011-01-01  Adam Barth  <abarth at webkit.org>
    
            Update relative paths in JavaScriptCore.gyp to account for the extra
            level of directories.
    
            * JavaScriptCore.gyp/JavaScriptCore.gyp:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74857 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index bd49e93..2f7f7c1 100644
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,10 @@
+2011-01-01  Adam Barth  <abarth at webkit.org>
+
+        Update relative paths in JavaScriptCore.gyp to account for the extra
+        level of directories.
+
+        * JavaScriptCore.gyp/JavaScriptCore.gyp:
+
 2010-12-31  Patrick Gansterer  <paroga at webkit.org>
 
         Reviewed by Darin Adler.
diff --git a/Source/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp b/Source/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp
index ff7f0de..d24b083 100644
--- a/Source/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp
+++ b/Source/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp
@@ -32,7 +32,7 @@
   'includes': [
     # FIXME: Sense whether upstream or downstream build, and
     # include the right features.gypi
-    '../../WebKit/chromium/features.gypi',
+    '../../../WebKit/chromium/features.gypi',
     '../JavaScriptCore.gypi',
   ],
   'variables': {
@@ -40,10 +40,10 @@
     'conditions': [
       ['inside_chromium_build==0', {
         # Webkit is being built outside of the full chromium project.
-        'chromium_src_dir': '../../WebKit/chromium',
+        'chromium_src_dir': '../../../WebKit/chromium',
       },{
         # WebKit is checked out in src/chromium/third_party/WebKit
-        'chromium_src_dir': '../../../..',
+        'chromium_src_dir': '../../../../..',
       }],
     ],
   },

-- 
WebKit Debian packaging