[emerillon] Add support for libchamplain 0.12 branch

[Åukasz JernaÅ <ljernas src gnome org>]

commit 3bf8c30d2620eb463ddc9239580ba926a7ce266f
Author: Laurent Bigonville <bigon bigon be>
Date:   Tue Sep 6 15:52:53 2011 +0200

    Add support for libchamplain 0.12 branch
    
    https://bugzilla.gnome.org/show_bug.cgi?id=658354
    
    Signed-off-by: Åukasz JernaÅ <deejay1 srem org>

 bindings/vala/create.sh      |    3 +--
 bindings/vala/emerillon.deps |    3 +--
 configure.ac                 |    8 ++++----
 data/emerillon.pc.in         |    2 +-
 emerillon/Makefile.am        |    2 +-
 5 files changed, 8 insertions(+), 10 deletions(-)
---
diff --git a/bindings/vala/create.sh b/bindings/vala/create.sh
index e24af0f..c0c4075 100755
--- a/bindings/vala/create.sh
+++ b/bindings/vala/create.sh
@@ -1,5 +1,4 @@
 #!/bin/sh
 # Generates the Vala bindings file 'emerillon.vapi' from introspection data (emerillon.gi).
 # emerillon.gi can be generated by 'vala-gen-introspect emerillon emerillon'
-vapigen --library emerillon --pkg champlain-0.10 --pkg gtk+-3.0 --pkg clutter-1.0 emerillon/emerillon.gi
-
+vapigen --library emerillon --pkg champlain-0.12 --pkg gtk+-3.0 --pkg clutter-1.0 emerillon/emerillon.gi
diff --git a/bindings/vala/emerillon.deps b/bindings/vala/emerillon.deps
index 3937d25..abc7cf5 100644
--- a/bindings/vala/emerillon.deps
+++ b/bindings/vala/emerillon.deps
@@ -1,3 +1,2 @@
 gtk+-3.0
-champlain-0.10
-
+champlain-0.12
diff --git a/configure.ac b/configure.ac
index ae17047..3ff600c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -79,8 +79,8 @@ GLIB_REQUIRED=2.25.10
 GTHREAD_REQUIRED=2.12.0
 GTK_REQUIRED=3.0.0
 GCONF_REQUIRED=2.31.1
-CHAMPLAIN_REQUIRED=0.7.1
-CHAMPLAIN_GTK_REQUIRED=0.7.1
+CHAMPLAIN_REQUIRED=0.11.0
+CHAMPLAIN_GTK_REQUIRED=0.11.0
 GEOCLUE_REQUIRED=0.11.1
 PEAS_REQUIRED=1.0
 
@@ -88,8 +88,8 @@ PKG_CHECK_MODULES(EMERILLON, [
     glib-2.0 >= $GLIB_REQUIRED
     gthread-2.0 >= $GTHREAD_REQUIRED
     gtk+-3.0 >= $GTK_REQUIRED
-    champlain-0.10 >= $CHAMPLAIN_REQUIRED
-    champlain-gtk-0.10 >= $CHAMPLAIN_GTK_REQUIRED
+    champlain-0.12 >= $CHAMPLAIN_REQUIRED
+    champlain-gtk-0.12 >= $CHAMPLAIN_GTK_REQUIRED
     geoclue >= $GEOCLUE_REQUIRED
     libpeas-1.0 >= $PEAS_REQUIRED
     libpeas-gtk-1.0 >= $PEAS_REQUIRED
diff --git a/data/emerillon.pc.in b/data/emerillon.pc.in
index 05e9130..9ac02fb 100644
--- a/data/emerillon.pc.in
+++ b/data/emerillon.pc.in
@@ -6,6 +6,6 @@ pluginsdir= libdir@/emerillon/plugins
 
 Name: Emerillon
 Description: A map viewer for the GNOME desktop
-Requires: gtk+-3.0, clutter-1.0, champlain-0.10
+Requires: gtk+-3.0, clutter-1.0, champlain-0.12
 Version: @VERSION@
 Cflags: -I${includedir}
diff --git a/emerillon/Makefile.am b/emerillon/Makefile.am
index 6052a52..a8e53d8 100644
--- a/emerillon/Makefile.am
+++ b/emerillon/Makefile.am
@@ -61,7 +61,7 @@ Emerillon_0_1_gir_NAMESPACE = Emerillon
 Emerillon_0_1_gir_VERSION = 0.1
 Emerillon_0_1_gir_PROGRAM = ./emerillon
 Emerillon_0_1_gir_FILES = $(introspection_sources)
-Emerillon_0_1_gir_INCLUDES = GObject-2.0 Gtk-3.0 Champlain-0.10
+Emerillon_0_1_gir_INCLUDES = GObject-2.0 Gtk-3.0 Champlain-0.12
 Emerillon_0_1_gir_CFLAGS = -DEMERILLON_COMPILATION -I$(top_srcdir)
 INTROSPECTION_GIRS += Emerillon-0.1.gir