[couchdb-glib] Release 0.6.92

[Rodrigo Moya <rodrigo src gnome org>]

commit 1acea712e66711819eb41c64405d33a9b6ffc92d
Author: Rodrigo Moya <rodrigo gnome-db org>
Date:   Thu Jun 10 17:19:25 2010 +0200

    Release 0.6.92

 NEWS                            |   17 ++++++++++++
 bindings/mono/Makefile.am       |    2 +
 configure.ac                    |    9 +++++-
 couchdb-glib/Makefile.am        |   52 +++++++++++++++---------------------
 couchdb-glib/couchdb-document.h |    1 -
 desktopcouch-glib/Makefile.am   |   55 +++++++++++++++-----------------------
 6 files changed, 71 insertions(+), 65 deletions(-)
---
diff --git a/NEWS b/NEWS
index cfd8fcd..b00a7b4 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,21 @@
 ==============
+Version 0.6.92
+==============
+- No need for Json gir for gobject-introspection anymore (Rodrigo Moya)
+- Fix typo in 'session' property registration (Sam Thursfield)
+- Avoid warning when unref'ing a NULL object (Sam Thursfield)
+- Associate CouchdbDocument's with the container CouchdbDatabase (Rodrigo Moya)
+- Fixed typo in class' signals prototypes (Rodrigo Moya)
+- Fixed test program (Rodrigo Moya)
+- Convert CouchdbStructField and CouchdbArrayField to GObject-based classes
+  (Rodrigo Moya)
+- Added more API tests (Rodrigo Moya)
+- Add couchdb_document_foreach_attachment API (Rodrigo Moya)
+- Added missing GType argument to signal installation code (Rodrigo Moya)
+- Don't include internal headers for introspection (Rodrigo Moya)
+- Fixed g_strcmp0 comparison (Rodrigo Moya)
+
+==============
 Version 0.6.91
 ==============
 - Hide json-glib from the public headers (Rodrigo Moya)
diff --git a/bindings/mono/Makefile.am b/bindings/mono/Makefile.am
index e074007..70c0f43 100644
--- a/bindings/mono/Makefile.am
+++ b/bindings/mono/Makefile.am
@@ -4,6 +4,8 @@ generated_CS_objects =			\
 	CouchdbCredentialsType.cs	\
 	CouchdbDatabase.cs		\
 	CouchdbDatabaseInfo.cs		\
+	CouchdbDocumentForeachAttachmentFunc.cs \
+	CouchDBSharp.CouchdbDocumentForeachAttachmentFuncNative.cs \
 	CouchdbDesignDocument.cs	\
 	CouchdbDesignDocumentLanguage.cs\
 	CouchdbDocument.cs		\
diff --git a/configure.ac b/configure.ac
index 981d4f7..c925679 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([couchdb-glib], [0.6.91], [], [couchdb-glib])
+AC_INIT([couchdb-glib], [0.6.92], [], [couchdb-glib])
 
 AC_PREREQ([2.59])
 
@@ -96,6 +96,13 @@ AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
 ##################################################
 GOBJECT_INTROSPECTION_CHECK([0.6.4])
 
+# There seems to be a bug somewhere that makes INTROSPECTION_MAKEFILE not being defined ??
+if test "x$INTROSPECTION_MAKEFILE" = "x"
+then
+   INTROSPECTION_MAKEFILE="`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection"
+   AC_SUBST(INTROSPECTION_MAKEFILE)
+fi
+
 AC_OUTPUT([
 Makefile
 couchdb-glib.pc
diff --git a/couchdb-glib/Makefile.am b/couchdb-glib/Makefile.am
index 9b4dbd9..683d1f6 100644
--- a/couchdb-glib/Makefile.am
+++ b/couchdb-glib/Makefile.am
@@ -86,35 +86,27 @@ EXTRA_DIST = $(h_DATA) couchdb-marshal.list $(MARSHAL_FILES) $(OAUTH_FILES)
 BUILT_SOURCES = $(MARSHAL_FILES)
 CLEANFILES = $(BUILT_SOURCES)
 
-if HAVE_INTROSPECTION
-
-BUILT_SOURCES += Couchdb-1.0.gir Couchdb-1.0.typelib
-
-girdir = $(datadir)/gir-1.0
-gir_DATA = Couchdb-1.0.gir
-
-typelibsdir = $(libdir)/girepository-1.0/
-typelibs_DATA = Couchdb-1.0.typelib
-
-Couchdb-1.0.gir: libcouchdb-glib-1.0.la
-	$(INTROSPECTION_SCANNER) -v \
-        --namespace Couchdb --nsversion=1.0 \
-        --add-include-path=$(srcdir) \
-        --add-include-path=. \
-        --include=GObject-2.0 \
-        --library=couchdb-glib-1.0 \
-        --pkg gobject-2.0 \
-        --pkg json-glib-1.0 \
-        --output $@ \
-        -I$(top_srcdir) \
-        $(h_DATA) \
-        $(libcouchdb_glib_1_0_la_sources)
-
-Couchdb-1.0.typelib: Couchdb-1.0.gir
-	LD_LIBRARY_PATH=.libs$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH} \
-	$(INTROSPECTION_COMPILER) \
-        --includedir=$(srcdir) \
-	--includedir=. \
-	$(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
+-include $(INTROSPECTION_MAKEFILE)
+INTROSPECTION_GIRS =
+INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir)
+INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
 
+if HAVE_INTROSPECTION
+introspection_files =					\
+	$(h_DATA)					\
+	$(libcouchdb_glib_1_0_la_sources)
+Couchdb-1.0.gir: libcouchdb-glib-1.0.la Makefile
+Couchdb_1_0_gir_INCLUDES = GObject-2.0
+Couchdb_1_0_gir_CFLAGS = -I$(top_srcdir) -I$(top_builddir)
+Couchdb_1_0_gir_LIBS = libcouchdb-glib-1.0.la
+Couchdb_1_0_gir_FILES = $(addprefix $(srcdir)/, $(introspection_files))
+INTROSPECTION_GIRS += Couchdb-1.0.gir
+
+girdir = $(INTROSPECTION_GIRDIR)
+gir_DATA = $(INTROSPECTION_GIRS)
+
+typelibsdir = $(INTROSPECTION_TYPELIBDIR)
+typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
+
+CLEANFILES += $(gir_DATA) $(typelibs_DATA)
 endif
diff --git a/couchdb-glib/couchdb-document.h b/couchdb-glib/couchdb-document.h
index 0c2437f..6b429fb 100644
--- a/couchdb-glib/couchdb-document.h
+++ b/couchdb-glib/couchdb-document.h
@@ -26,7 +26,6 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#include <json-glib/json-glib.h>
 #include "couchdb-types.h"
 #include "couchdb-array-field.h"
 #include "couchdb-struct-field.h"
diff --git a/desktopcouch-glib/Makefile.am b/desktopcouch-glib/Makefile.am
index 07405f6..ea8752c 100644
--- a/desktopcouch-glib/Makefile.am
+++ b/desktopcouch-glib/Makefile.am
@@ -1,3 +1,5 @@
+CLEANFILES = $(NULL)
+
 INCLUDES =				\
 	-I$(top_srcdir)/couchdb-glib	\
 	$(COUCHDB_GLIB_CFLAGS)		\
@@ -32,40 +34,27 @@ h_DATA = 				\
 	desktopcouch-glib.h		\
 	desktopcouch-session.h
 
-if HAVE_INTROSPECTION
-
-BUILT_SOURCES = Desktopcouch-1.0.gir Desktopcouch-1.0.typelib
-
-girdir = $(datadir)/gir-1.0
-gir_DATA = Desktopcouch-1.0.gir
+-include $(INTROSPECTION_MAKEFILE)
+INTROSPECTION_GIRS =
+INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) --add-include-path=$(top_srcdir)/couchdb-glib
+INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) --includedir=$(top_builddir)/couchdb-glib
 
-typelibsdir = $(libdir)/girepository-1.0/
-typelibs_DATA = Desktopcouch-1.0.typelib
-
-Desktopcouch-1.0.gir: libdesktopcouch-glib-1.0.la
-	$(INTROSPECTION_SCANNER) -v \
-	--namespace Desktopcouch --nsversion=1.0 \
-	--add-include-path=$(srcdir) \
-	--add-include-path=. \
-	--add-include-path=$(top_srcdir)/couchdb-glib \
-	--include=GObject-2.0 \
-	--include=Json-1.0 \
-	--include=Couchdb-1.0 \
-	--library=desktopcouch-glib-1.0 \
-	--pkg gobject-2.0 \
-	--pkg json-glib-1.0 \
-	--output $@ \
-	-I$(top_srcdir)/couchdb-glib \
-	-l$(top_builddir)/couchdb-glib/libcouchdb-glib-1.0.la \
-	$(h_DATA) \
-	$(libdesktopcouch_glib_1_0_la_headers) \
+if HAVE_INTROSPECTION
+introspection_files =					\
+	$(h_DATA)					\
 	$(libdesktopcouch_glib_1_0_la_SOURCES)
+Desktopcouch-1.0.gir: libdesktopcouch-glib-1.0.la Makefile
+Desktopcouch_1_0_gir_INCLUDES = GObject-2.0 Couchdb-1.0
+Desktopcouch_1_0_gir_CFLAGS = -I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/couchdb-glib -I$(top_builddir)/couchdb-glib
+Desktopcouch_1_0_gir_LIBS = libdesktopcouch-glib-1.0.la
+Desktopcouch_1_0_gir_FILES = $(addprefix $(srcdir)/, $(introspection_files))
+INTROSPECTION_GIRS += Desktopcouch-1.0.gir
+
+girdir = $(INTROSPECTION_GIRDIR)
+gir_DATA = $(INTROSPECTION_GIRS)
 
-Desktopcouch-1.0.typelib: Desktopcouch-1.0.gir
-	LD_LIBRARY_PATH=.libs$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH} \
-	$(INTROSPECTION_COMPILER) \
-	--includedir=$(top_srcdir)/couchdb-glib \
-	--includedir=. \
-	$(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
+typelibsdir = $(INTROSPECTION_TYPELIBDIR)
+typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
 
-endif
+CLEANFILES += $(gir_DATA) $(typelibs_DATA)
+endif
\ No newline at end of file