[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 0ad989feafd6569281153d518c41861ca3550f79
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Jan 2 07:42:28 2011 +0000

    2011-01-01  Adam Barth  <abarth at webkit.org>
    
            Fix relative include paths in an attempt to fix the Qt build.
    
            * JavaScriptCore.pri:
            * JavaScriptCore.pro:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74861 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 7dc094c..75c5d00 100644
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,5 +1,12 @@
 2011-01-01  Adam Barth  <abarth at webkit.org>
 
+        Fix relative include paths in an attempt to fix the Qt build.
+
+        * JavaScriptCore.pri:
+        * JavaScriptCore.pro:
+
+2011-01-01  Adam Barth  <abarth at webkit.org>
+
         Another speculative build fix for GTK.
 
         * GNUmakefile.am:
diff --git a/Source/JavaScriptCore/JavaScriptCore.pri b/Source/JavaScriptCore/JavaScriptCore.pri
index 7f553b9..f49953b 100644
--- a/Source/JavaScriptCore/JavaScriptCore.pri
+++ b/Source/JavaScriptCore/JavaScriptCore.pri
@@ -1,6 +1,6 @@
 # JavaScriptCore - Qt4 build info
 
-include(../common.pri)
+include(../../common.pri)
 
 VPATH += $$PWD
 
@@ -31,6 +31,7 @@ symbian: {
 INCLUDEPATH = \
     $$PWD \
     $$PWD/.. \
+    $$PWD/../.. \ # FIXME: Remove this include once we finish moving the source to Source
     $$PWD/assembler \
     $$PWD/bytecode \
     $$PWD/bytecompiler \
diff --git a/Source/JavaScriptCore/JavaScriptCore.pro b/Source/JavaScriptCore/JavaScriptCore.pro
index aacd177..86b1b9a 100644
--- a/Source/JavaScriptCore/JavaScriptCore.pro
+++ b/Source/JavaScriptCore/JavaScriptCore.pro
@@ -1,6 +1,6 @@
 # JavaScriptCore - qmake build info
 CONFIG += building-libs
-include($$PWD/../WebKit.pri)
+include($$PWD/../../WebKit.pri)
 include(JavaScriptCore.pri)
 
 TEMPLATE = lib

-- 
WebKit Debian packaging