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

[tonyg at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit da2d5bd73a5b09692906c3be4d21e8aac138c39d
Author: tonyg at chromium.org <tonyg at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Dec 18 01:56:16 2010 +0000

    2010-12-17  Tony Gentilcore  <tonyg at chromium.org>
    
            Unreviewed, build fix.
    
            Add WebKitTools -> Tools rename that got missed.
    
            * WebKit.gyp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74307 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index f65fdc4..d5ea660 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,11 @@
+2010-12-17  Tony Gentilcore  <tonyg at chromium.org>
+
+        Unreviewed, build fix.
+
+        Add WebKitTools -> Tools rename that got missed.
+
+        * WebKit.gyp:
+
 2010-12-17  Dirk Pranke  <dpranke at chromium.org>
 
         Unreviewed, build fix.
diff --git a/WebKit/chromium/WebKit.gyp b/WebKit/chromium/WebKit.gyp
index 611d01f..3612a08 100644
--- a/WebKit/chromium/WebKit.gyp
+++ b/WebKit/chromium/WebKit.gyp
@@ -62,7 +62,7 @@
                 ],
             }],
         ],
-        'ahem_path': '../../WebKitTools/DumpRenderTree/qt/fonts/AHEM____.TTF',
+        'ahem_path': '../../Tools/DumpRenderTree/qt/fonts/AHEM____.TTF',
 
         # If debug_devtools is set to 1, JavaScript files for DevTools are
         # stored as is. Otherwise, a concatenated file is stored.
@@ -887,7 +887,7 @@
                 '<(DEPTH)',
             ],
             'sources': [
-                '../../WebKitTools/DumpRenderTree/chromium/ImageDiff.cpp',
+                '../../Tools/DumpRenderTree/chromium/ImageDiff.cpp',
             ],
         },
         {
@@ -995,15 +995,15 @@
                     ],
                     'mac_bundle_resources': [
                         '<(ahem_path)',
-                        '../../WebKitTools/DumpRenderTree/fonts/WebKitWeightWatcher100.ttf',
-                        '../../WebKitTools/DumpRenderTree/fonts/WebKitWeightWatcher200.ttf',
-                        '../../WebKitTools/DumpRenderTree/fonts/WebKitWeightWatcher300.ttf',
-                        '../../WebKitTools/DumpRenderTree/fonts/WebKitWeightWatcher400.ttf',
-                        '../../WebKitTools/DumpRenderTree/fonts/WebKitWeightWatcher500.ttf',
-                        '../../WebKitTools/DumpRenderTree/fonts/WebKitWeightWatcher600.ttf',
-                        '../../WebKitTools/DumpRenderTree/fonts/WebKitWeightWatcher700.ttf',
-                        '../../WebKitTools/DumpRenderTree/fonts/WebKitWeightWatcher800.ttf',
-                        '../../WebKitTools/DumpRenderTree/fonts/WebKitWeightWatcher900.ttf',
+                        '../../Tools/DumpRenderTree/fonts/WebKitWeightWatcher100.ttf',
+                        '../../Tools/DumpRenderTree/fonts/WebKitWeightWatcher200.ttf',
+                        '../../Tools/DumpRenderTree/fonts/WebKitWeightWatcher300.ttf',
+                        '../../Tools/DumpRenderTree/fonts/WebKitWeightWatcher400.ttf',
+                        '../../Tools/DumpRenderTree/fonts/WebKitWeightWatcher500.ttf',
+                        '../../Tools/DumpRenderTree/fonts/WebKitWeightWatcher600.ttf',
+                        '../../Tools/DumpRenderTree/fonts/WebKitWeightWatcher700.ttf',
+                        '../../Tools/DumpRenderTree/fonts/WebKitWeightWatcher800.ttf',
+                        '../../Tools/DumpRenderTree/fonts/WebKitWeightWatcher900.ttf',
                         '<(SHARED_INTERMEDIATE_DIR)/webkit/textAreaResizeCorner.png',
                     ],
                 },{ # OS!="mac"
@@ -1024,7 +1024,7 @@
                         'destination': '<(PRODUCT_DIR)',
                         'files': [
                             '<(ahem_path)',
-                            '../../WebKitTools/DumpRenderTree/chromium/fonts.conf',
+                            '../../Tools/DumpRenderTree/chromium/fonts.conf',
                             '<(INTERMEDIATE_DIR)/repack/DumpRenderTree.pak',
                         ]
                     }],
@@ -1053,8 +1053,8 @@
             ],
             'include_dirs': [
                 '<(chromium_src_dir)',
-                '../../WebKitTools/DumpRenderTree/TestNetscapePlugIn',
-                '../../WebKitTools/DumpRenderTree/chromium/TestNetscapePlugIn/ForwardingHeaders',
+                '../../Tools/DumpRenderTree/TestNetscapePlugIn',
+                '../../Tools/DumpRenderTree/chromium/TestNetscapePlugIn/ForwardingHeaders',
             ],
             'conditions': [
                 ['OS=="mac"', {
@@ -1078,7 +1078,7 @@
                         # we get rid of our forked plugin in the
                         # chromium repo, we can share the same
                         # Info.plist.
-                        'INFOPLIST_FILE': '../../WebKitTools/DumpRenderTree/chromium/TestNetscapePlugIn/Info.plist',
+                        'INFOPLIST_FILE': '../../Tools/DumpRenderTree/chromium/TestNetscapePlugIn/Info.plist',
                     },
                 }],
                 ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
@@ -1092,8 +1092,8 @@
                         'snprintf=_snprintf',
                     ],
                     'sources': [
-                        '../../WebKitTools/DumpRenderTree/TestNetscapePlugIn/win/TestNetscapePlugin.def',
-                        '../../WebKitTools/DumpRenderTree/TestNetscapePlugIn/win/TestNetscapePlugin.rc',
+                        '../../Tools/DumpRenderTree/TestNetscapePlugIn/win/TestNetscapePlugin.def',
+                        '../../Tools/DumpRenderTree/TestNetscapePlugIn/win/TestNetscapePlugin.rc',
                     ],
                     # The .rc file requires that the name of the dll is npTestNetscapePlugin.dll.
                     # This adds the 'np' to the dll name.
@@ -1134,7 +1134,7 @@
             'targets': [{
                 'target_name': 'LayoutTestHelper',
                 'type': 'executable',
-                'sources': ['../../WebKitTools/DumpRenderTree/chromium/LayoutTestHelperWin.cpp'],
+                'sources': ['../../Tools/DumpRenderTree/chromium/LayoutTestHelperWin.cpp'],
             }],
         }],
         ['OS=="mac"', {
@@ -1142,7 +1142,7 @@
                 {
                     'target_name': 'LayoutTestHelper',
                     'type': 'executable',
-                    'sources': ['../../WebKitTools/DumpRenderTree/chromium/LayoutTestHelper.mm'],
+                    'sources': ['../../Tools/DumpRenderTree/chromium/LayoutTestHelper.mm'],
                     'link_settings': {
                         'libraries': [
                             '$(SDKROOT)/System/Library/Frameworks/AppKit.framework',

-- 
WebKit Debian packaging