all: Bump API and ABI version

diff --git a/Makefile.am b/Makefile.am
index 95cae31..175f9da 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,14 +1,14 @@
 SUBDIRS = src data tests po doc examples
 
-pkgconfig_DATA= rygel-core-2.0.pc rygel-renderer-2.0.pc rygel-server-2.0.pc
+pkgconfig_DATA= rygel-core-2.2.pc rygel-renderer-2.2.pc rygel-server-2.2.pc
 pkgconfigdir = $(libdir)/pkgconfig
 
 if HAVE_GSTREAMER
-pkgconfig_DATA += rygel-renderer-gst-2.0.pc
+pkgconfig_DATA += rygel-renderer-gst-2.2.pc
 endif
 
-EXTRA_DIST = rygel-core-2.0.pc.in rygel-renderer-2.0.pc.in \
-             rygel-server-2.0.pc.in .version
+EXTRA_DIST = rygel-core-2.2.pc.in rygel-renderer-2.2.pc.in \
+             rygel-server-2.2.pc.in .version
 
 DISTCHECK_CONFIGURE_FLAGS =
 

diff --git a/common.am b/common.am
index 9fbd34f..2945d89 100644 (file)
--- a/common.am
+++ b/common.am
@@ -36,7 +36,7 @@ RYGEL_COMMON_DEFINES_CFLAGS = \
 
 RYGEL_COMMON_LIBRYGEL_CORE_VALAFLAGS = \
        --vapidir=$(librygelcoredir) \
-       --pkg rygel-core-2.0 \
+       --pkg rygel-core-2.2 \
        --pkg uuid
 
 RYGEL_COMMON_LIBRYGEL_CORE_CFLAGS = \
@@ -45,12 +45,12 @@ RYGEL_COMMON_LIBRYGEL_CORE_CFLAGS = \
        -I$(top_srcdir)/src/librygel-core
 
 RYGEL_COMMON_LIBRYGEL_CORE_LIBS = \
-       $(top_builddir)/src/librygel-core/librygel-core-2.0.la
+       $(top_builddir)/src/librygel-core/librygel-core-2.2.la
 
 
 RYGEL_COMMON_LIBRYGEL_RENDERER_VALAFLAGS = \
        --vapidir=$(top_srcdir)/src/librygel-renderer \
-       --pkg rygel-renderer-2.0 \
+       --pkg rygel-renderer-2.2 \
        $(RYGEL_COMMON_LIBRYGEL_CORE_VALAFLAGS)
 
 RYGEL_COMMON_LIBRYGEL_RENDERER_CFLAGS = \
@@ -60,12 +60,12 @@ RYGEL_COMMON_LIBRYGEL_RENDERER_CFLAGS = \
 
 RYGEL_COMMON_LIBRYGEL_RENDERER_LIBS = \
        $(RYGEL_COMMON_LIBRYGEL_CORE_LIBS) \
-       $(top_builddir)/src/librygel-renderer/librygel-renderer-2.0.la
+       $(top_builddir)/src/librygel-renderer/librygel-renderer-2.2.la
 
 
 RYGEL_COMMON_LIBRYGEL_RENDERER_GST_VALAFLAGS = \
        --vapidir=$(top_srcdir)/src/librygel-renderer-gst \
-       --pkg rygel-renderer-gst-2.0 \
+       --pkg rygel-renderer-gst-2.2 \
        $(RYGEL_COMMON_LIBRYGEL_RENDERER_VALAFLAGS)
 
 RYGEL_COMMON_LIBRYGEL_RENDERER_GST_CFLAGS = \
@@ -75,12 +75,12 @@ RYGEL_COMMON_LIBRYGEL_RENDERER_GST_CFLAGS = \
 
 RYGEL_COMMON_LIBRYGEL_RENDERER_GST_LIBS = \
        $(RYGEL_COMMON_LIBRYGEL_RENDERER_LIBS) \
-       $(top_builddir)/src/librygel-renderer-gst/librygel-renderer-gst-2.0.la
+       $(top_builddir)/src/librygel-renderer-gst/librygel-renderer-gst-2.2.la
 
 
 RYGEL_COMMON_LIBRYGEL_SERVER_VALAFLAGS = \
        --vapidir=$(top_builddir)/src/librygel-server \
-       --pkg rygel-server-2.0 \
+       --pkg rygel-server-2.2 \
        $(RYGEL_COMMON_LIBRYGEL_CORE_VALAFLAGS)
 
 RYGEL_COMMON_LIBRYGEL_SERVER_CFLAGS = \
@@ -90,7 +90,7 @@ RYGEL_COMMON_LIBRYGEL_SERVER_CFLAGS = \
 
 RYGEL_COMMON_LIBRYGEL_SERVER_LIBS = \
        $(RYGEL_COMMON_LIBRYGEL_CORE_LIBS) \
-       $(top_builddir)/src/librygel-server/librygel-server-2.0.la
+       $(top_builddir)/src/librygel-server/librygel-server-2.2.la
 
 RYGEL_COMMON_BUILD_CONFIG_VALAFLAGS = \
        --vapidir=$(librygelcoredir) \

diff --git a/configure.ac b/configure.ac
index ef93d12..42929df 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -176,7 +176,7 @@ AS_IF([test "x$with_media_engine" = "xgstreamer"],
           ])
 
         RYGEL_ADD_STAMP([src/media-engines/gstreamer/librygel_media_engine_gst_la_vala.stamp])
-        RYGEL_ADD_STAMP([src/librygel-renderer-gst/librygel_renderer_gst_2_0_la_vala.stamp])
+        RYGEL_ADD_STAMP([src/librygel-renderer-gst/librygel_renderer_gst_2_2_la_vala.stamp])
       ],
       [
         RYGEL_DISABLE_PLUGIN([playbin])
@@ -191,9 +191,9 @@ AC_ARG_ENABLE([example-plugins],
 AM_CONDITIONAL([BUILD_EXAMPLE_PLUGINS], [test "x$[]enable_example_plugins" = "xyes"])
 
 dnl Explicitly add stamp files for targets that are not plugins
-RYGEL_ADD_STAMP([src/librygel-core/librygel_core_2_0_la_vala.stamp])
-RYGEL_ADD_STAMP([src/librygel-server/librygel_server_2_0_la_vala.stamp])
-RYGEL_ADD_STAMP([src/librygel-renderer/librygel_renderer_2_0_la_vala.stamp])
+RYGEL_ADD_STAMP([src/librygel-core/librygel_core_2_2_la_vala.stamp])
+RYGEL_ADD_STAMP([src/librygel-server/librygel_server_2_2_la_vala.stamp])
+RYGEL_ADD_STAMP([src/librygel-renderer/librygel_renderer_2_2_la_vala.stamp])
 RYGEL_ADD_STAMP([src/rygel/rygel_vala.stamp])
 RYGEL_ADD_STAMP([src/ui/rygel_preferences_vala.stamp])
 RYGEL_ADD_STAMP([src/media-engines/simple/librygel_media_engine_simple_la_vala.stamp])
@@ -394,9 +394,9 @@ AM_CONDITIONAL(ENABLE_VALADOC, test x$found_valadoc = xyes)
 AC_SUBST([RYGEL_PLUGIN_LINKER_FLAGS],
          ["-module -avoid-version -Wl,-z,defs"])
 AC_SUBST([RYGEL_PLUGIN_DIR],
-         [${libdir}/rygel-2.0/plugins])
+         [${libdir}/rygel-2.2/plugins])
 AC_SUBST([RYGEL_MEDIA_ENGINE_DIR],
-         [${libdir}/rygel-2.0/engines])
+         [${libdir}/rygel-2.2/engines])
 
 AC_CONFIG_FILES([
 Makefile
@@ -432,10 +432,10 @@ doc/reference/librygel-renderer/Makefile
 doc/reference/librygel-server/Makefile
 doc/reference/librygel-renderer-gst/Makefile
 po/Makefile.in
-rygel-core-2.0.pc
-rygel-renderer-2.0.pc
-rygel-server-2.0.pc
-rygel-renderer-gst-2.0.pc
+rygel-core-2.2.pc
+rygel-renderer-2.2.pc
+rygel-server-2.2.pc
+rygel-renderer-gst-2.2.pc
 tests/Makefile
 examples/Makefile
 examples/renderer-plugins/Makefile

diff --git a/doc/reference/doc-build.am b/doc/reference/doc-build.am
index 9e11311..12c1ec4 100644 (file)
--- a/doc/reference/doc-build.am
+++ b/doc/reference/doc-build.am
@@ -14,7 +14,7 @@ VALADOC_FLAGS = --force \
                --pkg rygel-build-config \
                -b $(top_srcdir)/src/lib$(RYGEL_DOCBUILD_MODULE) \
                --package-name lib$(RYGEL_DOCBUILD_MODULE) \
-               --package-version 2.0 \
+               --package-version 2.2 \
                $(VALA_SOURCE_FILES_WITH_PATHS)
 
 
@@ -41,7 +41,7 @@ gtkdoc-gen: $(VALA_SOURCE_FILES_WITH_PATHS) $(RYGEL_GTKDOC_DOCS_XML)
        $(AM_V_GEN)$(VALADOC) \
                -X $(top_srcdir)/src/lib$(RYGEL_DOCBUILD_MODULE)/$(RYGEL_DOCBUILD_MODULE).h \
                $(RYGEL_DOCBUILD_EXTRA_GTKDOC_OPTIONS) \
-               -X -l -X $(top_builddir)/src/lib$(RYGEL_DOCBUILD_MODULE)/.libs/lib$(RYGEL_DOCBUILD_MODULE)-2.0.so \
+               -X -l -X $(top_builddir)/src/lib$(RYGEL_DOCBUILD_MODULE)/.libs/lib$(RYGEL_DOCBUILD_MODULE)-2.2.so \
                -o gtkdoc \
                --doclet gtkdoc \
                $(VALADOC_FLAGS)

diff --git a/doc/reference/librygel-renderer-gst/Makefile.am b/doc/reference/librygel-renderer-gst/Makefile.am
index 0087104..e6e968f 100644 (file)
--- a/doc/reference/librygel-renderer-gst/Makefile.am
+++ b/doc/reference/librygel-renderer-gst/Makefile.am
@@ -19,8 +19,8 @@ RYGEL_DOCBUILD_VALADOC_FLAGS = \
                $(LIBRYGEL_RENDERER_GST_DEPS_VALAFLAGS) \
                $(RYGEL_COMMON_LIBRYGEL_RENDERER_VALAFLAGS)
 
-RYGEL_DOCBUILD_EXTRA_GTKDOC_OPTIONS = -X -l -X $(top_builddir)/src/librygel-core/.libs/librygel-core-2.0.so \
-                                      -X -l -X $(top_builddir)/src/librygel-renderer/.libs/librygel-renderer-2.0.so
+RYGEL_DOCBUILD_EXTRA_GTKDOC_OPTIONS = -X -l -X $(top_builddir)/src/librygel-core/.libs/librygel-core-2.2.so \
+                                      -X -l -X $(top_builddir)/src/librygel-renderer/.libs/librygel-renderer-2.2.so
 RYGEL_GTKDOC_DOCS_XML_EXTRA = $(top_srcdir)/doc/reference/lib$(RYGEL_DOCBUILD_MODULE)/gtkdoc/implementing-renderers-gst.xml
 
 endif

diff --git a/doc/reference/librygel-renderer/Makefile.am b/doc/reference/librygel-renderer/Makefile.am
index e315bde..e26e550 100644 (file)
--- a/doc/reference/librygel-renderer/Makefile.am
+++ b/doc/reference/librygel-renderer/Makefile.am
@@ -17,7 +17,7 @@ RYGEL_DOCBUILD_VALADOC_FLAGS = \
        $(RYGEL_COMMON_LIBRYGEL_CORE_VALAFLAGS) \
        $(RYGEL_COMMON_BUILD_CONFIG_VALAFLAGS)
 
-RYGEL_DOCBUILD_EXTRA_GTKDOC_OPTIONS = -X -l -X $(top_builddir)/src/librygel-core/.libs/librygel-core-2.0.so
+RYGEL_DOCBUILD_EXTRA_GTKDOC_OPTIONS = -X -l -X $(top_builddir)/src/librygel-core/.libs/librygel-core-2.2.so
 
 RYGEL_GTKDOC_DOCS_XML_EXTRA = $(top_srcdir)/doc/reference/lib$(RYGEL_DOCBUILD_MODULE)/gtkdoc/implementing-renderer-plugins.xml \
                $(top_srcdir)/doc/reference/lib$(RYGEL_DOCBUILD_MODULE)/gtkdoc/implementing-renderers.xml

diff --git a/doc/reference/librygel-server/Makefile.am b/doc/reference/librygel-server/Makefile.am
index 476c585..2880f9e 100644 (file)
--- a/doc/reference/librygel-server/Makefile.am
+++ b/doc/reference/librygel-server/Makefile.am
@@ -21,7 +21,7 @@ RYGEL_DOCBUILD_VALADOC_FLAGS = \
                $(RYGEL_COMMON_BUILD_CONFIG_VALAFLAGS)
 
 
-RYGEL_DOCBUILD_EXTRA_GTKDOC_OPTIONS = -X -l -X $(top_builddir)/src/librygel-core/.libs/librygel-core-2.0.so
+RYGEL_DOCBUILD_EXTRA_GTKDOC_OPTIONS = -X -l -X $(top_builddir)/src/librygel-core/.libs/librygel-core-2.2.so
 
 RYGEL_GTKDOC_DOCS_XML_EXTRA = $(top_srcdir)/doc/reference/lib$(RYGEL_DOCBUILD_MODULE)/gtkdoc/implementing-servers.xml \
                $(top_srcdir)/doc/reference/lib$(RYGEL_DOCBUILD_MODULE)/gtkdoc/implementing-server-plugins.xml \

diff --git a/rygel-core-2.0.pc.in b/rygel-core-2.2.pc.in
similarity index 76%
rename from rygel-core-2.0.pc.in
rename to rygel-core-2.2.pc.in
index 6bdbae3..c66c466 100644 (file)
--- a/rygel-core-2.0.pc.in
+++ b/rygel-core-2.2.pc.in
@@ -6,10 +6,10 @@ includedir=@includedir@
 plugindir=@RYGEL_PLUGIN_DIR@
 plugin_ldflags=@RYGEL_PLUGIN_LINKER_FLAGS@
 
-Name: rygel-core-2.0
+Name: rygel-core-2.2
 Description: GNOME (Mobile) UPnP/DLNA Media Server
 Version: @VERSION@
-Libs: -L${libdir} -lrygel-core-2.0
-Cflags: -I${includedir}/rygel-2.0
+Libs: -L${libdir} -lrygel-core-2.2
+Cflags: -I${includedir}/rygel-2.2
 Requires: gupnp-av-1.0 gee-0.8
 Requires.Private: uuid gmodule-2.0

diff --git a/rygel-renderer-2.0.pc.in b/rygel-renderer-2.2.pc.in
similarity index 57%
rename from rygel-renderer-2.0.pc.in
rename to rygel-renderer-2.2.pc.in
index 59da3d7..3706772 100644 (file)
--- a/rygel-renderer-2.0.pc.in
+++ b/rygel-renderer-2.2.pc.in
@@ -3,10 +3,10 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-Name: rygel-renderer-2.0
+Name: rygel-renderer-2.2
 Description: GNOME (Mobile) UPnP/DLNA Media Renderer library
 Version: @VERSION@
-Libs: -L${libdir} -lrygel-renderer-2.0
-Cflags: -I${includedir}/rygel-2.0
-Requires: gupnp-av-1.0 gee-0.8 rygel-core-2.0
+Libs: -L${libdir} -lrygel-renderer-2.2
+Cflags: -I${includedir}/rygel-2.2
+Requires: gupnp-av-1.0 gee-0.8 rygel-core-2.2
 Requires.Private: uuid gmodule-2.0

diff --git a/rygel-renderer-gst-2.0.pc.in b/rygel-renderer-gst-2.2.pc.in
similarity index 54%
rename from rygel-renderer-gst-2.0.pc.in
rename to rygel-renderer-gst-2.2.pc.in
index cc7a52a..8e6e0e8 100644 (file)
--- a/rygel-renderer-gst-2.0.pc.in
+++ b/rygel-renderer-gst-2.2.pc.in
@@ -3,10 +3,10 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-Name: rygel-renderer-gst-2.0
+Name: rygel-renderer-gst-2.2
 Description: GNOME (Mobile) UPnP/DLNA Media Renderer library
 Version: @VERSION@
-Libs: -L${libdir} -lrygel-renderer-gst-2.0
-Cflags: -I${includedir}/rygel-2.0
-Requires: gupnp-av-1.0 gee-0.8 gstreamer-1.0 rygel-core-2.0
+Libs: -L${libdir} -lrygel-renderer-gst-2.2
+Cflags: -I${includedir}/rygel-2.2
+Requires: gupnp-av-1.0 gee-0.8 gstreamer-1.0 rygel-core-2.2
 Requires.Private: uuid gmodule-2.0

diff --git a/rygel-server-2.0.pc.in b/rygel-server-2.2.pc.in
similarity index 62%
rename from rygel-server-2.0.pc.in
rename to rygel-server-2.2.pc.in
index 97c9bef..0324b5a 100644 (file)
--- a/rygel-server-2.0.pc.in
+++ b/rygel-server-2.2.pc.in
@@ -5,10 +5,10 @@ includedir=@includedir@
 
 enginedir=@RYGEL_MEDIA_ENGINE_DIR@
 
-Name: rygel-server-2.0
+Name: rygel-server-2.2
 Description: GNOME (Mobile) UPnP/DLNA Media server library
 Version: @VERSION@
-Libs: -L${libdir} -lrygel-server-2.0
-Cflags: -I${includedir}/rygel-2.0
-Requires: gupnp-av-1.0 gee-0.8 rygel-core-2.0
+Libs: -L${libdir} -lrygel-server-2.2
+Cflags: -I${includedir}/rygel-2.2
+Requires: gupnp-av-1.0 gee-0.8 rygel-core-2.2
 Requires.Private: uuid gmodule-2.0

diff --git a/src/librygel-core/Makefile.am b/src/librygel-core/Makefile.am
index eaca37a..e984488 100644 (file)
--- a/src/librygel-core/Makefile.am
+++ b/src/librygel-core/Makefile.am
@@ -1,25 +1,25 @@
 include $(top_srcdir)/common.am
 include $(srcdir)/filelist.am
 
-librygelincdir = $(includedir)/rygel-2.0
+librygelincdir = $(includedir)/rygel-2.2
 
 librygelinc_HEADERS = rygel-core.h
 
-lib_LTLIBRARIES = librygel-core-2.0.la
+lib_LTLIBRARIES = librygel-core-2.2.la
 
-librygel_core_2_0_la_SOURCES = \
+librygel_core_2_2_la_SOURCES = \
        $(LIBRYGEL_CORE_VAPI_SOURCE_FILES) \
        $(LIBRYGEL_CORE_NONVAPI_SOURCE_FILES)
 
-librygel_core_2_0_la_VALAFLAGS = \
-       -H rygel-core.h -C --library=rygel-core-2.0 \
+librygel_core_2_2_la_VALAFLAGS = \
+       -H rygel-core.h -C --library=rygel-core-2.2 \
        --vapidir=$(srcdir) \
        --pkg uuid \
        --pkg posix \
        $(LIBRYGEL_CORE_DEPS_VALAFLAGS) \
        $(RYGEL_COMMON_VALAFLAGS)
 
-librygel_core_2_0_la_CFLAGS = \
+librygel_core_2_2_la_CFLAGS = \
        $(RYGEL_COMMON_DEFINES_CFLAGS) \
        $(LIBRYGEL_CORE_DEPS_CFLAGS) \
        -DPLUGIN_DIR='"$(plugindir)"' \
@@ -28,24 +28,24 @@ librygel_core_2_0_la_CFLAGS = \
        -include config.h \
        -DG_LOG_DOMAIN='"Rygel"'
 
-librygel_core_2_0_la_LIBADD = \
+librygel_core_2_2_la_LIBADD = \
        $(LIBRYGEL_CORE_DEPS_LIBS)
 
-RYGEL_CORE_VERSION=1:0:0
-librygel_core_2_0_la_LDFLAGS = \
+RYGEL_CORE_VERSION=2:2:0
+librygel_core_2_2_la_LDFLAGS = \
        $(RYGEL_DATA_DIR_DEFINES) \
        -version-info $(RYGEL_CORE_VERSION)
 
 BUILT_SOURCES = \
-       rygel-core-2.0.vapi \
+       rygel-core-2.2.vapi \
        rygel-core.h
 
-VAPI_FILES = rygel-core-2.0.vapi
-DEPS_FILES = rygel-core-2.0.deps
+VAPI_FILES = rygel-core-2.2.vapi
+DEPS_FILES = rygel-core-2.2.deps
 
 vapidir = $(VAPIDIR)
 vapi_DATA = $(VAPI_FILES) $(DEPS_FILES)
-rygel-core-2.0.vapi rygel-core.h: librygel_core_2_0_la_vala.stamp
+rygel-core-2.2.vapi rygel-core.h: librygel_core_2_2_la_vala.stamp
 
 MAINTAINERCLEANFILES += $(BUILT_SOURCES)
 

diff --git a/src/librygel-core/rygel-core-2.0.deps b/src/librygel-core/rygel-core-2.2.deps
similarity index 100%
rename from src/librygel-core/rygel-core-2.0.deps
rename to src/librygel-core/rygel-core-2.2.deps

diff --git a/src/librygel-renderer-gst/Makefile.am b/src/librygel-renderer-gst/Makefile.am
index 40fa5a2..7ad4644 100644 (file)
--- a/src/librygel-renderer-gst/Makefile.am
+++ b/src/librygel-renderer-gst/Makefile.am
@@ -1,37 +1,37 @@
 include $(top_srcdir)/common.am
 include $(srcdir)/filelist.am
 
-librygel_renderer_includedir=$(includedir)/rygel-2.0
+librygel_renderer_includedir=$(includedir)/rygel-2.2
 librygel_renderer_include_HEADERS = rygel-renderer-gst.h
 
-lib_LTLIBRARIES = librygel-renderer-gst-2.0.la
+lib_LTLIBRARIES = librygel-renderer-gst-2.2.la
 
-LIBRYGEL_RENDERER_GST_VERSION=1:0:0
+LIBRYGEL_RENDERER_GST_VERSION=2:2:0
 
-librygel_renderer_gst_2_0_la_SOURCES = \
+librygel_renderer_gst_2_2_la_SOURCES = \
        $(LIBRYGEL_RENDERER_GST_VAPI_SOURCE_FILES) \
        $(LIBRYGEL_RENDERER_GST_NONVAPI_SOURCE_FILES)
 
-librygel_renderer_gst_2_0_la_VALAFLAGS = \
-       -H rygel-renderer-gst.h --library=rygel-renderer-gst-2.0 \
+librygel_renderer_gst_2_2_la_VALAFLAGS = \
+       -H rygel-renderer-gst.h --library=rygel-renderer-gst-2.2 \
        --enable-experimental \
        $(LIBRYGEL_RENDERER_GST_DEPS_VALAFLAGS) \
        $(RYGEL_COMMON_LIBRYGEL_RENDERER_VALAFLAGS) \
        $(RYGEL_COMMON_VALAFLAGS)
-librygel_renderer_gst_2_0_la_CFLAGS = \
+librygel_renderer_gst_2_2_la_CFLAGS = \
        $(LIBRYGEL_RENDERER_GST_DEPS_CFLAGS) \
        $(RYGEL_COMMON_LIBRYGEL_RENDERER_CFLAGS)
-librygel_renderer_gst_2_0_la_LIBADD = \
+librygel_renderer_gst_2_2_la_LIBADD = \
        $(LIBRYGEL_RENDERER_GST_DEPS_LIBS) \
        $(RYGEL_COMMON_LIBRYGEL_RENDERER_LIBS)
-librygel_renderer_gst_2_0_la_LDFLAGS = \
+librygel_renderer_gst_2_2_la_LDFLAGS = \
        -version-info $(LIBRYGEL_RENDERER_GST_VERSION) \
        -DG_LOG_DOMAIN=\"Rygel\"
 
-rygel-renderer-gst.h rygel-renderer-gst-2.0.vapi: \
-       librygel_renderer_gst_2_0_la_vala.stamp
+rygel-renderer-gst.h rygel-renderer-gst-2.2.vapi: \
+       librygel_renderer_gst_2_2_la_vala.stamp
 
 vapidir = $(VAPIDIR)
-vapi_DATA = rygel-renderer-gst-2.0.vapi rygel-renderer-gst-2.0.deps
+vapi_DATA = rygel-renderer-gst-2.2.vapi rygel-renderer-gst-2.2.deps
 
-EXTRA_DIST=rygel-renderer-gst.h rygel-renderer-gst-2.0.vapi rygel-renderer-gst-2.0.deps
+EXTRA_DIST=rygel-renderer-gst.h rygel-renderer-gst-2.2.vapi rygel-renderer-gst-2.2.deps

diff --git a/src/librygel-renderer-gst/rygel-renderer-gst-2.0.deps b/src/librygel-renderer-gst/rygel-renderer-gst-2.0.deps
deleted file mode 100644 (file)
index 6b76b0d..0000000
--- a/src/librygel-renderer-gst/rygel-renderer-gst-2.0.deps
+++ /dev/null
@@ -1,2 +0,0 @@
-rygel-renderer-2.0
-gstreamer-1.0

diff --git a/src/librygel-renderer-gst/rygel-renderer-gst-2.2.deps b/src/librygel-renderer-gst/rygel-renderer-gst-2.2.deps
new file mode 100644 (file)
index 0000000..a19328e
--- /dev/null
+++ b/src/librygel-renderer-gst/rygel-renderer-gst-2.2.deps
@@ -0,0 +1,2 @@
+rygel-renderer-2.2
+gstreamer-1.0

diff --git a/src/librygel-renderer/Makefile.am b/src/librygel-renderer/Makefile.am
index c1248d6..34af5e1 100644 (file)
--- a/src/librygel-renderer/Makefile.am
+++ b/src/librygel-renderer/Makefile.am
@@ -1,35 +1,35 @@
 include $(top_srcdir)/common.am
 include $(srcdir)/filelist.am
 
-librygel_renderer_includedir=$(includedir)/rygel-2.0
+librygel_renderer_includedir=$(includedir)/rygel-2.2
 librygel_renderer_include_HEADERS = rygel-renderer.h
 
-lib_LTLIBRARIES = librygel-renderer-2.0.la
+lib_LTLIBRARIES = librygel-renderer-2.2.la
 
-LIBRYGEL_RENDERER_VERSION=1:0:0
+LIBRYGEL_RENDERER_VERSION=2:2:0
 
-librygel_renderer_2_0_la_SOURCES = \
+librygel_renderer_2_2_la_SOURCES = \
        $(LIBRYGEL_RENDERER_VAPI_SOURCE_FILES) \
        $(LIBRYGEL_RENDERER_NONVAPI_SOURCE_FILES)
 
-librygel_renderer_2_0_la_VALAFLAGS = \
-       -H rygel-renderer.h --library=rygel-renderer-2.0 \
+librygel_renderer_2_2_la_VALAFLAGS = \
+       -H rygel-renderer.h --library=rygel-renderer-2.2 \
        $(LIBRYGEL_RENDERER_DEPS_VALAFLAGS) \
        $(RYGEL_COMMON_LIBRYGEL_CORE_VALAFLAGS) \
        $(RYGEL_COMMON_VALAFLAGS)
-librygel_renderer_2_0_la_CFLAGS = \
+librygel_renderer_2_2_la_CFLAGS = \
        $(LIBRYGEL_RENDERER_DEPS_CFLAGS) \
        $(RYGEL_COMMON_LIBRYGEL_CORE_CFLAGS) \
        -DG_LOG_DOMAIN=\"Rygel\"
-librygel_renderer_2_0_la_LIBADD = \
+librygel_renderer_2_2_la_LIBADD = \
        $(LIBRYGEL_RENDERER_DEPS_LIBS) \
        $(RYGEL_COMMON_LIBRYGEL_CORE_LIBS)
-librygel_renderer_2_0_la_LDFLAGS = \
+librygel_renderer_2_2_la_LDFLAGS = \
        -version-info $(LIBRYGEL_RENDERER_VERSION)
 
 vapidir = $(VAPIDIR)
-vapi_DATA = rygel-renderer-2.0.vapi rygel-renderer-2.0.deps
+vapi_DATA = rygel-renderer-2.2.vapi rygel-renderer-2.2.deps
 
-rygel-renderer.h rygel-renderer-2.0.vapi: librygel_renderer_2_0_la_vala.stamp
+rygel-renderer.h rygel-renderer-2.2.vapi: librygel_renderer_2_2_la_vala.stamp
 
-EXTRA_DIST = rygel-renderer.h rygel-renderer-2.0.vapi rygel-renderer-2.0.deps
+EXTRA_DIST = rygel-renderer.h rygel-renderer-2.2.vapi rygel-renderer-2.2.deps

diff --git a/src/librygel-renderer/rygel-renderer-2.0.deps b/src/librygel-renderer/rygel-renderer-2.0.deps
deleted file mode 100644 (file)
index dd45530..0000000
--- a/src/librygel-renderer/rygel-renderer-2.0.deps
+++ /dev/null
@@ -1 +0,0 @@
-rygel-core-2.0

diff --git a/src/librygel-renderer/rygel-renderer-2.2.deps b/src/librygel-renderer/rygel-renderer-2.2.deps
new file mode 100644 (file)
index 0000000..8fec1aa
--- /dev/null
+++ b/src/librygel-renderer/rygel-renderer-2.2.deps
@@ -0,0 +1 @@
+rygel-core-2.2

diff --git a/src/librygel-server/Makefile.am b/src/librygel-server/Makefile.am
index d083c95..4781ef1 100644 (file)
--- a/src/librygel-server/Makefile.am
+++ b/src/librygel-server/Makefile.am
@@ -1,39 +1,39 @@
 include $(top_srcdir)/common.am
 include $(srcdir)/filelist.am
 
-librygel_server_includedir=$(includedir)/rygel-2.0
+librygel_server_includedir=$(includedir)/rygel-2.2
 librygel_server_include_HEADERS = rygel-server.h
 
-lib_LTLIBRARIES = librygel-server-2.0.la
+lib_LTLIBRARIES = librygel-server-2.2.la
 
-LIBRYGEL_SERVER_VERSION=1:0:0
+LIBRYGEL_SERVER_VERSION=2:2:0
 
-librygel_server_2_0_la_SOURCES = \
+librygel_server_2_2_la_SOURCES = \
        $(LIBRYGEL_SERVER_VAPI_SOURCE_FILES) \
        $(LIBRYGEL_SERVER_NONVAPI_SOURCE_FILES)
 
-librygel_server_2_0_la_VALAFLAGS = \
-       -H rygel-server.h --library=rygel-server-2.0 \
+librygel_server_2_2_la_VALAFLAGS = \
+       -H rygel-server.h --library=rygel-server-2.2 \
        $(LIBRYGEL_SERVER_DEPS_VALAFLAGS) \
        $(RYGEL_COMMON_LIBRYGEL_CORE_VALAFLAGS) \
        $(RYGEL_COMMON_VALAFLAGS)
 
-librygel_server_2_0_la_CFLAGS = \
+librygel_server_2_2_la_CFLAGS = \
        $(LIBRYGEL_SERVER_DEPS_CFLAGS) \
        $(RYGEL_COMMON_LIBRYGEL_CORE_CFLAGS) \
        -DENGINE_DIR='"$(enginedir)"' \
        -DG_LOG_DOMAIN=\"Rygel\"
-librygel_server_2_0_la_LIBADD = \
+librygel_server_2_2_la_LIBADD = \
        $(LIBRYGEL_SERVER_DEPS_LIBS) \
        $(RYGEL_COMMON_LIBRYGEL_CORE_LIBS)
 
-librygel_server_2_0_la_LDFLAGS = \
+librygel_server_2_2_la_LDFLAGS = \
        $(RYGEL_DATA_DIR_DEFINES) \
        -version-info $(LIBRYGEL_SERVER_VERSION)
 
 vapidir = $(VAPIDIR)
-vapi_DATA = rygel-server-2.0.vapi rygel-server-2.0.deps
+vapi_DATA = rygel-server-2.2.vapi rygel-server-2.2.deps
 
-rygel-server.h rygel-server-2.0.vapi: librygel_server_2_0_la_vala.stamp
+rygel-server.h rygel-server-2.2.vapi: librygel_server_2_2_la_vala.stamp
 
-EXTRA_DIST = rygel-server.h rygel-server-2.0.vapi rygel-server-2.0.deps
+EXTRA_DIST = rygel-server.h rygel-server-2.2.vapi rygel-server-2.2.deps

diff --git a/src/librygel-server/rygel-server-2.0.deps b/src/librygel-server/rygel-server-2.2.deps
similarity index 72%
rename from src/librygel-server/rygel-server-2.0.deps
rename to src/librygel-server/rygel-server-2.2.deps
index ed05e34..86fd022 100644 (file)
--- a/src/librygel-server/rygel-server-2.0.deps
+++ b/src/librygel-server/rygel-server-2.2.deps
@@ -1,5 +1,5 @@
 gee-0.8
 gupnp-1.0
 gio-2.0
-rygel-core-2.0
+rygel-core-2.2
 gupnp-av-1.0

diff --git a/src/plugins/playbin/Makefile.am b/src/plugins/playbin/Makefile.am
index 265bee6..be88fa7 100644 (file)
--- a/src/plugins/playbin/Makefile.am
+++ b/src/plugins/playbin/Makefile.am
@@ -5,7 +5,7 @@ plugin_DATA = playbin.plugin
 
 librygel_playbin_la_SOURCES = rygel-playbin-module.vala rygel-playbin-plugin.vala
 librygel_playbin_la_VALAFLAGS = \
-       --pkg rygel-renderer-gst-2.0 \
+       --pkg rygel-renderer-gst-2.2 \
        --vapidir $(top_srcdir)/src/librygel-renderer-gst \
        --enable-experimental \
        $(RYGEL_COMMON_LIBRYGEL_RENDERER_VALAFLAGS) \

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 51ffced..38070c2 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -228,8 +228,8 @@ if BUILD_MEDIA_EXPORT_PLUGIN
 check_PROGRAMS += plugins/media-export/regression
 
 plugins_media_export_regression_SOURCES = \
-       $(top_srcdir)/src/librygel-core/rygel-core-2.0.vapi \
-       $(top_srcdir)/src/librygel-server/rygel-server-2.0.vapi \
+       $(top_srcdir)/src/librygel-core/rygel-core-2.2.vapi \
+       $(top_srcdir)/src/librygel-server/rygel-server-2.2.vapi \
        $(top_srcdir)/src/plugins/media-export/rygel-media-export.vapi \
        plugins/media-export/regression.vala
 plugins_media_export_regression_CFLAGS = \