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

[pfeldman at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 39746a97c9c445f35acf389161ef7e06dc4cca43
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 16 17:50:37 2010 +0000

    2010-11-16  Pavel Feldman  <pfeldman at chromium.org>
    
            Not reviewed. Chromium build fix.
    
            * WebKit.gyp:
            * scripts/concatenate_css_files.py: Renamed from WebKit/chromium/Build/concatenate_css_files.py.
            * scripts/concatenate_js_files.py: Renamed from WebKit/chromium/Build/concatenate_js_files.py.
            * scripts/generate_devtools_html.py: Renamed from WebKit/chromium/Build/generate_devtools_html.py.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72112 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 172d47b..aa01e84 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,5 +1,14 @@
 2010-11-16  Pavel Feldman  <pfeldman at chromium.org>
 
+        Not reviewed. Chromium build fix.
+
+        * WebKit.gyp:
+        * scripts/concatenate_css_files.py: Renamed from WebKit/chromium/Build/concatenate_css_files.py.
+        * scripts/concatenate_js_files.py: Renamed from WebKit/chromium/Build/concatenate_js_files.py.
+        * scripts/generate_devtools_html.py: Renamed from WebKit/chromium/Build/generate_devtools_html.py.
+
+2010-11-16  Pavel Feldman  <pfeldman at chromium.org>
+
         Reviewed by Yury Semikhatsky.
 
         Chrome DevTools: concatenate CSS files, do not link
diff --git a/WebKit/chromium/WebKit.gyp b/WebKit/chromium/WebKit.gyp
index 48a39d4..8686e05 100644
--- a/WebKit/chromium/WebKit.gyp
+++ b/WebKit/chromium/WebKit.gyp
@@ -705,7 +705,7 @@
             'actions': [{
                 'action_name': 'devtools_html',
                 'inputs': [
-                    'Build/generate_devtools_html.py',
+                    'scripts/generate_devtools_html.py',
                     # See issue 29695: WebKit.gypi is a source file for devtools.html.
                     'WebKit.gypi',
                     '../../WebCore/inspector/front-end/inspector.html',
@@ -724,7 +724,7 @@
             'sources': ['<(PRODUCT_DIR)/resources/inspector/DevTools.js'],
             'actions': [{
                 'action_name': 'concatenate_devtools_js',
-                'script_name': 'Build/concatenate_js_files.py',
+                'script_name': 'scripts/concatenate_js_files.py',
                 'input_page': '../../WebCore/inspector/front-end/inspector.html',
                 'inputs': [
                     '<@(_script_name)',
@@ -751,7 +751,7 @@
             'sources': ['<(PRODUCT_DIR)/resources/inspector/devTools.css'],
             'actions': [{
                 'action_name': 'concatenate_devtools_css',
-                'script_name': 'Build/concatenate_css_files.py',
+                'script_name': 'scripts/concatenate_css_files.py',
                 'input_page': '../../WebCore/inspector/front-end/inspector.html',
                 'inputs': [
                     '<@(_script_name)',
diff --git a/WebKit/chromium/Build/concatenate_css_files.py b/WebKit/chromium/scripts/concatenate_css_files.py
similarity index 100%
rename from WebKit/chromium/Build/concatenate_css_files.py
rename to WebKit/chromium/scripts/concatenate_css_files.py
diff --git a/WebKit/chromium/Build/concatenate_js_files.py b/WebKit/chromium/scripts/concatenate_js_files.py
similarity index 100%
rename from WebKit/chromium/Build/concatenate_js_files.py
rename to WebKit/chromium/scripts/concatenate_js_files.py
diff --git a/WebKit/chromium/Build/generate_devtools_html.py b/WebKit/chromium/scripts/generate_devtools_html.py
similarity index 100%
rename from WebKit/chromium/Build/generate_devtools_html.py
rename to WebKit/chromium/scripts/generate_devtools_html.py

-- 
WebKit Debian packaging