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

[xan at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 1b9757f3af792cec62e8dd8142fd30de35837950
Author: xan at webkit.org <xan at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 17 12:22:46 2010 +0000

    2010-08-17  Xan Lopez  <xlopez at igalia.com>
    
            Reviewed by Gustavo Noronha.
    
            Revert supposed build-fix which was in fact reverting a previous
            build fix which was correct (oh dear).
    
            * GNUmakefile.am:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65496 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 80b348d..3d7e1f6 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-08-17  Xan Lopez  <xlopez at igalia.com>
+
+        Reviewed by Gustavo Noronha.
+
+        Revert supposed build-fix which was in fact reverting a previous
+        build fix which was correct (oh dear).
+
+        * GNUmakefile.am:
+
 2010-08-17  Tor Arne Vestbø  <tor.arne.vestbo at nokia.com>
 
         Reviewed by Antonio Gomes.
diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am
index 939852f..3b9f37d 100644
--- a/WebCore/GNUmakefile.am
+++ b/WebCore/GNUmakefile.am
@@ -3516,6 +3516,8 @@ webcore_sources += \
 	WebCore/mathml/RenderMathMLUnderOver.cpp \
 	WebCore/mathml/RenderMathMLUnderOver.h
 
+endif # END ENABLE_MATHML
+
 webcore_built_sources += \
 	DerivedSources/WebCore/MathMLElementFactory.cpp \
 	DerivedSources/WebCore/MathMLElementFactory.h \
@@ -3530,8 +3532,6 @@ DerivedSources/WebCore/MathMLNames.h: DerivedSources/WebCore/MathMLNames.cpp
 DerivedSources/WebCore/MathMLElementFactory.cpp DerivedSources/WebCore/MathMLNames.cpp: $(WebCore)/dom/make_names.pl $(WebCore)/mathml/mathtags.in $(WebCore)/mathml/mathattrs.in
 	$(AM_V_GEN)$(PERL) -I$(WebCore)/bindings/scripts $< --tags $(WebCore)/mathml/mathtags.in --attrs $(WebCore)/mathml/mathattrs.in --factory --wrapperFactory --outputDir "$(GENSOURCES_WEBCORE)"
 
-endif # END ENABLE_MATHML
-
 # ----
 # Notifications support
 # ----

-- 
WebKit Debian packaging