[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[kov at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 60affd133162f516012fdf4cba383c5e22ac8b5a
Author: kov at webkit.org <kov at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 30 15:13:44 2009 +0000

    Build fix. Make sure JSCore-1.0.gir is added to the distributed
    tarball.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51487 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index c84a30c..2e2e845 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-11-30  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
+
+        Build fix. Make sure JSCore-1.0.gir is added to the distributed
+        tarball.
+
+        * GNUmakefile.am:
+
 2009-11-30  Xan Lopez  <xlopez at igalia.com>
 
         Reviewed by Gustavo Noronha.
diff --git a/GNUmakefile.am b/GNUmakefile.am
index 2c32086..ef53b92 100644
--- a/GNUmakefile.am
+++ b/GNUmakefile.am
@@ -78,6 +78,7 @@ global_cflags :=
 global_cxxflags :=
 corekit_cflags :=
 corekit_cppflags :=
+JSCORE_GIRSOURCES :=
 EXTRA_DIST :=
 BUILT_SOURCES :=
 CLEANFILES :=
@@ -420,7 +421,7 @@ pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = WebKit/gtk/webkit-1.0.pc
 
 if ENABLE_INTROSPECTION
-JSCORE_GIRSOURCES = $(srcdir)/WebKit/gtk/JSCore-1.0.gir # JSCore-1.0.gir is handwritten
+JSCORE_GIRSOURCES += $(srcdir)/WebKit/gtk/JSCore-1.0.gir # JSCore-1.0.gir is handwritten
 WEBKIT_GIRSOURCES = WebKit-1.0.gir
 
 $(WEBKIT_GIRSOURCES): $(JSCORE_GIRSOURCES) $(G_IR_SCANNER)

-- 
WebKit Debian packaging