[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 a34b8d21fe4680ed83e0abb068115796c0b1f1c8
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Jan 8 10:54:36 2011 +0000

    2011-01-08  Adam Barth  <abarth at webkit.org>
    
            Moving WebCore changes the layout of the Qt build directory as well,
            which means we need to change where we look for these generated files.
    
            * DerivedSources.pro:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75318 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index de6ecdd..e8073ac 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,10 @@
+2011-01-08  Adam Barth  <abarth at webkit.org>
+
+        Moving WebCore changes the layout of the Qt build directory as well,
+        which means we need to change where we look for these generated files.
+
+        * DerivedSources.pro:
+
 2011-01-07  Adam Barth  <abarth at webkit.org>
 
         Rubber-stamped by Eric Seidel.
diff --git a/WebKit2/DerivedSources.pro b/WebKit2/DerivedSources.pro
index 7e3ecca..ee9c140 100644
--- a/WebKit2/DerivedSources.pro
+++ b/WebKit2/DerivedSources.pro
@@ -5,10 +5,10 @@ CONFIG -= debug_and_release
 
 CONFIG(standalone_package) {
     isEmpty(WEBKIT2_GENERATED_SOURCES_DIR):WEBKIT2_GENERATED_SOURCES_DIR = $$PWD/generated
-    isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = $$PWD/../WebCore/generated
+    isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = $$PWD/../Source/WebCore/generated
 } else {
     isEmpty(WEBKIT2_GENERATED_SOURCES_DIR):WEBKIT2_GENERATED_SOURCES_DIR = generated
-    isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = ../WebCore/generated
+    isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = ../Source/WebCore/generated
 }
 
 WEBCORE_GENERATED_HEADERS_FOR_WEBKIT2 += \

-- 
WebKit Debian packaging