[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 216a7d9d40101934a589bdb9f5302b410de19ce7
Author: xan at webkit.org <xan at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 21 15:53:52 2010 +0000

    2010-09-21  Xan Lopez  <xlopez at igalia.com>
    
            Reviewed by Martin Robinson.
    
            [GTK] Generate correct WebKit gir file with g-i 0.9.5
            https://bugs.webkit.org/show_bug.cgi?id=46173
    
            Generate a correct gir file for WebKit with the
            gobject-introspection 0.9.5 scanner.
    
            * GNUmakefile.am:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67955 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 8f9071b..8db9c73 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2010-09-21  Xan Lopez  <xlopez at igalia.com>
 
+        Reviewed by Martin Robinson.
+
+        [GTK] Generate correct WebKit gir file with g-i 0.9.5
+        https://bugs.webkit.org/show_bug.cgi?id=46173
+
+        Generate a correct gir file for WebKit with the
+        gobject-introspection 0.9.5 scanner.
+
+        * GNUmakefile.am:
+
+2010-09-21  Xan Lopez  <xlopez at igalia.com>
+
         Reviewed by Gustavo Noronha.
 
         Update for 1.3.4 release.
diff --git a/GNUmakefile.am b/GNUmakefile.am
index 747125d..03cad1a 100644
--- a/GNUmakefile.am
+++ b/GNUmakefile.am
@@ -397,19 +397,23 @@ JSCORE_GIRSOURCES += JSCore- at WEBKITGTK_API_VERSION@.gir
 WEBKIT_GIRSOURCES += WebKit- at WEBKITGTK_API_VERSION@.gir
 
 $(WEBKIT_GIRSOURCES): $(G_IR_SCANNER) $(JSCORE_GIRSOURCES) libwebkitgtk- at WEBKITGTK_API_MAJOR_VERSION@. at WEBKITGTK_API_MINOR_VERSION@.la
-	$(AM_V_GEN)$(G_IR_SCANNER) -v --namespace WebKit --nsversion=@WEBKITGTK_API_VERSION@ \
+	$(AM_V_GEN)$(G_IR_SCANNER) -v --warn-all \
+	     --symbol-prefix=webkit \
+	     --identifier-prefix=WebKit \
+	     --namespace=WebKit \
+	     --nsversion=@WEBKITGTK_API_VERSION@ \
 	     --include=GObject-2.0 \
 	     --include=Gtk- at GTK_API_VERSION@ \
 	     --include=JSCore- at WEBKITGTK_API_VERSION@ \
 	     --include=Soup-2.4 \
 	     --library=webkitgtk- at WEBKITGTK_API_VERSION@ \
 	     --libtool="$(LIBTOOL)" \
-	     --pkg gobject-2.0 \
-	     --pkg gtk+- at GTK_API_VERSION@ \
-	     --pkg libsoup-2.4 \
-	     --output $@ \
-	     --add-include-path $(top_srcdir)/WebKit/gtk \
-	     --add-include-path $(builddir) \
+	     --pkg=gobject-2.0 \
+	     --pkg=gtk+- at GTK_API_VERSION@ \
+	     --pkg=libsoup-2.4 \
+	     --output=$@ \
+	     --add-include-path=$(top_srcdir)/WebKit/gtk \
+	     --add-include-path=$(builddir) \
 	     -I$(top_srcdir)/WebKit/gtk \
 	     -I$(top_builddir)/WebKit/gtk \
 	     -I$(top_builddir)/DerivedSources \

-- 
WebKit Debian packaging