Fixed build issue: 0.4 still remaining

diff --git a/AUTHORS b/AUTHORS
index d9c2a5089817de72e404fb760f91b17d0cc22094..b2d0bf257d52763ef967195f0498e7ea58349b83 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -24,3 +24,4 @@ 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@gmail.com>

diff --git a/champlain-gtk/Makefile.am b/champlain-gtk/Makefile.am
index 0a64f5c0e4b7a97c2f5ac48d5780254a4a21f07a..365135e8f0556d60d540ca9189006b481152e1af 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.4.la
+lib_LTLIBRARIES = libchamplain-gtk-0.5.la
 
-libchamplain_gtk_0_4_la_SOURCES = \
+libchamplain_gtk_0_5_la_SOURCES = \
        $(CHAMPLAIN_GTK_MARSHAL_LIST)            \
        $(BUILT_SOURCES)                        \
        gtk-champlain-embed.c
 
 noinst_HEADERS = gtk-champlain-embed.h
 
-libchamplain_gtk_0_4_la_LIBADD = $(GTK_DEPS_LIBS)      \
-       $(top_builddir)/champlain/libchamplain-0.4.la
+libchamplain_gtk_0_5_la_LIBADD = $(GTK_DEPS_LIBS)      \
+       $(top_builddir)/champlain/libchamplain-0.5.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.4/champlain-gtk
+libchamplain_includedir=$(includedir)/libchamplain-gtk-0.5/champlain-gtk
 libchamplain_include_HEADERS = champlain-gtk.h gtk-champlain-embed.h
 
-libchamplain_gtk_0_4_la_LDFLAGS= -version-info $(LIBRARY_VERSION)
+libchamplain_gtk_0_5_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.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=. \
        --c-include="$(libchamplain_include_HEADERS)" \
        --include=Clutter-1.0 \
        --include=Gtk-2.0 \
-       --library=champlain-gtk-0.4 \
+       --library=champlain-gtk-0.5 \
        --output $@ \
        --pkg gobject-2.0 \
        --pkg gtk+-2.0 \
-       $(libchamplain_gtk_0_4_la_SOURCES) $(libchamplain_include_HEADERS)
+       $(libchamplain_gtk_0_5_la_SOURCES) $(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 --git a/champlain/Makefile.am b/champlain/Makefile.am
index 26ae16e3ed702cd2e917c39e212db46f54ba0b64..22faef44c3db74df1cfb7989713633a261f0bedd 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.4.la
+lib_LTLIBRARIES = libchamplain-0.5.la
 
 libchamplain_headers = \
        champlain.h                     \
@@ -34,7 +34,7 @@ libchamplain_headers = \
        champlain-version.h
 
 
-libchamplain_0_4_la_SOURCES = \
+libchamplain_0_5_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_4_la_LIBADD = $(DEPS_LIBS) $(SOUP_LIBS) ../tidy/libtidy-1.0.la
+libchamplain_0_5_la_LIBADD = $(DEPS_LIBS) $(SOUP_LIBS) ../tidy/libtidy-1.0.la
 
-libchamplain_includedir = $(includedir)/libchamplain-0.4/champlain
+libchamplain_includedir = $(includedir)/libchamplain-0.5/champlain
 
-libchamplain_0_4_la_LDFLAGS = -version-info $(LIBRARY_VERSION) \
+libchamplain_0_5_la_LDFLAGS = -version-info $(LIBRARY_VERSION) \
        -export-symbols-regex           \
        ^champlain_.*
 
@@ -145,7 +145,7 @@ champlain-enum-types.c: $(libchamplain_headers) Makefile
                        --fhead "#include <glib-object.h>\n" \
                        --fhead "#include \"champlain-enum-types.h\"\n\n" \
                        --fprod "\n/* enumerations from \"@filename@\" */" \
-                       --vhead "static const G@Type@Value _@enum_name@_values[] = {" \
+       --vhead "static const G@Type@Value _@enum_name@_values[] = {" \
                        --vprod "  { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
                        --vtail "  { 0, NULL, NULL }\n};\n\n" \
                        --vtail "GType\n@enum_name@_get_type (void)\n{\n" \
@@ -160,22 +160,22 @@ champlain-enum-types.c: $(libchamplain_headers) Makefile
 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=. \
        --c-include="$(libchamplain_include_HEADERS)" \
        --include=Clutter-1.0 \
        --include=Gtk-2.0 \
-       --library=champlain-0.4 \
+       --library=champlain-0.5 \
        --output $@ \
        --pkg gobject-2.0 \
        --pkg gtk+-2.0 \
-       $(libchamplain_0_4_la_SOURCES) $(libchamplain_include_HEADERS)
+       $(libchamplain_0_5_la_SOURCES) $(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.