Merge branch 'libchamplain-0-4'

diff --cc AUTHORS
index 446dc4ba109caf9152cf1f25302cc12cd0b274ca,afd91dc938c6e9a113f8de537bca79e584b0ea54..2cbaee49d099dec5d0d246f2aff35d0cfbb16f68
--- 1/AUTHORS
--- 2/AUTHORS
+++ b/AUTHORS
@@@ -24,5 -24,5 +24,6 @@@ Frederic Peters <fpeters@0d.be
  Cosimo Cecchi <cosimoc@gnome.org>
  Vincent Untz <vuntz@gnome.org>
  Felix Riemann <friemann@gnome.org>
 +Cédric Bosdonnat <cedric.bosdonnat@free.fr>
  Halton Huo <halton.huo@sun.com>
+ Bruce Cowan <bcowan@fastmail.co.uk>

diff --cc champlain-gtk/Makefile.am
index 13ae3e18b4268a6893a2c4c7821d35eb3216cebc,0cfd454ad3ad737225e08c45593fe6eac70c97cf..7ef09c50d790cdca66c7b216da8cd2e6cfdacf1c
--- 1/champlain-gtk/Makefile.am
--- 2/champlain-gtk/Makefile.am
+++ b/champlain-gtk/Makefile.am
@@@ -39,23 -39,28 +39,28 @@@ EXTRA_DIST = $(CHAMPLAIN_GTK_MARSHAL_LI
  if HAVE_INTROSPECTION
  BUILT_GIRSOURCES =
  
 -GtkChamplain-0.4.gir: $(INTROSPECTION_SCANNER) libchamplain-gtk-0.4.la
 +GtkChamplain-0.5.gir: $(INTROSPECTION_SCANNER) libchamplain-gtk-0.5.la
        $(QUIET_GEN)$(INTROSPECTION_SCANNER) -v \
 -      --namespace GtkChamplain --nsversion=0.4 \
 +      --namespace GtkChamplain --nsversion=0.5 \
        --strip-prefix=GtkChamplain \
-       $(INCLUDES) \
-       --add-include-path=$(srcdir) --add-include=path=. \
+       $(GTK_DEPS_CFLAGS) \
+       $(SOUP_CFLAGS) \
+       -I$(top_srcdir)                 \
+       -DCHAMPLAIN_COMPILATION         \
+       --add-include-path=$(builddir) \
        --c-include="$(libchamplain_include_HEADERS)" \
+       --include=Champlain-0.4 \
        --include=Clutter-1.0 \
        --include=Gtk-2.0 \
 -      --library=champlain-gtk-0.4 \
 +      --library=champlain-gtk-0.5 \
        --libtool="$(LIBTOOL)" \
        --output $@ \
        --pkg gobject-2.0 \
        --pkg gtk+-2.0 \
-       $(libchamplain_gtk_0_5_la_SOURCES) $(libchamplain_include_HEADERS)
 -      $(addprefix $(srcdir)/,$(libchamplain_gtk_0_4_la_SOURCES)) \
++      $(addprefix $(srcdir)/,$(libchamplain_gtk_0_5_la_SOURCES)) \
+       $(addprefix $(srcdir)/,$(libchamplain_include_HEADERS))
  
 -BUILT_GIRSOURCES += GtkChamplain-0.4.gir
 +BUILT_GIRSOURCES += GtkChamplain-0.5.gir
  
  # INTROSPECTION_GIRDIR/INTROSPECTION_TYPELIBDIR aren't the right place to
  # install anything - we need to install inside our prefix.

diff --cc champlain/Makefile.am
index d70771e3567c04f7cbdbe82ceff88214c5112d26,ae0cc02eefb8cd68c20618536a3db4d3146e2ba1..a92062ee0eb58c869f6f8990cac7becc9b936dd9
--- 1/champlain/Makefile.am
--- 2/champlain/Makefile.am
+++ b/champlain/Makefile.am
@@@ -160,12 -160,16 +160,16 @@@ champlain-enum-types.c: $(libchamplain_
  if HAVE_INTROSPECTION
  BUILT_GIRSOURCES =
  
 -Champlain-0.4.gir: $(INTROSPECTION_SCANNER) libchamplain-0.4.la
 +Champlain-0.5.gir: $(INTROSPECTION_SCANNER) libchamplain-0.5.la
        $(QUIET_GEN)$(INTROSPECTION_SCANNER) -v \
 -      --namespace Champlain --nsversion=0.4 \
 +      --namespace Champlain --nsversion=0.5 \
        --strip-prefix=Champlain \
-       $(INCLUDES) \
-       --add-include-path=$(srcdir) --add-include=path=. \
+       $(DEPS_CFLAGS) \
+       $(SOUP_CFLAGS) \
+       -I$(top_srcdir)/tidy            \
+       -I$(top_srcdir)                 \
+       -DCHAMPLAIN_COMPILATION         \
+       --add-include-path=$(builddir) \
        --c-include="$(libchamplain_include_HEADERS)" \
        --include=Clutter-1.0 \
        --include=Gtk-2.0 \
@@@ -174,9 -178,10 +178,10 @@@
        --output $@ \
        --pkg gobject-2.0 \
        --pkg gtk+-2.0 \
-       $(libchamplain_0_5_la_SOURCES) $(libchamplain_include_HEADERS)
 -      $(addprefix $(srcdir)/,$(libchamplain_0_4_la_SOURCES)) \
++      $(addprefix $(srcdir)/,$(libchamplain_0_5_la_SOURCES)) \
+       $(addprefix $(srcdir)/,$(libchamplain_include_HEADERS))
  
 -BUILT_GIRSOURCES += Champlain-0.4.gir
 +BUILT_GIRSOURCES += Champlain-0.5.gir
  
  # INTROSPECTION_GIRDIR/INTROSPECTION_TYPELIBDIR aren't the right place to
  # install anything - we need to install inside our prefix.

diff --cc configure.ac
Simple merge