GNOME.org
 

[rygel] all: Bump ABI/API version

commit c47611f18b566cad26427068131b5900cf4dee3b
Author: Jens Georg <mail jensge org>
Date:   Sun Nov 9 14:37:57 2014 +0100

    all: Bump ABI/API version
    
    Signed-off-by: Jens Georg <mail jensge org>

 Makefile.am                                        |    8 ++--
 common.am                                          |   16 ++++----
 configure.ac                                       |   20 +++++-----
 doc/reference/doc-build.am                         |    4 +-
 doc/reference/librygel-renderer-gst/Makefile.am    |    4 +-
 doc/reference/librygel-renderer/Makefile.am        |    2 +-
 doc/reference/librygel-server/Makefile.am          |    2 +-
 rygel-core-2.4.pc.in => rygel-core-2.6.pc.in       |    6 ++--
 ...-renderer-2.4.pc.in => rygel-renderer-2.6.pc.in |    8 ++--
 ...r-gst-2.4.pc.in => rygel-renderer-gst-2.6.pc.in |    8 ++--
 rygel-server-2.4.pc.in => rygel-server-2.6.pc.in   |    8 ++--
 src/librygel-core/Makefile.am                      |   36 ++++++++++----------
 .../{rygel-core-2.4.deps => rygel-core-2.6.deps}   |    0
 src/librygel-renderer-gst/Makefile.am              |   24 ++++++------
 .../rygel-renderer-gst-2.4.deps                    |    2 -
 .../rygel-renderer-gst-2.6.deps                    |    2 +
 src/librygel-renderer/Makefile.am                  |   32 +++++++++---------
 src/librygel-renderer/rygel-renderer-2.4.deps      |    2 -
 src/librygel-renderer/rygel-renderer-2.6.deps      |    2 +
 src/librygel-ruih/Makefile.am                      |    2 +-
 src/librygel-ruih/rygel-ruih-2.0.deps              |    2 +-
 src/librygel-server/Makefile.am                    |   32 +++++++++---------
 ...rygel-server-2.4.deps => rygel-server-2.6.deps} |    2 +-
 src/plugins/playbin/Makefile.am                    |    2 +-
 tests/Makefile.am                                  |    4 +-
 25 files changed, 115 insertions(+), 115 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 67d7bda..21d1d26 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,14 +1,14 @@
 SUBDIRS = src data tests po doc examples
 
-pkgconfig_DATA= rygel-core-2.4.pc rygel-renderer-2.4.pc rygel-server-2.4.pc
+pkgconfig_DATA= rygel-core-2.6.pc rygel-renderer-2.6.pc rygel-server-2.6.pc
 pkgconfigdir = $(libdir)/pkgconfig
 
 if HAVE_GSTREAMER
-pkgconfig_DATA += rygel-renderer-gst-2.4.pc
+pkgconfig_DATA += rygel-renderer-gst-2.6.pc
 endif
 
-EXTRA_DIST = rygel-core-2.4.pc.in rygel-renderer-2.4.pc.in \
-             rygel-server-2.4.pc.in .version \
+EXTRA_DIST = rygel-core-2.6.pc.in rygel-renderer-2.6.pc.in \
+             rygel-server-2.6.pc.in .version \
              build-aux/git-version-gen
 
 DISTCHECK_CONFIGURE_FLAGS =
diff --git a/common.am b/common.am
index 53b7ebc..1c319d1 100644
--- a/common.am
+++ b/common.am
@@ -37,7 +37,7 @@ RYGEL_COMMON_DEFINES_CFLAGS = \
 
 RYGEL_COMMON_LIBRYGEL_CORE_VALAFLAGS = \
        --vapidir=$(librygelcoredir) \
-       --pkg rygel-core-2.4 \
+       --pkg rygel-core-2.6 \
        --pkg uuid
 
 RYGEL_COMMON_LIBRYGEL_CORE_CFLAGS = \
@@ -46,12 +46,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.4.la
+       $(top_builddir)/src/librygel-core/librygel-core-2.6.la
 
 
 RYGEL_COMMON_LIBRYGEL_RENDERER_VALAFLAGS = \
        --vapidir=$(top_srcdir)/src/librygel-renderer \
-       --pkg rygel-renderer-2.4 \
+       --pkg rygel-renderer-2.6 \
        $(RYGEL_COMMON_LIBRYGEL_CORE_VALAFLAGS)
 
 RYGEL_COMMON_LIBRYGEL_RENDERER_CFLAGS = \
@@ -61,12 +61,12 @@ RYGEL_COMMON_LIBRYGEL_RENDERER_CFLAGS = \
 
 RYGEL_COMMON_LIBRYGEL_RENDERER_LIBS = \
        $(RYGEL_COMMON_LIBRYGEL_CORE_LIBS) \
-       $(top_builddir)/src/librygel-renderer/librygel-renderer-2.4.la
+       $(top_builddir)/src/librygel-renderer/librygel-renderer-2.6.la
 
 
 RYGEL_COMMON_LIBRYGEL_RENDERER_GST_VALAFLAGS = \
        --vapidir=$(top_srcdir)/src/librygel-renderer-gst \
-       --pkg rygel-renderer-gst-2.4 \
+       --pkg rygel-renderer-gst-2.6 \
        $(RYGEL_COMMON_LIBRYGEL_RENDERER_VALAFLAGS)
 
 RYGEL_COMMON_LIBRYGEL_RENDERER_GST_CFLAGS = \
@@ -76,12 +76,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.4.la
+       $(top_builddir)/src/librygel-renderer-gst/librygel-renderer-gst-2.6.la
 
 
 RYGEL_COMMON_LIBRYGEL_SERVER_VALAFLAGS = \
        --vapidir=$(top_builddir)/src/librygel-server \
-       --pkg rygel-server-2.4 \
+       --pkg rygel-server-2.6 \
        $(RYGEL_COMMON_LIBRYGEL_CORE_VALAFLAGS)
 
 RYGEL_COMMON_LIBRYGEL_SERVER_CFLAGS = \
@@ -91,7 +91,7 @@ RYGEL_COMMON_LIBRYGEL_SERVER_CFLAGS = \
 
 RYGEL_COMMON_LIBRYGEL_SERVER_LIBS = \
        $(RYGEL_COMMON_LIBRYGEL_CORE_LIBS) \
-       $(top_builddir)/src/librygel-server/librygel-server-2.4.la
+       $(top_builddir)/src/librygel-server/librygel-server-2.6.la
 
 RYGEL_COMMON_LIBRYGEL_RUIH_VALAFLAGS = \
         --vapidir=$(top_builddir)/src/librygel-ruih \
diff --git a/configure.ac b/configure.ac
index 756b2a2..25e8a29 100644
--- a/configure.ac
+++ b/configure.ac
@@ -197,7 +197,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_4_la_vala.stamp])
+        RYGEL_ADD_STAMP([src/librygel-renderer-gst/librygel_renderer_gst_2_6_la_vala.stamp])
       ],
       [
         RYGEL_DISABLE_PLUGIN([playbin])
@@ -212,9 +212,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_4_la_vala.stamp])
-RYGEL_ADD_STAMP([src/librygel-server/librygel_server_2_4_la_vala.stamp])
-RYGEL_ADD_STAMP([src/librygel-renderer/librygel_renderer_2_4_la_vala.stamp])
+RYGEL_ADD_STAMP([src/librygel-core/librygel_core_2_6_la_vala.stamp])
+RYGEL_ADD_STAMP([src/librygel-server/librygel_server_2_6_la_vala.stamp])
+RYGEL_ADD_STAMP([src/librygel-renderer/librygel_renderer_2_6_la_vala.stamp])
 RYGEL_ADD_STAMP([src/librygel-ruih/librygel_ruih_2_0_la_vala.stamp])
 RYGEL_ADD_STAMP([src/rygel/rygel_vala.stamp])
 RYGEL_ADD_STAMP([src/ui/rygel_preferences_vala.stamp])
@@ -423,9 +423,9 @@ AM_CONDITIONAL(ENABLE_VALADOC, test x$found_valadoc = xyes)
 AC_SUBST([RYGEL_PLUGIN_LINKER_FLAGS],
          ["-module -avoid-version"])
 AC_SUBST([RYGEL_PLUGIN_DIR],
-         [${libdir}/rygel-2.4/plugins])
+         [${libdir}/rygel-2.6/plugins])
 AC_SUBST([RYGEL_MEDIA_ENGINE_DIR],
-         [${libdir}/rygel-2.4/engines])
+         [${libdir}/rygel-2.6/engines])
 
 AC_CONFIG_FILES([
 Makefile
@@ -463,10 +463,10 @@ doc/reference/librygel-renderer/Makefile
 doc/reference/librygel-server/Makefile
 doc/reference/librygel-renderer-gst/Makefile
 po/Makefile.in
-rygel-core-2.4.pc
-rygel-renderer-2.4.pc
-rygel-server-2.4.pc
-rygel-renderer-gst-2.4.pc
+rygel-core-2.6.pc
+rygel-renderer-2.6.pc
+rygel-server-2.6.pc
+rygel-renderer-gst-2.6.pc
 rygel-ruih-1.0.pc
 tests/Makefile
 examples/Makefile
diff --git a/doc/reference/doc-build.am b/doc/reference/doc-build.am
index 60e60b8..1522e3d 100644
--- 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.4 \
+               --package-version 2.6 \
                $(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.4.so \
+               -X -l -X 
$(top_builddir)/src/lib$(RYGEL_DOCBUILD_MODULE)/.libs/lib$(RYGEL_DOCBUILD_MODULE)-2.6.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 97d77a6..eba0b8d 100644
--- 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.4.so \
-                                      -X -l -X 
$(top_builddir)/src/librygel-renderer/.libs/librygel-renderer-2.4.so
+RYGEL_DOCBUILD_EXTRA_GTKDOC_OPTIONS = -X -l -X $(top_builddir)/src/librygel-core/.libs/librygel-core-2.6.so \
+                                      -X -l -X 
$(top_builddir)/src/librygel-renderer/.libs/librygel-renderer-2.6.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 59b36b8..1f68988 100644
--- 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.4.so
+RYGEL_DOCBUILD_EXTRA_GTKDOC_OPTIONS = -X -l -X $(top_builddir)/src/librygel-core/.libs/librygel-core-2.6.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 f789c1e..3e32956 100644
--- 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.4.so
+RYGEL_DOCBUILD_EXTRA_GTKDOC_OPTIONS = -X -l -X $(top_builddir)/src/librygel-core/.libs/librygel-core-2.6.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.4.pc.in b/rygel-core-2.6.pc.in
similarity index 76%
rename from rygel-core-2.4.pc.in
rename to rygel-core-2.6.pc.in
index a23e83b..24125b9 100644
--- a/rygel-core-2.4.pc.in
+++ b/rygel-core-2.6.pc.in
@@ -6,10 +6,10 @@ includedir= includedir@
 plugindir= RYGEL_PLUGIN_DIR@
 plugin_ldflags= RYGEL_PLUGIN_LINKER_FLAGS@
 
-Name: rygel-core-2.4
+Name: rygel-core-2.6
 Description: GNOME (Mobile) UPnP/DLNA Media Server
 Version: @VERSION@
-Libs: -L${libdir} -lrygel-core-2.4
-Cflags: -I${includedir}/rygel-2.4
+Libs: -L${libdir} -lrygel-core-2.6
+Cflags: -I${includedir}/rygel-2.6
 Requires: gupnp-av-1.0 gee-0.8
 Requires.Private: uuid gmodule-2.0
diff --git a/rygel-renderer-2.4.pc.in b/rygel-renderer-2.6.pc.in
similarity index 57%
rename from rygel-renderer-2.4.pc.in
rename to rygel-renderer-2.6.pc.in
index 19b5def..15f4a56 100644
--- a/rygel-renderer-2.4.pc.in
+++ b/rygel-renderer-2.6.pc.in
@@ -3,10 +3,10 @@ exec_prefix= exec_prefix@
 libdir= libdir@
 includedir= includedir@
 
-Name: rygel-renderer-2.4
+Name: rygel-renderer-2.6
 Description: GNOME (Mobile) UPnP/DLNA Media Renderer library
 Version: @VERSION@
-Libs: -L${libdir} -lrygel-renderer-2.4
-Cflags: -I${includedir}/rygel-2.4
-Requires: gupnp-av-1.0 gee-0.8 rygel-core-2.4
+Libs: -L${libdir} -lrygel-renderer-2.6
+Cflags: -I${includedir}/rygel-2.6
+Requires: gupnp-av-1.0 gee-0.8 rygel-core-2.6
 Requires.Private: uuid gmodule-2.0
diff --git a/rygel-renderer-gst-2.4.pc.in b/rygel-renderer-gst-2.6.pc.in
similarity index 54%
rename from rygel-renderer-gst-2.4.pc.in
rename to rygel-renderer-gst-2.6.pc.in
index 7b91db8..30a7c0b 100644
--- a/rygel-renderer-gst-2.4.pc.in
+++ b/rygel-renderer-gst-2.6.pc.in
@@ -3,10 +3,10 @@ exec_prefix= exec_prefix@
 libdir= libdir@
 includedir= includedir@
 
-Name: rygel-renderer-gst-2.4
+Name: rygel-renderer-gst-2.6
 Description: GNOME (Mobile) UPnP/DLNA Media Renderer library
 Version: @VERSION@
-Libs: -L${libdir} -lrygel-renderer-gst-2.4
-Cflags: -I${includedir}/rygel-2.4
-Requires: gupnp-av-1.0 gee-0.8 gstreamer-1.0 rygel-core-2.4
+Libs: -L${libdir} -lrygel-renderer-gst-2.6
+Cflags: -I${includedir}/rygel-2.6
+Requires: gupnp-av-1.0 gee-0.8 gstreamer-1.0 rygel-core-2.6
 Requires.Private: uuid gmodule-2.0
diff --git a/rygel-server-2.4.pc.in b/rygel-server-2.6.pc.in
similarity index 62%
rename from rygel-server-2.4.pc.in
rename to rygel-server-2.6.pc.in
index e6904ce..5bdeab0 100644
--- a/rygel-server-2.4.pc.in
+++ b/rygel-server-2.6.pc.in
@@ -5,10 +5,10 @@ includedir= includedir@
 
 enginedir= RYGEL_MEDIA_ENGINE_DIR@
 
-Name: rygel-server-2.4
+Name: rygel-server-2.6
 Description: GNOME (Mobile) UPnP/DLNA Media server library
 Version: @VERSION@
-Libs: -L${libdir} -lrygel-server-2.4
-Cflags: -I${includedir}/rygel-2.4
-Requires: gupnp-av-1.0 gee-0.8 rygel-core-2.4
+Libs: -L${libdir} -lrygel-server-2.6
+Cflags: -I${includedir}/rygel-2.6
+Requires: gupnp-av-1.0 gee-0.8 rygel-core-2.6
 Requires.Private: uuid gmodule-2.0
diff --git a/src/librygel-core/Makefile.am b/src/librygel-core/Makefile.am
index 4f4af9b..88eb419 100644
--- 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.4
+librygelincdir = $(includedir)/rygel-2.6
 
 librygelinc_HEADERS = rygel-core.h
 
-lib_LTLIBRARIES = librygel-core-2.4.la
+lib_LTLIBRARIES = librygel-core-2.6.la
 
-librygel_core_2_4_la_SOURCES = \
+librygel_core_2_6_la_SOURCES = \
        $(LIBRYGEL_CORE_VAPI_SOURCE_FILES) \
        $(LIBRYGEL_CORE_NONVAPI_SOURCE_FILES)
 
-librygel_core_2_4_la_VALAFLAGS = \
-       -H rygel-core.h -C --library=rygel-core-2.4 \
-       --gir=Rygel-2.4.gir \
+librygel_core_2_6_la_VALAFLAGS = \
+       -H rygel-core.h -C --library=rygel-core-2.6 \
+       --gir=Rygel-2.6.gir \
        --vapidir=$(srcdir) \
        --pkg uuid \
        $(LIBRYGEL_CORE_DEPS_VALAFLAGS) \
        $(RYGEL_COMMON_VALAFLAGS)
 
-librygel_core_2_4_la_CFLAGS = \
+librygel_core_2_6_la_CFLAGS = \
        $(RYGEL_COMMON_DEFINES_CFLAGS) \
        $(LIBRYGEL_CORE_DEPS_CFLAGS) \
        -DPLUGIN_DIR='"$(plugindir)"' \
@@ -28,34 +28,34 @@ librygel_core_2_4_la_CFLAGS = \
        -include config.h \
        -DG_LOG_DOMAIN='"Rygel"'
 
-librygel_core_2_4_la_LIBADD = \
+librygel_core_2_6_la_LIBADD = \
        $(LIBRYGEL_CORE_DEPS_LIBS) \
        -lm
 
 RYGEL_CORE_VERSION=2:4:0
-librygel_core_2_4_la_LDFLAGS = \
+librygel_core_2_6_la_LDFLAGS = \
        $(RYGEL_DATA_DIR_DEFINES) \
        -version-info $(RYGEL_CORE_VERSION)
 
 BUILT_SOURCES = \
-       rygel-core-2.4.vapi \
+       rygel-core-2.6.vapi \
        rygel-core.h
 
-VAPI_FILES = rygel-core-2.4.vapi
-DEPS_FILES = rygel-core-2.4.deps
+VAPI_FILES = rygel-core-2.6.vapi
+DEPS_FILES = rygel-core-2.6.deps
 
 vapidir = $(VAPIDIR)
 vapi_DATA = $(VAPI_FILES) $(DEPS_FILES)
-rygel-core-2.4.vapi rygel-core.h Rygel-2.4.gir: librygel_core_2_4_la_vala.stamp
+rygel-core-2.6.vapi rygel-core.h Rygel-2.6.gir: librygel_core_2_6_la_vala.stamp
 
 -include $(INTROSPECTION_MAKEFILE)
 INTROSPECTION_GIRS=
 INTROSPECTION_SCANNER_ARGS=
-INTROSPECTION_COMPILER_ARGS= -l librygel-core-2.4.so.2
+INTROSPECTION_COMPILER_ARGS= -l librygel-core-2.6.so.2
 if HAVE_INTROSPECTION
-$(builddir)/RygelCore-2.4.gir: $(srcdir)/Rygel-2.4.gir
+$(builddir)/RygelCore-2.6.gir: $(srcdir)/Rygel-2.6.gir
        $(AM_V_GEN)$(SED) -e 's,Rygel\.,RygelCore.,g' -e 's,namespace name="Rygel",namespace 
name="RygelCore",g' $< >$@
-GIRS = RygelCore-2.4.gir
+GIRS = RygelCore-2.6.gir
 
 girdir=$(datadir)/gir-1.0
 dist_gir_DATA = $(GIRS)
@@ -75,5 +75,5 @@ EXTRA_DIST = \
        $(DEPS_FILES) \
        uuid.vapi \
        $(BUILT_SOURCES) \
-       RygelCore-2.4.gir \
-       Rygel-2.4.gir
+       RygelCore-2.6.gir \
+       Rygel-2.6.gir
diff --git a/src/librygel-core/rygel-core-2.4.deps b/src/librygel-core/rygel-core-2.6.deps
similarity index 100%
rename from src/librygel-core/rygel-core-2.4.deps
rename to src/librygel-core/rygel-core-2.6.deps
diff --git a/src/librygel-renderer-gst/Makefile.am b/src/librygel-renderer-gst/Makefile.am
index 2db1a78..9ee032e 100644
--- 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.4
+librygel_renderer_includedir=$(includedir)/rygel-2.6
 librygel_renderer_include_HEADERS = rygel-renderer-gst.h
 
-lib_LTLIBRARIES = librygel-renderer-gst-2.4.la
+lib_LTLIBRARIES = librygel-renderer-gst-2.6.la
 
 LIBRYGEL_RENDERER_GST_VERSION=2:4:0
 
-librygel_renderer_gst_2_4_la_SOURCES = \
+librygel_renderer_gst_2_6_la_SOURCES = \
        $(LIBRYGEL_RENDERER_GST_VAPI_SOURCE_FILES) \
        $(LIBRYGEL_RENDERER_GST_NONVAPI_SOURCE_FILES)
 
-librygel_renderer_gst_2_4_la_VALAFLAGS = \
-       -H rygel-renderer-gst.h --library=rygel-renderer-gst-2.4 \
+librygel_renderer_gst_2_6_la_VALAFLAGS = \
+       -H rygel-renderer-gst.h --library=rygel-renderer-gst-2.6 \
        --enable-experimental \
        $(LIBRYGEL_RENDERER_GST_DEPS_VALAFLAGS) \
        $(RYGEL_COMMON_LIBRYGEL_RENDERER_VALAFLAGS) \
        $(RYGEL_COMMON_VALAFLAGS)
-librygel_renderer_gst_2_4_la_CFLAGS = \
+librygel_renderer_gst_2_6_la_CFLAGS = \
        $(LIBRYGEL_RENDERER_GST_DEPS_CFLAGS) \
        $(RYGEL_COMMON_LIBRYGEL_RENDERER_CFLAGS)
-librygel_renderer_gst_2_4_la_LIBADD = \
+librygel_renderer_gst_2_6_la_LIBADD = \
        $(LIBRYGEL_RENDERER_GST_DEPS_LIBS) \
        $(RYGEL_COMMON_LIBRYGEL_RENDERER_LIBS)
-librygel_renderer_gst_2_4_la_LDFLAGS = \
+librygel_renderer_gst_2_6_la_LDFLAGS = \
        -version-info $(LIBRYGEL_RENDERER_GST_VERSION) \
        -DG_LOG_DOMAIN=\"Rygel\"
 
-rygel-renderer-gst.h rygel-renderer-gst-2.4.vapi: \
-       librygel_renderer_gst_2_4_la_vala.stamp
+rygel-renderer-gst.h rygel-renderer-gst-2.6.vapi: \
+       librygel_renderer_gst_2_6_la_vala.stamp
 
 vapidir = $(VAPIDIR)
-vapi_DATA = rygel-renderer-gst-2.4.vapi rygel-renderer-gst-2.4.deps
+vapi_DATA = rygel-renderer-gst-2.6.vapi rygel-renderer-gst-2.6.deps
 
-EXTRA_DIST=rygel-renderer-gst.h rygel-renderer-gst-2.4.vapi rygel-renderer-gst-2.4.deps
+EXTRA_DIST=rygel-renderer-gst.h rygel-renderer-gst-2.6.vapi rygel-renderer-gst-2.6.deps
diff --git a/src/librygel-renderer-gst/rygel-renderer-gst-2.6.deps 
b/src/librygel-renderer-gst/rygel-renderer-gst-2.6.deps
new file mode 100644
index 0000000..435dca2
--- /dev/null
+++ b/src/librygel-renderer-gst/rygel-renderer-gst-2.6.deps
@@ -0,0 +1,2 @@
+rygel-renderer-2.6
+gstreamer-1.0
diff --git a/src/librygel-renderer/Makefile.am b/src/librygel-renderer/Makefile.am
index 158e83b..a843719 100644
--- a/src/librygel-renderer/Makefile.am
+++ b/src/librygel-renderer/Makefile.am
@@ -1,51 +1,51 @@
 include $(top_srcdir)/common.am
 include $(srcdir)/filelist.am
 
-librygel_renderer_includedir=$(includedir)/rygel-2.4
+librygel_renderer_includedir=$(includedir)/rygel-2.6
 librygel_renderer_include_HEADERS = rygel-renderer.h
 
-lib_LTLIBRARIES = librygel-renderer-2.4.la
+lib_LTLIBRARIES = librygel-renderer-2.6.la
 
 LIBRYGEL_RENDERER_VERSION=2:4:0
 
-librygel_renderer_2_4_la_SOURCES = \
+librygel_renderer_2_6_la_SOURCES = \
        $(LIBRYGEL_RENDERER_VAPI_SOURCE_FILES) \
        $(LIBRYGEL_RENDERER_NONVAPI_SOURCE_FILES)
 
-librygel_renderer_2_4_la_VALAFLAGS = \
-       -H rygel-renderer.h --library=rygel-renderer-2.4 \
-       --gir=Rygel-2.4.gir \
+librygel_renderer_2_6_la_VALAFLAGS = \
+       -H rygel-renderer.h --library=rygel-renderer-2.6 \
+       --gir=Rygel-2.6.gir \
        $(LIBRYGEL_RENDERER_DEPS_VALAFLAGS) \
        $(RYGEL_COMMON_LIBRYGEL_CORE_VALAFLAGS) \
        $(RYGEL_COMMON_VALAFLAGS)
-librygel_renderer_2_4_la_CFLAGS = \
+librygel_renderer_2_6_la_CFLAGS = \
        $(LIBRYGEL_RENDERER_DEPS_CFLAGS) \
        $(RYGEL_COMMON_LIBRYGEL_CORE_CFLAGS) \
        -DG_LOG_DOMAIN=\"Rygel\"
-librygel_renderer_2_4_la_LIBADD = \
+librygel_renderer_2_6_la_LIBADD = \
        $(LIBRYGEL_RENDERER_DEPS_LIBS) \
        $(RYGEL_COMMON_LIBRYGEL_CORE_LIBS)
-librygel_renderer_2_4_la_LDFLAGS = \
+librygel_renderer_2_6_la_LDFLAGS = \
        -version-info $(LIBRYGEL_RENDERER_VERSION)
 
 vapidir = $(VAPIDIR)
-vapi_DATA = rygel-renderer-2.4.vapi rygel-renderer-2.4.deps
+vapi_DATA = rygel-renderer-2.6.vapi rygel-renderer-2.6.deps
 
-rygel-renderer.h rygel-renderer-2.4.vapi Rygel-2.4.gir: librygel_renderer_2_4_la_vala.stamp
+rygel-renderer.h rygel-renderer-2.6.vapi Rygel-2.6.gir: librygel_renderer_2_6_la_vala.stamp
 
 -include $(INTROSPECTION_MAKEFILE)
 INTROSPECTION_GIRS=
 INTROSPECTION_SCANNER_ARGS=
-INTROSPECTION_COMPILER_ARGS= -l librygel-renderer-2.4.so.2 --includedir=$(builddir)/../librygel-core 
--includedir=$(srcdir)/../librygel-core
+INTROSPECTION_COMPILER_ARGS= -l librygel-renderer-2.6.so.2 --includedir=$(builddir)/../librygel-core 
--includedir=$(srcdir)/../librygel-core
 if HAVE_INTROSPECTION
-$(builddir)/RygelRenderer-2.4.gir: $(srcdir)/Rygel-2.4.gir
+$(builddir)/RygelRenderer-2.6.gir: $(srcdir)/Rygel-2.6.gir
        $(AM_V_GEN)$(SED) -e 's,Rygel\.,RygelRenderer.,g' \
                -e 's,namespace name="Rygel",namespace name="RygelRenderer",g' \
                -e 's,RygelRenderer\.Plugin,RygelCore.Plugin,g' \
                -e 's,RygelRenderer\.MediaDevice,RygelCore.MediaDevice,g' \
-               -e 's,<package name="rygel-renderer-2.4"/>,<include name="RygelCore" 
version="2.4"/>\n<package name="rygel-renderer-2.4"/>,' \
+               -e 's,<package name="rygel-renderer-2.6"/>,<include name="RygelCore" 
version="2.6"/>\n<package name="rygel-renderer-2.6"/>,' \
                $< >$@
-GIRS = RygelRenderer-2.4.gir
+GIRS = RygelRenderer-2.6.gir
 
 girdir=$(datadir)/gir-1.0
 dist_gir_DATA = $(GIRS)
@@ -56,4 +56,4 @@ nodist_typelib_DATA = $(GIRS:.gir=.typelib)
 endif
 
 DISTCLEANFILES = $(nodist_typelib_DATA)
-EXTRA_DIST = rygel-renderer.h rygel-renderer-2.4.vapi rygel-renderer-2.4.deps RygelRenderer-2.4.gir 
Rygel-2.4.gir
+EXTRA_DIST = rygel-renderer.h rygel-renderer-2.6.vapi rygel-renderer-2.6.deps RygelRenderer-2.6.gir 
Rygel-2.6.gir
diff --git a/src/librygel-renderer/rygel-renderer-2.6.deps b/src/librygel-renderer/rygel-renderer-2.6.deps
new file mode 100644
index 0000000..5e5c7d4
--- /dev/null
+++ b/src/librygel-renderer/rygel-renderer-2.6.deps
@@ -0,0 +1,2 @@
+rygel-core-2.6
+gupnp-av-1.0
diff --git a/src/librygel-ruih/Makefile.am b/src/librygel-ruih/Makefile.am
index ba9f17b..96877d6 100644
--- a/src/librygel-ruih/Makefile.am
+++ b/src/librygel-ruih/Makefile.am
@@ -1,7 +1,7 @@
 include ../../common.am
 include $(srcdir)/filelist.am
 
-librygel_ruih_includedir=$(includedir)/rygel-2.4
+librygel_ruih_includedir=$(includedir)/rygel-2.6
 librygel_ruih_include_HEADERS = rygel-ruih.h
 
 lib_LTLIBRARIES = librygel-ruih-2.0.la
diff --git a/src/librygel-ruih/rygel-ruih-2.0.deps b/src/librygel-ruih/rygel-ruih-2.0.deps
index 7509584..55a1766 100644
--- a/src/librygel-ruih/rygel-ruih-2.0.deps
+++ b/src/librygel-ruih/rygel-ruih-2.0.deps
@@ -1,5 +1,5 @@
 gee-0.8
 gupnp-1.0
 gio-2.0
-rygel-core-2.4
+rygel-core-2.6
 gupnp-av-1.0
diff --git a/src/librygel-server/Makefile.am b/src/librygel-server/Makefile.am
index 663a399..00db106 100644
--- a/src/librygel-server/Makefile.am
+++ b/src/librygel-server/Makefile.am
@@ -1,55 +1,55 @@
 include $(top_srcdir)/common.am
 include $(srcdir)/filelist.am
 
-librygel_server_includedir=$(includedir)/rygel-2.4
+librygel_server_includedir=$(includedir)/rygel-2.6
 librygel_server_include_HEADERS = rygel-server.h
 
-lib_LTLIBRARIES = librygel-server-2.4.la
+lib_LTLIBRARIES = librygel-server-2.6.la
 
 LIBRYGEL_SERVER_VERSION=2:4:0
 
-librygel_server_2_4_la_SOURCES = \
+librygel_server_2_6_la_SOURCES = \
        $(LIBRYGEL_SERVER_VAPI_SOURCE_FILES) \
        $(LIBRYGEL_SERVER_NONVAPI_SOURCE_FILES)
 
-librygel_server_2_4_la_VALAFLAGS = \
-       -H rygel-server.h --library=rygel-server-2.4 \
-       --gir=Rygel-2.4.gir \
+librygel_server_2_6_la_VALAFLAGS = \
+       -H rygel-server.h --library=rygel-server-2.6 \
+       --gir=Rygel-2.6.gir \
        $(LIBRYGEL_SERVER_DEPS_VALAFLAGS) \
        $(RYGEL_COMMON_LIBRYGEL_CORE_VALAFLAGS) \
        $(RYGEL_COMMON_VALAFLAGS)
 
-librygel_server_2_4_la_CFLAGS = \
+librygel_server_2_6_la_CFLAGS = \
        $(LIBRYGEL_SERVER_DEPS_CFLAGS) \
        $(RYGEL_COMMON_LIBRYGEL_CORE_CFLAGS) \
        -DENGINE_DIR='"$(enginedir)"' \
        -DG_LOG_DOMAIN=\"Rygel\"
-librygel_server_2_4_la_LIBADD = \
+librygel_server_2_6_la_LIBADD = \
        $(LIBRYGEL_SERVER_DEPS_LIBS) \
        $(RYGEL_COMMON_LIBRYGEL_CORE_LIBS)
 
-librygel_server_2_4_la_LDFLAGS = \
+librygel_server_2_6_la_LDFLAGS = \
        $(RYGEL_DATA_DIR_DEFINES) \
        -version-info $(LIBRYGEL_SERVER_VERSION)
 
 vapidir = $(VAPIDIR)
-vapi_DATA = rygel-server-2.4.vapi rygel-server-2.4.deps
+vapi_DATA = rygel-server-2.6.vapi rygel-server-2.6.deps
 
-rygel-server.h rygel-server-2.4.vapi Rygel-2.4.gir: librygel_server_2_4_la_vala.stamp
+rygel-server.h rygel-server-2.6.vapi Rygel-2.6.gir: librygel_server_2_6_la_vala.stamp
 
 -include $(INTROSPECTION_MAKEFILE)
 INTROSPECTION_GIRS=
 INTROSPECTION_SCANNER_ARGS=
-INTROSPECTION_COMPILER_ARGS= -l librygel-server-2.4.so.2 --includedir=$(builddir)/../librygel-core 
--includedir=$(srcdir)/../librygel-core
+INTROSPECTION_COMPILER_ARGS= -l librygel-server-2.6.so.2 --includedir=$(builddir)/../librygel-core 
--includedir=$(srcdir)/../librygel-core
 if HAVE_INTROSPECTION
-$(builddir)/RygelServer-2.4.gir: $(srcdir)/Rygel-2.4.gir
+$(builddir)/RygelServer-2.6.gir: $(srcdir)/Rygel-2.6.gir
        $(AM_V_GEN)$(SED) -e 's,Rygel\.,RygelServer.,g' \
                -e 's,namespace name="Rygel",namespace name="RygelServer",g' \
                -e 's,RygelServer\.Plugin,RygelCore.Plugin,g' \
                -e 's,RygelServer\.MediaDevice,RygelCore.MediaDevice,g' \
-               -e 's,<package name="rygel-server-2.4"/>,<include name="RygelCore" version="2.4"/>\n<package 
name="rygel-server-2.4"/>,' \
+               -e 's,<package name="rygel-server-2.6"/>,<include name="RygelCore" version="2.6"/>\n<package 
name="rygel-server-2.6"/>,' \
                $< >$@
-GIRS = RygelServer-2.4.gir
+GIRS = RygelServer-2.6.gir
 
 girdir=$(datadir)/gir-1.0
 dist_gir_DATA = $(GIRS)
@@ -60,4 +60,4 @@ nodist_typelib_DATA = $(GIRS:.gir=.typelib)
 endif
 
 DISTCLEANFILES = $(nodist_typelib_DATA)
-EXTRA_DIST = rygel-server.h rygel-server-2.4.vapi rygel-server-2.4.deps RygelServer-2.4.gir Rygel-2.4.gir
+EXTRA_DIST = rygel-server.h rygel-server-2.6.vapi rygel-server-2.6.deps RygelServer-2.6.gir Rygel-2.6.gir
diff --git a/src/librygel-server/rygel-server-2.4.deps b/src/librygel-server/rygel-server-2.6.deps
similarity index 72%
rename from src/librygel-server/rygel-server-2.4.deps
rename to src/librygel-server/rygel-server-2.6.deps
index 7509584..55a1766 100644
--- a/src/librygel-server/rygel-server-2.4.deps
+++ b/src/librygel-server/rygel-server-2.6.deps
@@ -1,5 +1,5 @@
 gee-0.8
 gupnp-1.0
 gio-2.0
-rygel-core-2.4
+rygel-core-2.6
 gupnp-av-1.0
diff --git a/src/plugins/playbin/Makefile.am b/src/plugins/playbin/Makefile.am
index 6b0317f..aca7572 100644
--- 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.4 \
+       --pkg rygel-renderer-gst-2.6 \
        --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 f02b228..6a08123 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -216,8 +216,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.4.vapi \
-       $(top_srcdir)/src/librygel-server/rygel-server-2.4.vapi \
+       $(top_srcdir)/src/librygel-core/rygel-core-2.6.vapi \
+       $(top_srcdir)/src/librygel-server/rygel-server-2.6.vapi \
        $(top_srcdir)/src/plugins/media-export/rygel-media-export.vapi \
        plugins/media-export/regression.vala
 plugins_media_export_regression_CFLAGS = \
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]