build: Also bump grl-net and grl-pls to 0.3

Turns out that grilo-plugins expects grl-net and grl-pls to be the same
version as grilo itself, which is likely what a number of applications
also do.

This is easier to deal with than versions changing, and matches what
GLib does for example.

This also fixes a number of lingering references to 0.2 as the major
version number.

10 files changed, 15 insertions, 15 deletions

diff --git a/Makefile.am b/Makefile.am
index 4d11c2d..9f5398e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,14 +21,14 @@ pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = grilo-0.3.pc
 
 if BUILD_GRILO_NET
-pkgconfig_DATA += grilo-net-0.2.pc
+pkgconfig_DATA += grilo-net-0.3.pc
 endif
 
 if BUILD_GRILO_PLS
-pkgconfig_DATA += grilo-pls-0.2.pc
+pkgconfig_DATA += grilo-pls-0.3.pc
 endif
 
-dist_man1_MANS = grl-inspect-0.2.1 grl-launch-0.2.1
+dist_man1_MANS = grl-inspect-0.3.1 grl-launch-0.3.1
 
 MAINTAINERCLEANFILES = \
 	$(GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL) \
diff --git a/configure.ac b/configure.ac
index a96c83a..88a6bcf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,13 +40,13 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 # Grilo Net library
 
-GRLNET_VERSION=0.2.5
+GRLNET_VERSION=grl_major_version.grl_minor_version.grl_micro_version
 AC_SUBST(GRLNET_VERSION)
 AC_DEFINE_UNQUOTED(GRLNET_VERSION, "$GRLNET_VERSION", [Grilo Net library version])
 
 # Grilo Pls library
 
-GRLPLS_VERSION=0.2.2
+GRLPLS_VERSION=grl_major_version.grl_minor_version.grl_micro_version
 AC_SUBST(GRLPLS_VERSION)
 AC_DEFINE_UNQUOTED(GRLPLS_VERSION, "$GRLPLS_VERSION", [Grilo Pls library version])
 
@@ -58,8 +58,8 @@ AC_DEFINE_UNQUOTED(GRLPLS_VERSION, "$GRLPLS_VERSION", [Grilo Pls library version
 # see http://www.gnu.org/software/libtool/manual/html_node/Libtool-versioning.html
 
 GRL_LT_VERSION=10:0:0
-GRLNET_LT_VERSION=1:9:1
-GRLPLS_LT_VERSION=0:4:0
+GRLNET_LT_VERSION=2:0:0
+GRLPLS_LT_VERSION=1:0:0
 
 AC_SUBST([GRL_LT_VERSION])
 AC_SUBST([GRLNET_LT_VERSION])
@@ -276,17 +276,17 @@ AC_SUBST([builddir])
 # ----------------------------------------------------------
 
 if test "x$HAVE_LIBSOUP" = "xyes"; then
-   AC_CONFIG_FILES([grilo-net-uninstalled.pc grilo-net-0.2.pc])
+   AC_CONFIG_FILES([grilo-net-uninstalled.pc grilo-net-$GRL_MAJORMINOR.pc])
 fi
 
 if test "x$HAVE_TOTEM_PL_PARSER" = "xyes"; then
-   AC_CONFIG_FILES([grilo-pls-uninstalled.pc grilo-pls-0.2.pc])
+   AC_CONFIG_FILES([grilo-pls-uninstalled.pc grilo-pls-$GRL_MAJORMINOR.pc])
 fi
 
 AC_CONFIG_FILES([
   Makefile
   grilo-uninstalled.pc
-  grilo-0.3.pc
+  grilo-$GRL_MAJORMINOR.pc
   src/Makefile
   src/data/Makefile
   po/Makefile.in
diff --git a/grilo-net-0.2.pc.in b/grilo-net-0.3.pc.in
index 4a12719..8f2dc16 100644
--- a/grilo-net-0.2.pc.in
+++ b/grilo-net-0.3.pc.in
@@ -11,5 +11,5 @@ Name: Grilo networking library
 Description: Grilo networking helpers for plug-ins
 Requires: @GRL_NAME@
 Version: @GRLNET_VERSION@
-Libs: -L${libdir} -lgrlnet-0.2
+Libs: -L${libdir} -lgrlnet-0.3
 Cflags: -I${includedir}
diff --git a/grilo-net-uninstalled.pc.in b/grilo-net-uninstalled.pc.in
index faf5008..0452707 100644
--- a/grilo-net-uninstalled.pc.in
+++ b/grilo-net-uninstalled.pc.in
@@ -11,5 +11,5 @@ Description: Grilo networking helpers for plug-ins
 Requires: @GRL_NAME@
 Version: @GRLNET_VERSION@
 
-Libs: @abs_top_builddir@/libs/net/libgrlnet-0.2.la
+Libs: @abs_top_builddir@/libs/net/libgrlnet-0.3.la
 Cflags: -I@abs_top_srcdir@/libs -I@abs_top_builddir@/libs
diff --git a/grilo-pls-0.2.pc.in b/grilo-pls-0.3.pc.in
index c25b0a2..88fadaa 100644
--- a/grilo-pls-0.2.pc.in
+++ b/grilo-pls-0.3.pc.in
@@ -11,5 +11,5 @@ Name: Grilo playlist library
 Description: Grilo playlist utility
 Requires: @GRL_NAME@
 Version: @GRLPLS_VERSION@
-Libs: -L${libdir} -lgrlpls-0.2
+Libs: -L${libdir} -lgrlpls-0.3
 Cflags: -I${includedir}
diff --git a/grilo-pls-uninstalled.pc.in b/grilo-pls-uninstalled.pc.in
index cbab596..326e6a6 100644
--- a/grilo-pls-uninstalled.pc.in
+++ b/grilo-pls-uninstalled.pc.in
@@ -11,5 +11,5 @@ Description: Grilo playlist utility
 Requires: @GRL_NAME@
 Version: @GRLPLS_VERSION@
 
-Libs: @abs_top_builddir@/libs/pls/libgrlpls-0.2.la
+Libs: @abs_top_builddir@/libs/pls/libgrlpls-0.3.la
 Cflags: -I@abs_top_srcdir@/libs -I@abs_top_builddir@/libs
diff --git a/grl-inspect-0.2.1 b/grl-inspect-0.3.1
index f7b8f91..f7b8f91 100644
--- a/grl-inspect-0.2.1
+++ b/grl-inspect-0.3.1
diff --git a/grl-launch-0.2.1 b/grl-launch-0.3.1
index ad8305f..ad8305f 100644
--- a/grl-launch-0.2.1
+++ b/grl-launch-0.3.1
diff --git a/tools/grilo-test-ui/Makefile.am b/tools/grilo-test-ui/Makefile.am
index c33da11..a979642 100644
--- a/tools/grilo-test-ui/Makefile.am
+++ b/tools/grilo-test-ui/Makefile.am
@@ -7,7 +7,7 @@
 
 bin_PROGRAMS = grilo-test-ui-@GRL_MAJORMINOR@
 
-dist_man1_MANS = grilo-test-ui-0.2.1
+dist_man1_MANS = grilo-test-ui-0.3.1
 
 grilo_test_ui_@GRL_MAJORMINOR@_SOURCES =	\
 	main.c
diff --git a/tools/grilo-test-ui/grilo-test-ui-0.2.1 b/tools/grilo-test-ui/grilo-test-ui-0.3.1
index 3f0fe41..3f0fe41 100644
--- a/tools/grilo-test-ui/grilo-test-ui-0.2.1
+++ b/tools/grilo-test-ui/grilo-test-ui-0.3.1