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

[mrobinson at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 484b41865686e36a4ea3595b02e1f2865df3743a
Author: mrobinson at webkit.org <mrobinson at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Aug 21 00:13:06 2010 +0000

    2010-08-20  Martin Robinson  <mrobinson at igalia.com>
    
            Reviewed by Joseph Pecoraro.
    
            [GTK] Inspector extensions tests fail on GTK+ bots because onSelectionChanged is missing
            https://bugs.webkit.org/show_bug.cgi?id=44342
    
            * platform/gtk/Skipped: Unskip tests which are now passing.
    2010-08-20  Martin Robinson  <mrobinson at igalia.com>
    
            Reviewed by Joseph Pecoraro.
    
            [GTK] Inspector extensions tests fail on GTK+ bots because onSelectionChanged is missing
            https://bugs.webkit.org/show_bug.cgi?id=44342
    
            * GNUmakefile.am: Fix dependency tracking for copied web inspector files.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65767 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 86eddb1..edc4a50 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2010-08-20  Martin Robinson  <mrobinson at igalia.com>
+
+        Reviewed by Joseph Pecoraro.
+
+        [GTK] Inspector extensions tests fail on GTK+ bots because onSelectionChanged is missing
+        https://bugs.webkit.org/show_bug.cgi?id=44342
+
+        * platform/gtk/Skipped: Unskip tests which are now passing.
+
 2010-08-20  Sheriff Bot  <webkit.review.bot at gmail.com>
 
         Unreviewed, rolling out r65757.
diff --git a/LayoutTests/platform/gtk/Skipped b/LayoutTests/platform/gtk/Skipped
index cf5d0fd..37e2b7f 100644
--- a/LayoutTests/platform/gtk/Skipped
+++ b/LayoutTests/platform/gtk/Skipped
@@ -5919,8 +5919,3 @@ perf/
 # https://bugs.webkit.org/show_bug.cgi?id=44316
 platform/gtk/accessibility/object-attributes.html
 platform/gtk/accessibility/title-and-alt.html
-
-# [GTK] Inspector extensions tests fail on GTK+ bots because onSelectionChanged is missing
-# https://bugs.webkit.org/show_bug.cgi?id=44342
-inspector/extensions-api.html
-inspector/extensions.html
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 6f2d5d4..ea6a04a 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-08-20  Martin Robinson  <mrobinson at igalia.com>
+
+        Reviewed by Joseph Pecoraro.
+
+        [GTK] Inspector extensions tests fail on GTK+ bots because onSelectionChanged is missing
+        https://bugs.webkit.org/show_bug.cgi?id=44342
+
+        * GNUmakefile.am: Fix dependency tracking for copied web inspector files.
+
 2010-08-20  Kinuko Yasuda  <kinuko at chromium.org>
 
         Reviewed by Darin Fisher.
diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am
index fd50f19..ac5a259 100644
--- a/WebCore/GNUmakefile.am
+++ b/WebCore/GNUmakefile.am
@@ -4531,8 +4531,8 @@ DerivedSources/WebCore/XMLNSNames.cpp DerivedSources/WebCore/XMLNSNames.h: $(Web
 DerivedSources/WebCore/XMLNames.cpp DerivedSources/WebCore/XMLNames.h: $(WebCore)/dom/make_names.pl $(WebCore)/xml/xmlattrs.in
 	$(AM_V_GEN)$(PERL) -I$(WebCore)/bindings/scripts $< --attrs $(WebCore)/xml/xmlattrs.in --outputDir "$(GENSOURCES_WEBCORE)"
 
-# RemoteInspectorFrontend and InspectorBackendDispatcher
-DerivedSources/WebCore/RemoteInspectorFrontend.cpp DerivedSources/WebCore/RemoteInspectorFrontend.h DerivedSources/WebCore/InspectorBackendDispatcher.cpp DerivedSources/WebCore/InspectorBackendDispatcher.h: $(WebCore)/inspector/Inspector.idl $(SCRIPTS_BINDINGS) $(WebCore)/inspector/CodeGeneratorInspector.pm
+# All Web Inspector generated files are created with this one call to CodeGeneratorInspector.pm
+DerivedSources/WebCore/RemoteInspectorFrontend.cpp DerivedSources/WebCore/RemoteInspectorFrontend.h DerivedSources/WebCore/InspectorBackendDispatcher.cpp DerivedSources/WebCore/InspectorBackendDispatcher.h DerivedSources/WebCore/InspectorBackendStub.js: $(WebCore)/inspector/Inspector.idl $(SCRIPTS_BINDINGS) $(WebCore)/inspector/CodeGeneratorInspector.pm
 	$(AM_V_GEN)$(PERL) -I$(WebCore)/bindings/scripts -I$(WebCore)/inspector $(WebCore)/bindings/scripts/generate-bindings.pl $(IDL_PATH:%=--include "%") --outputDir "$(GENSOURCES_WEBCORE)" --defines "LANGUAGE_JAVASCRIPT=1 $(FEATURE_DEFINES)" --generator Inspector $<
 
 IDL_PATH := \
@@ -4639,8 +4639,15 @@ dist_webinspectorimages_DATA = \
 	$(shell ls $(WebCore)/inspector/front-end/Images/*.gif) \
 	$(shell ls $(WebCore)/inspector/front-end/Images/*.png)
 
+# It seems that $(shell) does not expand when it is a rule dependency, so
+# we must redefine this list of copied files with traditional dependency wildcards.
 noinst_DATA = ${GENSOURCES_INSPECTOR}/inspector.html
-${GENSOURCES_INSPECTOR}/inspector.html:
+${GENSOURCES_INSPECTOR}/inspector.html: $(WebCore)/inspector/front-end/*.html \
+		$(WebCore)/inspector/front-end/*.js \
+		$(WebCore)/inspector/front-end/*.css \
+		$(WebCore)/inspector/front-end/Images/* \
+		DerivedSources/WebCore/InspectorBackendStub.js \
+		$(WebCore)/English.lproj/localizedStrings.js
 	mkdir -p ${GENSOURCES_INSPECTOR}/images
 	cp ${dist_webinspector_DATA} ${GENSOURCES_INSPECTOR}
 	cp ${dist_webinspectorimages_DATA} ${GENSOURCES_INSPECTOR}/images

-- 
WebKit Debian packaging