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

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 032edac7530e52fafda22d30cbd4a229abb838f1
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 2 17:35:11 2010 +0000

    2010-11-02  Christian Sejersen  <christian.webkit at gmail.com>
    
            Reviewed by Andreas Kling.
    
            The previous patch only took into account arm targets. This one
            now checks whether the build is done inside Scratchbox.
            https://bugs.webkit.org/show_bug.cgi?id=47895
    
            * DerivedSources.pro:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71128 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 26eae72..4df2505 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,13 @@
+2010-11-02  Christian Sejersen  <christian.webkit at gmail.com>
+
+        Reviewed by Andreas Kling.
+
+        The previous patch only took into account arm targets. This one
+        now checks whether the build is done inside Scratchbox.
+        https://bugs.webkit.org/show_bug.cgi?id=47895
+
+        * DerivedSources.pro:
+
 2010-11-02  Anders Carlsson  <andersca at apple.com>
 
         Reviewed by Adam Roben.
diff --git a/WebKit2/DerivedSources.pro b/WebKit2/DerivedSources.pro
index c556aa3..0865b20 100644
--- a/WebKit2/DerivedSources.pro
+++ b/WebKit2/DerivedSources.pro
@@ -27,7 +27,8 @@ win32-msvc*|symbian {
     DOUBLE_ESCAPED_QUOTE = "\\\'"
 }
 
-linux*:contains(QMAKE_HOST.arch, arm): {
+SBOX_CHECK = $$(_SBOX_DIR)
+!isEmpty(SBOX_CHECK) {
     PYTHON = python2.6
 } else {
     PYTHON = python

-- 
WebKit Debian packaging