[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
jochen at chromium.org
jochen at chromium.org
Wed Dec 22 12:20:12 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 4c59f046658b5df94a1c6a70f4c8ae1442685cda
Author: jochen at chromium.org <jochen at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Aug 19 16:11:04 2010 +0000
2010-08-19 Jochen Eisinger <jochen at chromium.org>
Reviewed by Pavel Feldman.
concatenated_devtools_js should depend on inspector_protocol_sources
https://bugs.webkit.org/show_bug.cgi?id=44255
* WebKit.gyp:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65676 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index f3d05b3..efb849d 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,12 @@
+2010-08-19 Jochen Eisinger <jochen at chromium.org>
+
+ Reviewed by Pavel Feldman.
+
+ concatenated_devtools_js should depend on inspector_protocol_sources
+ https://bugs.webkit.org/show_bug.cgi?id=44255
+
+ * WebKit.gyp:
+
2010-08-19 Pavel Podivilov <podivilov at chromium.org>
Reviewed by Yury Semikhatsky.
diff --git a/WebKit/chromium/WebKit.gyp b/WebKit/chromium/WebKit.gyp
index c46d431..16cb92a 100644
--- a/WebKit/chromium/WebKit.gyp
+++ b/WebKit/chromium/WebKit.gyp
@@ -695,7 +695,10 @@
{
'target_name': 'concatenated_devtools_js',
'type': 'none',
- 'dependencies': ['devtools_html'],
+ 'dependencies': [
+ 'devtools_html',
+ '../../WebCore/WebCore.gyp/WebCore.gyp:inspector_protocol_sources'
+ ],
'sources': ['<(PRODUCT_DIR)/resources/inspector/DevTools.js'],
'actions': [{
'action_name': 'concatenate_devtools_js',
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list