[libchamplain: 35/35] Merge branch 'libchamplain-0-4'
- From: Pierre-Luc Beaudoin <plbeaudoin src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [libchamplain: 35/35] Merge branch 'libchamplain-0-4'
- Date: Mon, 19 Oct 2009 05:17:20 +0000 (UTC)
commit 92c9a14f24ca162e205546182aa45c57ca82cf95
Merge: 620bdd6... ce9eb65...
Author: Pierre-Luc Beaudoin <pierre-luc pierlux com>
Date: Mon Oct 19 01:16:25 2009 -0400
Merge branch 'libchamplain-0-4'
AUTHORS | 1 +
NEWS | 25 +++++++++
bindings/perl/Champlain/.xs-coverage.ignore | 21 +++++++
bindings/perl/Champlain/Changes | 9 +++-
bindings/perl/Champlain/MANIFEST.SKIP | 6 ++-
bindings/perl/Champlain/lib/Champlain.pm | 2 +-
bindings/perl/Champlain/t/ChamplainMapSource.t | 11 ++--
bindings/perl/Champlain/t/ChamplainMapSourceDesc.t | 4 +-
bindings/perl/Champlain/t/ChamplainView.t | 6 ++-
bindings/perl/Champlain/xs/ChamplainView.xs | 8 +++
bindings/python/champlain/pychamplain-base.defs | 56 ++++++++++---------
champlain-gtk/Makefile.am | 11 +++-
champlain-gtk/gtk-champlain-embed.c | 19 ++++---
champlain/Makefile.am | 11 +++-
champlain/champlain-cache.c | 25 ++++++++-
champlain/champlain-map-source-factory.c | 20 ++++----
champlain/champlain-marker.c | 50 +++++++++++++++++-
champlain/champlain-marker.h | 4 ++
champlain/champlain-network-map-source.c | 36 ++++++++++---
champlain/champlain-selection-layer.c | 49 ++++++++++++++++-
champlain/champlain-view.c | 42 ++++++++++++---
champlain/champlain-view.h | 2 +
champlain/champlain-zoom-level.h | 11 +++--
configure.ac | 2 +-
docs/reference/libchamplain-sections.txt | 1 +
25 files changed, 342 insertions(+), 90 deletions(-)
---
diff --cc AUTHORS
index 446dc4b,afd91dc..2cbaee4
--- a/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 13ae3e1,0cfd454..7ef09c5
--- a/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 d70771e,ae0cc02..a92062e
--- a/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.
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]