Pass to 0.4

diff --git a/.gitignore b/.gitignore
index a887db04daa1ab84e2fd0732843ffb847bc29f76..73582e86a17b680a6c1098b1a6c96ef3fe1e1e17 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -2,14 +2,7 @@ Makefile
 Makefile.in
 aclocal.m4
 autom4te.cache
-champlain-0.3.pc
-champlain-gtk-0.3.pc
-champlain.pc
-champlain-gtk.pc
-champlain-0.3-uninstalled.pc
-champlain-gtk-0.3-uninstalled.pc
-champlain-uninstalled.pc
-champlain-gtk-uninstalled.pc
+*.pc
 .deps
 .libs
 *.o

diff --git a/champlain-gtk/Makefile.am b/champlain-gtk/Makefile.am
index f38262482317656b0a487057d344ead76a884b59..0a64f5c0e4b7a97c2f5ac48d5780254a4a21f07a 100644 (file)
--- a/champlain-gtk/Makefile.am
+++ b/champlain-gtk/Makefile.am
@@ -8,17 +8,17 @@ CLEANFILES = $(BUILT_SOURCES)
 CHAMPLAIN_GTK_MARSHAL = champlain-gtk-marshal
 CHAMPLAIN_GTK_MARSHAL_LIST = champlain-gtk-marshal.list
 
-lib_LTLIBRARIES = libchamplain-gtk-0.3.la
+lib_LTLIBRARIES = libchamplain-gtk-0.4.la
 
-libchamplain_gtk_0_3_la_SOURCES = \
+libchamplain_gtk_0_4_la_SOURCES = \
        $(CHAMPLAIN_GTK_MARSHAL_LIST)            \
        $(BUILT_SOURCES)                        \
        gtk-champlain-embed.c
 
 noinst_HEADERS = gtk-champlain-embed.h
 
-libchamplain_gtk_0_3_la_LIBADD = $(GTK_DEPS_LIBS)      \
-       $(top_builddir)/champlain/libchamplain-0.3.la
+libchamplain_gtk_0_4_la_LIBADD = $(GTK_DEPS_LIBS)      \
+       $(top_builddir)/champlain/libchamplain-0.4.la
 
 champlain-gtk-marshal.h: $(CHAMPLAIN_GTK_MARSHAL_LIST)
        @GLIB_GENMARSHAL@ --header --prefix=champlain_gtk_marshal $< > $(CHAMPLAIN_GTK_MARSHAL).h
@@ -26,10 +26,10 @@ champlain-gtk-marshal.h: $(CHAMPLAIN_GTK_MARSHAL_LIST)
 champlain-gtk-marshal.c: $(CHAMPLAIN_GTK_MARSHAL_LIST)
        @GLIB_GENMARSHAL@ --body --prefix=champlain_gtk_marshal $< > $(CHAMPLAIN_GTK_MARSHAL).c
 
-libchamplain_includedir=$(includedir)/libchamplain-gtk-0.3/champlain-gtk
+libchamplain_includedir=$(includedir)/libchamplain-gtk-0.4/champlain-gtk
 libchamplain_include_HEADERS = champlain-gtk.h gtk-champlain-embed.h
 
-libchamplain_gtk_0_3_la_LDFLAGS= -version-info $(LIBRARY_VERSION)
+libchamplain_gtk_0_4_la_LDFLAGS= -version-info $(LIBRARY_VERSION)
 
 AM_CPPFLAGS = $(GTK_DEPS_CFLAGS) -I$(top_srcdir) -DCHAMPLAIN_GTK_COMPILATION
 AM_LDFLAGS = $(GTK_DEPS_LIBS) -export-symbols-regex ^gtk_champlain_.*
@@ -39,22 +39,22 @@ EXTRA_DIST = $(CHAMPLAIN_GTK_MARSHAL_LIST)
 if HAVE_INTROSPECTION
 BUILT_GIRSOURCES =
 
-GtkChamplain-0.3.gir: $(INTROSPECTION_SCANNER) libchamplain-gtk-0.3.la
+GtkChamplain-0.4.gir: $(INTROSPECTION_SCANNER) libchamplain-gtk-0.4.la
        $(QUIET_GEN)$(INTROSPECTION_SCANNER) -v \
-       --namespace GtkChamplain --nsversion=0.3 \
+       --namespace GtkChamplain --nsversion=0.4 \
        --strip-prefix=GtkChamplain \
        $(INCLUDES) \
        --add-include-path=$(srcdir) --add-include=path=. \
        --c-include="$(libchamplain_include_HEADERS)" \
        --include=Clutter-1.0 \
        --include=Gtk-2.0 \
-       --library=champlain-gtk-0.3 \
+       --library=champlain-gtk-0.4 \
        --output $@ \
        --pkg gobject-2.0 \
        --pkg gtk+-2.0 \
-       $(libchamplain_gtk_0_3_la_SOURCES) $(libchamplain_include_HEADERS)
+       $(libchamplain_gtk_0_4_la_SOURCES) $(libchamplain_include_HEADERS)
 
-BUILT_GIRSOURCES += GtkChamplain-0.3.gir
+BUILT_GIRSOURCES += GtkChamplain-0.4.gir
 
 # INTROSPECTION_GIRDIR/INTROSPECTION_TYPELIBDIR aren't the right place to
 # install anything - we need to install inside our prefix.

diff --git a/champlain/Makefile.am b/champlain/Makefile.am
index ab414f72cada53bcc8463e55dfe8f0b0a0116fb9..26ae16e3ed702cd2e917c39e212db46f54ba0b64 100644 (file)
--- a/champlain/Makefile.am
+++ b/champlain/Makefile.am
@@ -12,7 +12,7 @@ CLEANFILES = $(BUILT_SOURCES)
 CHAMPLAIN_MARSHAL = champlain-marshal
 CHAMPLAIN_MARSHAL_LIST = champlain-marshal.list
 
-lib_LTLIBRARIES = libchamplain-0.3.la
+lib_LTLIBRARIES = libchamplain-0.4.la
 
 libchamplain_headers = \
        champlain.h                     \
@@ -34,7 +34,7 @@ libchamplain_headers = \
        champlain-version.h
 
 
-libchamplain_0_3_la_SOURCES = \
+libchamplain_0_4_la_SOURCES = \
        $(CHAMPLAIN_MARSHAL_LIST)       \
        $(BUILT_SOURCES)                \
        champlain-debug.c               \
@@ -93,11 +93,11 @@ libchamplain_include_HEADERS = \
        champlain-polygon.h             \
        champlain-version.h
 
-libchamplain_0_3_la_LIBADD = $(DEPS_LIBS) $(SOUP_LIBS) ../tidy/libtidy-1.0.la
+libchamplain_0_4_la_LIBADD = $(DEPS_LIBS) $(SOUP_LIBS) ../tidy/libtidy-1.0.la
 
-libchamplain_includedir = $(includedir)/libchamplain-0.3/champlain
+libchamplain_includedir = $(includedir)/libchamplain-0.4/champlain
 
-libchamplain_0_3_la_LDFLAGS = -version-info $(LIBRARY_VERSION) \
+libchamplain_0_4_la_LDFLAGS = -version-info $(LIBRARY_VERSION) \
        -export-symbols-regex           \
        ^champlain_.*
 
@@ -160,22 +160,22 @@ champlain-enum-types.c: $(libchamplain_headers) Makefile
 if HAVE_INTROSPECTION
 BUILT_GIRSOURCES =
 
-Champlain-0.3.gir: $(INTROSPECTION_SCANNER) libchamplain-0.3.la
+Champlain-0.4.gir: $(INTROSPECTION_SCANNER) libchamplain-0.4.la
        $(QUIET_GEN)$(INTROSPECTION_SCANNER) -v \
-       --namespace Champlain --nsversion=0.3 \
+       --namespace Champlain --nsversion=0.4 \
        --strip-prefix=Champlain \
        $(INCLUDES) \
        --add-include-path=$(srcdir) --add-include=path=. \
        --c-include="$(libchamplain_include_HEADERS)" \
        --include=Clutter-1.0 \
        --include=Gtk-2.0 \
-       --library=champlain-0.3 \
+       --library=champlain-0.4 \
        --output $@ \
        --pkg gobject-2.0 \
        --pkg gtk+-2.0 \
-       $(libchamplain_0_3_la_SOURCES) $(libchamplain_include_HEADERS)
+       $(libchamplain_0_4_la_SOURCES) $(libchamplain_include_HEADERS)
 
-BUILT_GIRSOURCES += Champlain-0.3.gir
+BUILT_GIRSOURCES += Champlain-0.4.gir
 
 # INTROSPECTION_GIRDIR/INTROSPECTION_TYPELIBDIR aren't the right place to
 # install anything - we need to install inside our prefix.

diff --git a/configure.ac b/configure.ac
index 422462c30523756055cdb6b3ba1caa98d16d3103..69efedc195f9f3ba2c6f045a8cebcf37e7a6ce07 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,8 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 m4_define([champlain_major_version], [0])
-m4_define([champlain_minor_version], [3])
-m4_define([champlain_micro_version], [92])
+m4_define([champlain_minor_version], [4])
+m4_define([champlain_micro_version], [0])
 m4_define([champlain_version],
           [champlain_major_version.champlain_minor_version.champlain_micro_version])
 m4_define([api_version],
@@ -28,7 +28,7 @@ AM_PROG_CC_C_O
 AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal])
 
 # Checks for libraries.
-LIBRARY_VERSION=3:3:0
+LIBRARY_VERSION=0:0:0
 # API_VERSION is used to generate pc files only
 API_VERSION=api_version
 CHAMPLAIN_MAJOR_VERSION=champlain_major_version