[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 15d0ddb170769394a33eb9b8d13cf21ca76cf683
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 19 15:31:53 2010 +0000

    2010-10-19  Christian Sejersen  <christian.webkit at gmail.com>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            Scratchbox has an old version of python as the default one, so
            force it to use version 2.6.
            https://bugs.webkit.org/show_bug.cgi?id=47895
    
            * DerivedSources.pro:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70061 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index baf8874..94efb53 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,13 @@
+2010-10-19  Christian Sejersen  <christian.webkit at gmail.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Scratchbox has an old version of python as the default one, so
+        force it to use version 2.6.
+        https://bugs.webkit.org/show_bug.cgi?id=47895
+
+        * DerivedSources.pro:
+
 2010-10-19  Luiz Agostini  <luiz.agostini at openbossa.org>
 
         Reviewed by Antti Koivisto.
diff --git a/WebKit2/DerivedSources.pro b/WebKit2/DerivedSources.pro
index 4ae71a6..5018b12 100644
--- a/WebKit2/DerivedSources.pro
+++ b/WebKit2/DerivedSources.pro
@@ -27,6 +27,13 @@ win32-msvc*|symbian {
     DOUBLE_ESCAPED_QUOTE = "\\\'"
 }
 
+linux*:contains(QMAKE_HOST.arch, arm): {
+    PYTHON = python2.6
+} else {
+    PYTHON = python
+}
+
+
 DIRS = \
     $$OUTPUT_DIR/include/JavaScriptCore \
     $$OUTPUT_DIR/include/WebCore \

-- 
WebKit Debian packaging