[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

kov at webkit.org kov at webkit.org
Tue Jan 5 23:51:49 UTC 2010


The following commit has been merged in the webkit-1.1 branch:
commit 0b2d90a08a32ba02d4c4a04d5ead4670b84245a9
Author: kov at webkit.org <kov at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 17 11:33:55 2009 +0000

    Unreviewed. Build fixes for make distcheck.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52244 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 55aefed..0bb75ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-12-17  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
+
+        Unreviewed. Build fixes for make distcheck.
+
+        * GNUmakefile.am:
+
 2009-12-16  Dan Winship  <danw at gnome.org>
 
         Reviewed by Gustavo Noronha Silva.
diff --git a/GNUmakefile.am b/GNUmakefile.am
index 3a0e398..ae42bdd 100644
--- a/GNUmakefile.am
+++ b/GNUmakefile.am
@@ -542,7 +542,8 @@ EXTRA_DIST += \
 	$(srcdir)/WebKit/gtk/docs/webkitgtk-sections.txt \
 	$(srcdir)/WebKit/gtk/docs/version.xml.in \
 	$(srcdir)/WebKit/gtk/po/* \
-	$(srcdir)/WebKit/gtk/resources/*
+	$(srcdir)/WebKit/gtk/resources/* \
+	$(srcdir)/WebKit/gtk/tests/resources/*
 
 # extra resource files
 resourcesdir = ${datadir}/webkit-1.0/resources
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 78abf29..2f6356f 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,9 @@
+2009-12-17  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
+
+        Unreviewed. Build fixes for make distcheck.
+
+        * GNUmakefile.am:
+
 2009-12-16  Geoffrey Garen  <ggaren at apple.com>
 
         Reviewed by Oliver Hunt.
diff --git a/JavaScriptCore/GNUmakefile.am b/JavaScriptCore/GNUmakefile.am
index dba305a..a4d62a2 100644
--- a/JavaScriptCore/GNUmakefile.am
+++ b/JavaScriptCore/GNUmakefile.am
@@ -195,6 +195,7 @@ javascriptcore_sources += \
 	JavaScriptCore/runtime/JSONObject.h \
 	JavaScriptCore/runtime/JSPropertyNameIterator.cpp \
 	JavaScriptCore/runtime/JSPropertyNameIterator.h \
+	JavaScriptCore/runtime/JSZombie.h \
 	JavaScriptCore/runtime/LiteralParser.cpp \
 	JavaScriptCore/runtime/LiteralParser.h \
 	JavaScriptCore/runtime/MarkStack.cpp \
@@ -204,6 +205,7 @@ javascriptcore_sources += \
 	JavaScriptCore/runtime/PropertyDescriptor.cpp \
 	JavaScriptCore/runtime/SmallStrings.cpp \
 	JavaScriptCore/runtime/SmallStrings.h \
+	JavaScriptCore/runtime/StringBuilder.h \
 	JavaScriptCore/runtime/Structure.cpp \
 	JavaScriptCore/runtime/Structure.h \
 	JavaScriptCore/runtime/StructureChain.cpp \
@@ -212,6 +214,7 @@ javascriptcore_sources += \
 	JavaScriptCore/runtime/TimeoutChecker.cpp \
 	JavaScriptCore/runtime/TimeoutChecker.h \
 	JavaScriptCore/runtime/JSTypeInfo.h \
+	JavaScriptCore/runtime/WeakGCMap.h \
 	JavaScriptCore/wrec/CharacterClass.h \
 	JavaScriptCore/wrec/CharacterClassConstructor.h \
 	JavaScriptCore/wrec/Escapes.h \
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index a5b8563..7594c72 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,9 @@
+2009-12-17  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
+
+        Unreviewed. Build fixes for make distcheck.
+
+        * GNUmakefile.am:
+
 2009-12-17  Philippe Normand  <pnormand at igalia.com>
 
         Rubber-stamped by Gustavo Noronha Silva.
diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am
index 97f3721..f8e3647 100644
--- a/WebCore/GNUmakefile.am
+++ b/WebCore/GNUmakefile.am
@@ -434,7 +434,6 @@ webcore_sources += \
 	WebCore/bindings/js/JSPluginElementFunctions.cpp \
 	WebCore/bindings/js/JSPluginElementFunctions.h \
 	WebCore/bindings/js/JSPopStateEventCustom.cpp \
-	WebCore/bindings/js/JSPopStateEventCustom.h \
 	WebCore/bindings/js/JSQuarantinedObjectWrapper.cpp \
 	WebCore/bindings/js/JSQuarantinedObjectWrapper.h \
 	WebCore/bindings/js/JSStorageCustom.h \

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list