[libchamplain: 22/22] Merge branch 'libchamplain-0-4'

[Pierre-Luc Beaudoin <plbeaudoin src gnome org>]

commit f563af2fe35ac83c3811f306107026fde022c5ae
Merge: 52e76f7... 2e8fe8f...
Author: Pierre-Luc Beaudoin <pierre-luc pierlux com>
Date:   Sun Nov 15 23:38:05 2009 -0500

    Merge branch 'libchamplain-0-4'

 AUTHORS                                            |    1 +
 bindings/perl/Champlain/.gitignore                 |    3 +
 bindings/perl/Champlain/Changes                    |    6 +
 bindings/perl/Champlain/MANIFEST.SKIP              |    1 -
 bindings/perl/Champlain/Makefile.PL                |    5 +-
 bindings/perl/Champlain/README                     |    3 +-
 bindings/perl/Champlain/lib/Champlain.pm           |   25 +-
 bindings/perl/Champlain/xs/.gitignore              |    1 -
 bindings/perl/Gtk2-Champlain/.gitignore            |    8 +
 bindings/perl/Gtk2-Champlain/.xs-coverage.ignore   |  208 ++++++++
 bindings/perl/Gtk2-Champlain/COPYING               |  510 ++++++++++++++++++++
 bindings/perl/Gtk2-Champlain/Changes               |    4 +
 bindings/perl/Gtk2-Champlain/MANIFEST              |   13 +
 bindings/perl/Gtk2-Champlain/MANIFEST.SKIP         |   12 +
 bindings/perl/Gtk2-Champlain/Makefile.PL           |  110 +++++
 bindings/perl/Gtk2-Champlain/Makefile.am           |   15 +
 bindings/perl/Gtk2-Champlain/README                |   61 +++
 bindings/perl/Gtk2-Champlain/champlain-gtk-perl.h  |   10 +
 .../perl/Gtk2-Champlain/examples/gtk2-champlain.pl |  207 ++++++++
 bindings/perl/Gtk2-Champlain/lib/Gtk2/Champlain.pm |  103 ++++
 bindings/perl/Gtk2-Champlain/maps                  |    1 +
 .../perl/Gtk2-Champlain/t/Gtk2ChamplainEmbed.t     |   30 ++
 bindings/perl/Gtk2-Champlain/xs/Gtk2Champlain.xs   |    9 +
 .../perl/Gtk2-Champlain/xs/Gtk2ChamplainEmbed.xs   |   13 +
 champlain/champlain-view.c                         |    3 +-
 demos/Makefile.am                                  |    3 +-
 26 files changed, 1346 insertions(+), 19 deletions(-)
---
diff --cc demos/Makefile.am
index a451c09,cbc42a6..24883b4
--- a/demos/Makefile.am
+++ b/demos/Makefile.am
@@@ -6,18 -6,17 +6,17 @@@ AM_CPPFLAGS = $(DEPS_CFLAGS) $(WARN_CFL
  AM_LDFLAGS = $(DEPS_LIBS)
  
  launcher_SOURCES = launcher.c markers.c
 -launcher_LDADD = $(DEPS_LIBS) ../champlain/libchamplain-0.4.la
 +launcher_LDADD = $(DEPS_LIBS) ../champlain/libchamplain-0.5.la
  
  animated_marker_SOURCES = animated-marker.c
 -animated_marker_LDADD = $(DEPS_LIBS) ../champlain/libchamplain-0.4.la
 +animated_marker_LDADD = $(DEPS_LIBS) ../champlain/libchamplain-0.5.la
  
  polygons_SOURCES = polygons.c
 -polygons_LDADD = $(DEPS_LIBS) ../champlain/libchamplain-0.4.la
 +polygons_LDADD = $(DEPS_LIBS) ../champlain/libchamplain-0.5.la
  
  url_marker_SOURCES = url-marker.c
- url_marker_LDADD = $(DEPS_LIBS) ../champlain/libchamplain-0.5.la
  url_marker_CPPFLAGS = $(DEPS_CFLAGS) $(SOUP_CFLAGS)
- url_marker_LDADD = $(SOUP_DEPS_LIBS) $(DEPS_LIBS) ../champlain/libchamplain-0.5.la
 -url_marker_LDADD = $(SOUP_LIBS) $(DEPS_LIBS) ../champlain/libchamplain-0.4.la
++url_marker_LDADD = $(SOUP_LIBS) $(DEPS_LIBS) ../champlain/libchamplain-0.5.la
  
  if ENABLE_GTK
  noinst_PROGRAMS += launcher-gtk