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

[kov at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit e6d80d1f169fa7ac9f0edf8054a806904cb4384f
Author: kov at webkit.org <kov at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 5 01:43:47 2010 +0000

    Make distcheck build fixes.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52780 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 323ff44..aab4d0c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-04  Gustavo Noronha Silva  <gns at gnome.org>
+
+        Fix JSCore-1.0.gir path to fix make distcheck.
+
+        * GNUmakefile.am:
+
 2010-01-04  Simon Hausmann  <simon.hausmann at nokia.com>
 
         Reviewed by Tor Arne Vestbø.
diff --git a/GNUmakefile.am b/GNUmakefile.am
index ae42bdd..db4f9f5 100644
--- a/GNUmakefile.am
+++ b/GNUmakefile.am
@@ -459,11 +459,12 @@ typelibs_DATA += $(JSCORE_GIRSOURCES:.gir=.typelib) $(WEBKIT_GIRSOURCES:.gir=.ty
 %.typelib: %.gir $(G_IR_COMPILER)
 	$(AM_V_GEN)$(G_IR_COMPILER) --includedir $(top_srcdir)/WebKit/gtk $< -o $@
 
-EXTRA_DIST += $(JSCORE_GIRSOURCES)
 CLEANFILES += $(JSCORE_GIRSOURCES) $(WEBKIT_GIRSOURCES) $(typelibs_DATA)
 
 endif
 
+EXTRA_DIST += WebKit/gtk/JSCore-1.0.gir
+
 WEBKIT_MARSHAL = $(GENSOURCES)/webkitmarshal
 WEBKIT_MARSHAL_LIST = $(top_srcdir)/WebKit/gtk/webkitmarshal.list
 
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 9b8147e..cfb97d1 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-04  Gustavo Noronha Silva  <gns at gnome.org>
+
+        Add missing files to the build system - make distcheck build fix.
+
+        * GNUmakefile.am:
+
 2010-01-04  Gavin Barraclough <barraclough at apple.com>
 
         Reviewed by Sam Weinig, additional coding by Mark Rowe.
diff --git a/JavaScriptCore/GNUmakefile.am b/JavaScriptCore/GNUmakefile.am
index 55a2d99..13d6092 100644
--- a/JavaScriptCore/GNUmakefile.am
+++ b/JavaScriptCore/GNUmakefile.am
@@ -45,6 +45,7 @@ javascriptcore_built_nosources += \
 
 javascriptcore_sources += \
 	JavaScriptCore/API/APICast.h \
+	JavaScriptCore/API/APIShims.h \
 	JavaScriptCore/API/JSBase.cpp \
 	JavaScriptCore/API/JSBasePrivate.h \
 	JavaScriptCore/API/JSCallbackConstructor.cpp \
@@ -211,6 +212,7 @@ javascriptcore_sources += \
 	JavaScriptCore/runtime/TimeoutChecker.h \
 	JavaScriptCore/runtime/JSTypeInfo.h \
 	JavaScriptCore/runtime/WeakGCMap.h \
+	JavaScriptCore/runtime/WeakGCPtr.h \
 	JavaScriptCore/wrec/CharacterClass.h \
 	JavaScriptCore/wrec/CharacterClassConstructor.h \
 	JavaScriptCore/wrec/Escapes.h \

-- 
WebKit Debian packaging