GNOME.org
 

[rygel] all: Bump API and so version

commit e087861dc727e9b0a06d7c537650457db7a145f6
Author: Jens Georg <jensg openismus com>
Date:   Fri Oct 5 16:20:01 2012 +0200

    all: Bump API and so version

 Makefile.am                                        |    6 ++--
 common.am                                          |   16 +++++-----
 configure.ac                                       |    8 +++---
 doc/reference/librygel-core/Makefile.am            |    4 +-
 doc/reference/librygel-renderer-gst/Makefile.am    |    8 +++---
 doc/reference/librygel-renderer/Makefile.am        |    8 +++---
 doc/reference/librygel-server/Makefile.am          |    8 +++---
 examples/Makefile.am                               |    6 ++--
 rygel-core-1.0.pc.in => rygel-core-2.0.pc.in       |    0
 ...-renderer-1.0.pc.in => rygel-renderer-2.0.pc.in |    0
 ...r-gst-1.0.pc.in => rygel-renderer-gst-2.0.pc.in |    0
 rygel-server-1.0.pc.in => rygel-server-2.0.pc.in   |    0
 src/librygel-core/Makefile.am                      |   24 ++++++++--------
 .../{rygel-core-1.0.deps => rygel-core-2.0.deps}   |    0
 src/librygel-renderer-gst/Makefile.am              |   24 ++++++++--------
 .../rygel-renderer-gst-1.0.deps                    |    2 -
 .../rygel-renderer-gst-2.0.deps                    |    2 +
 src/librygel-renderer/Makefile.am                  |   22 ++++++++--------
 src/librygel-renderer/rygel-renderer-1.0.deps      |    1 -
 src/librygel-renderer/rygel-renderer-2.0.deps      |    1 +
 src/librygel-server/Makefile.am                    |   22 ++++++++--------
 ...rygel-server-1.0.deps => rygel-server-2.0.deps} |    2 +-
 src/plugins/playbin/Makefile.am                    |    4 +-
 src/rygel/Makefile.am                              |    8 +++---
 tests/Makefile.am                                  |   28 ++++++++++----------
 25 files changed, 102 insertions(+), 102 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 2c67853..0130c06 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,10 +1,10 @@
 SUBDIRS = src data tests po doc examples
 
-pkgconfig_DATA= rygel-core-1.0.pc rygel-renderer-1.0.pc rygel-server-1.0.pc
+pkgconfig_DATA= rygel-core-2.0.pc rygel-renderer-2.0.pc rygel-server-2.0.pc
 pkgconfigdir = $(libdir)/pkgconfig
 
-EXTRA_DIST = rygel-core-1.0.pc.in rygel-renderer-1.0.pc.in \
-             rygel-server-1.0.pc.in .version
+EXTRA_DIST = rygel-core-2.0.pc.in rygel-renderer-2.0.pc.in \
+             rygel-server-2.0.pc.in .version
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc \
                             --enable-valadoc
diff --git a/common.am b/common.am
index dd136c1..3eba601 100644
--- a/common.am
+++ b/common.am
@@ -14,8 +14,8 @@ else
 shareddir = $(datadir)/rygel
 sysconfigdir = $(sysconfdir)
 desktopdir = $(datadir)/applications
-plugindir = $(libdir)/rygel-1.0/plugins
-enginedir = $(libdir)/rygel-1.0/engines
+plugindir = $(libdir)/rygel-2.0/plugins
+enginedir = $(libdir)/rygel-2.0/engines
 icondir = $(datadir)/icons/hicolor/32x32/apps
 presetdir = $(shareddir)/presets
 endif
@@ -54,28 +54,28 @@ RYGEL_BASE_LIBS = \
 
 RYGEL_COMMON_LIBS = \
 	$(RYGEL_BASE_LIBS) \
-	$(top_builddir)/src/librygel-core/librygel-core-1.0.la
+	$(top_builddir)/src/librygel-core/librygel-core-2.0.la
 
 RYGEL_COMMON_SERVER_LIBS = \
-	$(top_builddir)/src/librygel-server/librygel-server-1.0.la \
+	$(top_builddir)/src/librygel-server/librygel-server-2.0.la \
 	$(RYGEL_COMMON_LIBS)
 
 RYGEL_COMMON_RENDERER_LIBS = \
-	$(top_builddir)/src/librygel-renderer/librygel-renderer-1.0.la \
+	$(top_builddir)/src/librygel-renderer/librygel-renderer-2.0.la \
 	$(RYGEL_COMMON_LIBS)
 
 # Note: the -g needs to be at the end of VALAFLAGS to not break make dist
 RYGEL_COMMON_PLUGIN_VALAFLAGS = \
-	--pkg rygel-core-1.0 \
+	--pkg rygel-core-2.0 \
 	$(RYGEL_COMMON_VALAFLAGS)
 
 RYGEL_COMMON_SERVER_PLUGIN_VALAFLAGS = \
-	--pkg rygel-server-1.0 \
+	--pkg rygel-server-2.0 \
 	--vapidir=$(top_builddir)/src/librygel-server \
 	$(RYGEL_COMMON_PLUGIN_VALAFLAGS)
 
 RYGEL_COMMON_RENDERER_PLUGIN_VALAFLAGS = \
-	--pkg rygel-renderer-1.0 \
+	--pkg rygel-renderer-2.0 \
 	--vapidir=$(top_builddir)/src/librygel-renderer \
 	$(RYGEL_COMMON_PLUGIN_VALAFLAGS)
 
diff --git a/configure.ac b/configure.ac
index 19ad57b..7d242d9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -296,10 +296,10 @@ doc/reference/librygel-renderer/Makefile
 doc/reference/librygel-server/Makefile
 doc/reference/librygel-renderer-gst/Makefile
 po/Makefile.in
-rygel-core-1.0.pc
-rygel-renderer-1.0.pc
-rygel-server-1.0.pc
-rygel-renderer-gst-1.0.pc
+rygel-core-2.0.pc
+rygel-renderer-2.0.pc
+rygel-server-2.0.pc
+rygel-renderer-gst-2.0.pc
 tests/Makefile
 examples/Makefile
 ])
diff --git a/doc/reference/librygel-core/Makefile.am b/doc/reference/librygel-core/Makefile.am
index ec718b2..b93f363 100644
--- a/doc/reference/librygel-core/Makefile.am
+++ b/doc/reference/librygel-core/Makefile.am
@@ -20,7 +20,7 @@ VALADOC_FLAGS = --force \
 	--pkg rygel-build-config \
 	-b $(top_srcdir)/src/librygel-core \
 	--package-name librygel-core \
-	--package-version 1.0 \
+	--package-version 2.0 \
 	$(VALA_SOURCE_FILES_WITH_PATHS)
 
 valadoc: $(VALA_SOURCE_FILES_WITH_PATHS)
@@ -32,7 +32,7 @@ gtkdoc: $(VALA_SOURCE_FILES_WITH_PATHS)
 	@rm -rf gtkdoc
 	$(AM_V_GEN)$(VALADOC) \
 		-X $(top_srcdir)/src/librygel-core/rygel-core.h \
-		-X -l -X $(top_builddir)/src/librygel-core/.libs/librygel-core-1.0.so \
+		-X -l -X $(top_builddir)/src/librygel-core/.libs/librygel-core-2.0.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 f1f1746..8063e22 100644
--- a/doc/reference/librygel-renderer-gst/Makefile.am
+++ b/doc/reference/librygel-renderer-gst/Makefile.am
@@ -17,7 +17,7 @@ VALA_SOURCE_FILES_WITH_PATHS = $(addprefix $(top_srcdir)/src/librygel-renderer-g
 # TODO: Why is gstreamer-pbutils-0.10 needed here, but not needed in librygel-renderer-gst/Makefile.am?
 VALADOC_FLAGS = --force \
 		--vapidir $(top_srcdir)/src/librygel-core \
-		--pkg rygel-core-1.0 \
+		--pkg rygel-core-2.0 \
 		--vapidir $(top_srcdir)/src/librygel-renderer-gst \
 		$(RYGEL_COMMON_VALAFLAGS_PKG) \
 		$(LIBRYGEL_RENDERER_VALAFLAGS_PKG) \
@@ -27,7 +27,7 @@ VALADOC_FLAGS = --force \
 	        --pkg rygel-build-config \
 		-b $(top_srcdir)/src/librygel-renderer-gst \
 		--package-name librygel-renderer-gst \
-		--package-version 1.0 \
+		--package-version 2.0 \
 		$(VALA_SOURCE_FILES_WITH_PATHS)
 
 valadoc: $(VALA_SOURCE_FILES_WITH_PATHS)
@@ -39,8 +39,8 @@ gtkdoc: $(VALA_SOURCE_FILES_WITH_PATHS)
 	@rm -rf gtkdoc
 	$(AM_V_GEN)$(VALADOC) \
 		-X $(top_srcdir)/src/librygel-renderer-gst/rygel-renderer-gst.h \
-		-X -l -X $(top_builddir)/src/librygel-core/.libs/librygel-core-1.0.so \
-		-X -l -X $(top_builddir)/src/librygel-renderer-gst/.libs/librygel-renderer-gst-1.0.so \
+		-X -l -X $(top_builddir)/src/librygel-core/.libs/librygel-core-2.0.so \
+		-X -l -X $(top_builddir)/src/librygel-renderer-gst/.libs/librygel-renderer-gst-2.0.so \
 		-o gtkdoc \
 		--doclet gtkdoc \
 		$(VALADOC_FLAGS)
diff --git a/doc/reference/librygel-renderer/Makefile.am b/doc/reference/librygel-renderer/Makefile.am
index 8755e95..58ec298 100644
--- a/doc/reference/librygel-renderer/Makefile.am
+++ b/doc/reference/librygel-renderer/Makefile.am
@@ -17,7 +17,7 @@ VALA_SOURCE_FILES_WITH_PATHS = $(addprefix $(top_srcdir)/src/librygel-renderer/,
 # TODO: Why is gstreamer-pbutils-0.10 needed here, but not needed in librygel-renderer/Makefile.am?
 VALADOC_FLAGS = --force \
 	--vapidir $(top_srcdir)/src/librygel-core \
-	--pkg rygel-core-1.0 \
+	--pkg rygel-core-2.0 \
 	--vapidir $(top_srcdir)/src/librygel-renderer \
 	$(RYGEL_COMMON_VALAFLAGS_PKG) \
 	$(LIBRYGEL_RENDERER_VALAFLAGS_PKG) \
@@ -26,7 +26,7 @@ VALADOC_FLAGS = --force \
 	--pkg rygel-build-config \
 	-b $(top_srcdir)/src/librygel-renderer \
 	--package-name librygel-renderer \
-	--package-version 1.0 \
+	--package-version 2.0 \
 	$(VALA_SOURCE_FILES_WITH_PATHS)
 
 valadoc: $(VALA_SOURCE_FILES_WITH_PATHS)
@@ -38,8 +38,8 @@ gtkdoc: $(VALA_SOURCE_FILES_WITH_PATHS)
 	@rm -rf gtkdoc
 	$(AM_V_GEN)$(VALADOC) \
 		-X $(top_srcdir)/src/librygel-renderer/rygel-renderer.h \
-		-X -l -X $(top_builddir)/src/librygel-core/.libs/librygel-core-1.0.so \
-		-X -l -X $(top_builddir)/src/librygel-renderer/.libs/librygel-renderer-1.0.so \
+		-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 \
 		-o gtkdoc \
 		--doclet gtkdoc \
 		$(VALADOC_FLAGS)
diff --git a/doc/reference/librygel-server/Makefile.am b/doc/reference/librygel-server/Makefile.am
index c8ad47c..f405c67 100644
--- a/doc/reference/librygel-server/Makefile.am
+++ b/doc/reference/librygel-server/Makefile.am
@@ -17,7 +17,7 @@ VALA_SOURCE_FILES_WITH_PATHS = $(addprefix $(top_srcdir)/src/librygel-server/, $
 # TODO: Why is gstreamer-pbutils-0.10 needed here, but not needed in librygel-server/Makefile.am?
 VALADOC_FLAGS = --force \
 	--vapidir $(top_srcdir)/src/librygel-core \
-	--pkg rygel-core-1.0 \
+	--pkg rygel-core-2.0 \
 	--vapidir $(top_srcdir)/src/librygel-server \
 	$(RYGEL_COMMON_VALAFLAGS_PKG) \
 	$(LIBRYGEL_SERVER_VALAFLAGS_PKG) \
@@ -26,7 +26,7 @@ VALADOC_FLAGS = --force \
 	--pkg rygel-build-config \
 	-b $(top_srcdir)/src/librygel-server \
 	--package-name librygel-server \
-	--package-version 1.0 \
+	--package-version 2.0 \
 	$(VALA_SOURCE_FILES_WITH_PATHS)
 
 valadoc: $(VALA_SOURCE_FILES_WITH_PATHS)
@@ -38,8 +38,8 @@ gtkdoc: $(VALA_SOURCE_FILES_WITH_PATHS)
 	@rm -rf gtkdoc
 	$(AM_V_GEN)$(VALADOC) \
 		-X $(top_srcdir)/src/librygel-server/rygel-server.h \
-		-X -l -X $(top_builddir)/src/librygel-core/.libs/librygel-core-1.0.so \
-		-X -l -X $(top_builddir)/src/librygel-server/.libs/librygel-server-1.0.so \
+		-X -l -X $(top_builddir)/src/librygel-core/.libs/librygel-core-2.0.so \
+		-X -l -X $(top_builddir)/src/librygel-server/.libs/librygel-server-2.0.so \
 		-o gtkdoc \
 		--doclet gtkdoc \
 		$(VALADOC_FLAGS)
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 7768b5e..7dfa1c5 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -9,7 +9,7 @@ AM_CFLAGS += \
 noinst_PROGRAMS = standalone-server
 standalone_server_SOURCES = standalone-server.c
 standalone_server_LDADD = \
-	$(top_builddir)/src/librygel-server/librygel-server-1.0.la \
+	$(top_builddir)/src/librygel-server/librygel-server-2.0.la \
 	$(RYGEL_COMMON_LIBS)
 
 if HAVE_GSTREAMER
@@ -23,8 +23,8 @@ AM_CFLAGS += \
 noinst_PROGRAMS += standalone-renderer
 standalone_renderer_SOURCES = standalone-renderer.c
 standalone_renderer_LDADD = \
-	$(top_builddir)/src/librygel-renderer/librygel-renderer-1.0.la \
-	$(top_builddir)/src/librygel-renderer-gst/librygel-renderer-gst-1.0.la \
+	$(top_builddir)/src/librygel-renderer/librygel-renderer-2.0.la \
+	$(top_builddir)/src/librygel-renderer-gst/librygel-renderer-gst-2.0.la \
 	$(LIBGSTREAMER_LIBS) \
 	$(RYGEL_COMMON_LIBS)
 endif
diff --git a/rygel-core-1.0.pc.in b/rygel-core-2.0.pc.in
similarity index 100%
rename from rygel-core-1.0.pc.in
rename to rygel-core-2.0.pc.in
diff --git a/rygel-renderer-1.0.pc.in b/rygel-renderer-2.0.pc.in
similarity index 100%
rename from rygel-renderer-1.0.pc.in
rename to rygel-renderer-2.0.pc.in
diff --git a/rygel-renderer-gst-1.0.pc.in b/rygel-renderer-gst-2.0.pc.in
similarity index 100%
rename from rygel-renderer-gst-1.0.pc.in
rename to rygel-renderer-gst-2.0.pc.in
diff --git a/rygel-server-1.0.pc.in b/rygel-server-2.0.pc.in
similarity index 100%
rename from rygel-server-1.0.pc.in
rename to rygel-server-2.0.pc.in
diff --git a/src/librygel-core/Makefile.am b/src/librygel-core/Makefile.am
index 71b06ce..f6977c2 100644
--- a/src/librygel-core/Makefile.am
+++ b/src/librygel-core/Makefile.am
@@ -10,41 +10,41 @@ AM_CFLAGS += \
 	-DBIG_ICON_DIR='"$(bigicondir)"' -include config.h \
 	-DLOCALEDIR=\""$(datadir)/locale"\" -DG_LOG_DOMAIN='"Rygel"'
 
-librygelincdir = $(includedir)/rygel-1.0
+librygelincdir = $(includedir)/rygel-2.0
 
 librygelinc_HEADERS = rygel-core.h
 
-lib_LTLIBRARIES = librygel-core-1.0.la
+lib_LTLIBRARIES = librygel-core-2.0.la
 
-librygel_core_1_0_la_SOURCES = \
+librygel_core_2_0_la_SOURCES = \
 	$(LIBRYGEL_CORE_VAPI_SOURCE_FILES) \
 	$(LIBRYGEL_CORE_NONVAPI_SOURCE_FILES)
 
-librygel_core_1_0_la_VALAFLAGS = \
-	-H rygel-core.h -C --library=rygel-core-1.0 \
+librygel_core_2_0_la_VALAFLAGS = \
+	-H rygel-core.h -C --library=rygel-core-2.0 \
 	$(LIBRYGEL_CORE_VALAFLAGS_PKG) \
 	$(RYGEL_COMMON_VALAFLAGS)
 
-librygel_core_1_0_la_LIBADD = \
+librygel_core_2_0_la_LIBADD = \
 	$(GST_PBU_LIBS) \
 	$(RYGEL_BASE_LIBS) \
 	$(LIBGUPNP_DLNA_LIBS) \
 	$(GIO_LIBS) \
 	$(LIBSOUP_LIBS)
 
-RYGEL_CORE_VERSION=0:0:0
-librygel_core_1_0_la_LDFLAGS = -version-info $(RYGEL_CORE_VERSION)
+RYGEL_CORE_VERSION=1:0:0
+librygel_core_2_0_la_LDFLAGS = -version-info $(RYGEL_CORE_VERSION)
 
 BUILT_SOURCES = \
-	rygel-core-1.0.vapi \
+	rygel-core-2.0.vapi \
 	rygel-core.h
 
-VAPI_FILES = rygel-core-1.0.vapi
-DEPS_FILES = rygel-core-1.0.deps
+VAPI_FILES = rygel-core-2.0.vapi
+DEPS_FILES = rygel-core-2.0.deps
 
 vapidir = $(VAPIDIR)
 vapi_DATA = $(VAPI_FILES) $(DEPS_FILES)
-rygel-core-1.0.vapi rygel-core.h: librygel_core_1_0_la_vala.stamp
+rygel-core-2.0.vapi rygel-core.h: librygel_core_2_0_la_vala.stamp
 
 MAINTAINERCLEANFILES += $(BUILT_SOURCES)
 
diff --git a/src/librygel-core/rygel-core-1.0.deps b/src/librygel-core/rygel-core-2.0.deps
similarity index 100%
rename from src/librygel-core/rygel-core-1.0.deps
rename to src/librygel-core/rygel-core-2.0.deps
diff --git a/src/librygel-renderer-gst/Makefile.am b/src/librygel-renderer-gst/Makefile.am
index 7a85651..643a3e2 100644
--- a/src/librygel-renderer-gst/Makefile.am
+++ b/src/librygel-renderer-gst/Makefile.am
@@ -1,34 +1,34 @@
 include ../../common.am
 include $(srcdir)/filelist.am
 
-librygel_renderer_includedir=$(includedir)/rygel-1.0
+librygel_renderer_includedir=$(includedir)/rygel-2.0
 librygel_renderer_include_HEADERS = rygel-renderer-gst.h
 
-lib_LTLIBRARIES = librygel-renderer-gst-1.0.la
+lib_LTLIBRARIES = librygel-renderer-gst-2.0.la
 
-LIBRYGEL_RENDERER_GST_VERSION=0:0:0
+LIBRYGEL_RENDERER_GST_VERSION=1:0:0
 
-librygel_renderer_gst_1_0_la_SOURCES = \
+librygel_renderer_gst_2_0_la_SOURCES = \
 	$(LIBRYGEL_RENDERER_GST_VAPI_SOURCE_FILES) \
 	$(LIBRYGEL_RENDERER_GST_NONVAPI_SOURCE_FILES)
 
 AM_CFLAGS += -DG_LOG_DOMAIN=\"Rygel\" \
 	$(LIBGSTREAMER_CFLAGS)
 
-librygel_renderer_gst_1_0_la_VALAFLAGS = \
-	-H rygel-renderer-gst.h --library=rygel-renderer-gst-1.0 \
+librygel_renderer_gst_2_0_la_VALAFLAGS = \
+	-H rygel-renderer-gst.h --library=rygel-renderer-gst-2.0 \
 	$(LIBRYGEL_RENDERER_GST_VALAFLAGS_PKG) \
 	$(RYGEL_COMMON_RENDERER_PLUGIN_VALAFLAGS)
-librygel_renderer_gst_1_0_la_LIBADD = \
+librygel_renderer_gst_2_0_la_LIBADD = \
 	$(RYGEL_COMMON_RENDERER_LIBS) \
 	$(LIBGSTREAMER_LIBS) \
 	$(LIBGUPNP_AV_LIBS)
-librygel_renderer_gst_1_0_la_LDFLAGS = -version-info $(LIBRYGEL_RENDERER_GST_VERSION)
+librygel_renderer_gst_2_0_la_LDFLAGS = -version-info $(LIBRYGEL_RENDERER_GST_VERSION)
 
-rygel-renderer-gst.h rygel-renderer-gst-1.0.vapi: \
-	librygel_renderer_gst_1_0_la_vala.stamp
+rygel-renderer-gst.h rygel-renderer-gst-2.0.vapi: \
+	librygel_renderer_gst_2_0_la_vala.stamp
 
 vapidir = $(VAPIDIR)
-vapi_DATA = rygel-renderer-gst-1.0.vapi rygel-renderer-gst-1.0.deps
+vapi_DATA = rygel-renderer-gst-2.0.vapi rygel-renderer-gst-2.0.deps
 
-EXTRA_DIST=rygel-renderer-gst.h rygel-renderer-gst-1.0.vapi rygel-renderer-gst-1.0.deps
+EXTRA_DIST=rygel-renderer-gst.h rygel-renderer-gst-2.0.vapi rygel-renderer-gst-2.0.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
new file mode 100644
index 0000000..f785ac7
--- /dev/null
+++ b/src/librygel-renderer-gst/rygel-renderer-gst-2.0.deps
@@ -0,0 +1,2 @@
+rygel-renderer-2.0
+gstreamer-0.10
diff --git a/src/librygel-renderer/Makefile.am b/src/librygel-renderer/Makefile.am
index 4637e62..488dd92 100644
--- a/src/librygel-renderer/Makefile.am
+++ b/src/librygel-renderer/Makefile.am
@@ -1,29 +1,29 @@
 include ../../common.am
 include $(srcdir)/filelist.am
 
-librygel_renderer_includedir=$(includedir)/rygel-1.0
+librygel_renderer_includedir=$(includedir)/rygel-2.0
 librygel_renderer_include_HEADERS = rygel-renderer.h
 
-lib_LTLIBRARIES = librygel-renderer-1.0.la
+lib_LTLIBRARIES = librygel-renderer-2.0.la
 
-LIBRYGEL_RENDERER_VERSION=0:0:0
+LIBRYGEL_RENDERER_VERSION=1:0:0
 
-librygel_renderer_1_0_la_SOURCES = \
+librygel_renderer_2_0_la_SOURCES = \
 	$(LIBRYGEL_RENDERER_VAPI_SOURCE_FILES) \
 	$(LIBRYGEL_RENDERER_NONVAPI_SOURCE_FILES)
 
 AM_CFLAGS += -DG_LOG_DOMAIN=\"Rygel\"
 
-librygel_renderer_1_0_la_VALAFLAGS = \
-	-H rygel-renderer.h --library=rygel-renderer-1.0 \
+librygel_renderer_2_0_la_VALAFLAGS = \
+	-H rygel-renderer.h --library=rygel-renderer-2.0 \
 	$(LIBRYGEL_RENDERER_VALAFLAGS_PKG) \
 	$(RYGEL_COMMON_PLUGIN_VALAFLAGS)
-librygel_renderer_1_0_la_LIBADD = $(RYGEL_COMMON_LIBS) $(LIBGSTREAMER_LIBS)
-librygel_renderer_1_0_la_LDFLAGS = -version-info $(LIBRYGEL_RENDERER_VERSION)
+librygel_renderer_2_0_la_LIBADD = $(RYGEL_COMMON_LIBS) $(LIBGSTREAMER_LIBS)
+librygel_renderer_2_0_la_LDFLAGS = -version-info $(LIBRYGEL_RENDERER_VERSION)
 
 vapidir = $(VAPIDIR)
-vapi_DATA = rygel-renderer-1.0.vapi rygel-renderer-1.0.deps
+vapi_DATA = rygel-renderer-2.0.vapi rygel-renderer-2.0.deps
 
-rygel-renderer.h rygel-renderer-1.0.vapi: librygel_renderer_1_0_la_vala.stamp
+rygel-renderer.h rygel-renderer-2.0.vapi: librygel_renderer_2_0_la_vala.stamp
 
-EXTRA_DIST = rygel-renderer.h rygel-renderer-1.0.vapi rygel-renderer-1.0.deps
+EXTRA_DIST = rygel-renderer.h rygel-renderer-2.0.vapi rygel-renderer-2.0.deps
diff --git a/src/librygel-renderer/rygel-renderer-2.0.deps b/src/librygel-renderer/rygel-renderer-2.0.deps
new file mode 100644
index 0000000..dd45530
--- /dev/null
+++ b/src/librygel-renderer/rygel-renderer-2.0.deps
@@ -0,0 +1 @@
+rygel-core-2.0
diff --git a/src/librygel-server/Makefile.am b/src/librygel-server/Makefile.am
index 5024eb8..3405c4b 100644
--- a/src/librygel-server/Makefile.am
+++ b/src/librygel-server/Makefile.am
@@ -1,32 +1,32 @@
 include ../../common.am
 include $(srcdir)/filelist.am
 
-librygel_server_includedir=$(includedir)/rygel-1.0
+librygel_server_includedir=$(includedir)/rygel-2.0
 librygel_server_include_HEADERS = rygel-server.h
 
-lib_LTLIBRARIES = librygel-server-1.0.la
+lib_LTLIBRARIES = librygel-server-2.0.la
 
-LIBRYGEL_SERVER_VERSION=0:0:0
+LIBRYGEL_SERVER_VERSION=1:0:0
 
 AM_CFLAGS += -DG_LOG_DOMAIN=\"Rygel\" \
 	$(LIBGUPNP_DLNA_CFLAGS)
 
-librygel_server_1_0_la_SOURCES = \
+librygel_server_2_0_la_SOURCES = \
 	$(LIBRYGEL_SERVER_VAPI_SOURCE_FILES) \
 	$(LIBRYGEL_SERVER_NONVAPI_SOURCE_FILES)
 
-librygel_server_1_0_la_VALAFLAGS = \
-	-H rygel-server.h --library=rygel-server-1.0 \
+librygel_server_2_0_la_VALAFLAGS = \
+	-H rygel-server.h --library=rygel-server-2.0 \
 	$(LIBRYGEL_SERVER_VALAFLAGS_PKG) \
 	$(RYGEL_COMMON_PLUGIN_VALAFLAGS)
-librygel_server_1_0_la_LIBADD = $(RYGEL_COMMON_LIBS) \
+librygel_server_2_0_la_LIBADD = $(RYGEL_COMMON_LIBS) \
 	$(LIBGUPNP_DLNA_LIBS) \
 	$(GST_PBU_LIBS)
-librygel_server_1_0_la_LDFLAGS = -version-info $(LIBRYGEL_SERVER_VERSION)
+librygel_server_2_0_la_LDFLAGS = -version-info $(LIBRYGEL_SERVER_VERSION)
 
 vapidir = $(VAPIDIR)
-vapi_DATA = rygel-server-1.0.vapi rygel-server-1.0.deps
+vapi_DATA = rygel-server-2.0.vapi rygel-server-2.0.deps
 
-rygel-server.h rygel-server-1.0.vapi: librygel_server_1_0_la_vala.stamp
+rygel-server.h rygel-server-2.0.vapi: librygel_server_2_0_la_vala.stamp
 
-EXTRA_DIST = rygel-server.h rygel-server-1.0.vapi rygel-server-1.0.deps
+EXTRA_DIST = rygel-server.h rygel-server-2.0.vapi rygel-server-2.0.deps
diff --git a/src/librygel-server/rygel-server-1.0.deps b/src/librygel-server/rygel-server-2.0.deps
similarity index 72%
rename from src/librygel-server/rygel-server-1.0.deps
rename to src/librygel-server/rygel-server-2.0.deps
index 22377d1..79a97cd 100644
--- a/src/librygel-server/rygel-server-1.0.deps
+++ b/src/librygel-server/rygel-server-2.0.deps
@@ -1,5 +1,5 @@
 gee-1.0
 gupnp-1.0
 gio-2.0
-rygel-core-1.0
+rygel-core-2.0
 gupnp-av-1.0
diff --git a/src/plugins/playbin/Makefile.am b/src/plugins/playbin/Makefile.am
index 476263b..cb1c0d0 100644
--- a/src/plugins/playbin/Makefile.am
+++ b/src/plugins/playbin/Makefile.am
@@ -8,10 +8,10 @@ AM_CFLAGS += -DG_LOG_DOMAIN='"Playbin"' \
 
 librygel_playbin_la_SOURCES = rygel-module.vala
 librygel_playbin_la_VALAFLAGS = \
-	--pkg rygel-renderer-gst-1.0 \
+	--pkg rygel-renderer-gst-2.0 \
 	--vapidir $(top_srcdir)/src/librygel-renderer-gst \
 	$(RYGEL_COMMON_RENDERER_PLUGIN_VALAFLAGS)
 librygel_playbin_la_LIBADD = \
-	$(top_builddir)/src/librygel-renderer-gst/librygel-renderer-gst-1.0.la \
+	$(top_builddir)/src/librygel-renderer-gst/librygel-renderer-gst-2.0.la \
 	$(RYGEL_COMMON_RENDERER_LIBS)
 librygel_playbin_la_LDFLAGS = $(RYGEL_PLUGIN_LINKER_FLAGS)
diff --git a/src/rygel/Makefile.am b/src/rygel/Makefile.am
index cffc649..f4b9ea6 100644
--- a/src/rygel/Makefile.am
+++ b/src/rygel/Makefile.am
@@ -17,8 +17,8 @@ rygel_SOURCES = \
 	rygel-cmdline-config.vala \
 	rygel-environment-config.vala \
 	rygel-user-config.vala \
-	$(top_builddir)/src/librygel-core/rygel-core-1.0.vapi \
-	$(top_builddir)/src/librygel-server/rygel-server-1.0.vapi
+	$(top_builddir)/src/librygel-core/rygel-core-2.0.vapi \
+	$(top_builddir)/src/librygel-server/rygel-server-2.0.vapi
 
 rygel_VALAFLAGS = \
 	--pkg posix \
@@ -26,8 +26,8 @@ rygel_VALAFLAGS = \
 	$(RYGEL_COMMON_VALAFLAGS)
 
 rygel_LDADD = \
-	$(top_builddir)/src/librygel-core/librygel-core-1.0.la \
-	$(top_builddir)/src/librygel-server/librygel-server-1.0.la \
+	$(top_builddir)/src/librygel-core/librygel-core-2.0.la \
+	$(top_builddir)/src/librygel-server/librygel-server-2.0.la \
 	$(RYGEL_BASE_LIBS)
 
 rygel_LDFLAGS = -export-dynamic
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 662724c..a902af8 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -117,8 +117,8 @@ rygel_regression_SOURCES = \
 
 rygel_regression_VALAFLAGS = \
 	$(AM_VALAFLAGS) \
-	--pkg rygel-server-1.0 \
-	--pkg rygel-core-1.0 \
+	--pkg rygel-server-2.0 \
+	--pkg rygel-core-2.0 \
 	--vapidir $(top_builddir)/src/librygel-server \
 	--vapidir $(top_builddir)/src/librygel-core
 
@@ -131,16 +131,16 @@ rygel_regression_CFLAGS = \
 
 rygel_regression_LDADD = \
 	$(LDADD) \
-	$(top_builddir)/src/librygel-server/librygel-server-1.0.la \
-	$(top_builddir)/src/librygel-core/librygel-core-1.0.la
+	$(top_builddir)/src/librygel-server/librygel-server-2.0.la \
+	$(top_builddir)/src/librygel-core/librygel-core-2.0.la
 
 rygel_media_engine_test_SOURCES = \
 	rygel-media-engine-test.vala
 
 rygel_media_engine_test_VALAFLAGS = \
 	$(AM_VALAFLAGS) \
-	--pkg rygel-server-1.0 \
-	--pkg rygel-core-1.0 \
+	--pkg rygel-server-2.0 \
+	--pkg rygel-core-2.0 \
 	--vapidir $(top_builddir)/src/librygel-server \
 	--vapidir $(top_builddir)/src/librygel-core
 
@@ -156,8 +156,8 @@ rygel_media_engine_test_CFLAGS = \
 
 rygel_media_engine_test_LDADD = \
 	$(LDADD) \
-	$(top_builddir)/src/librygel-server/librygel-server-1.0.la \
-	$(top_builddir)/src/librygel-core/librygel-core-1.0.la
+	$(top_builddir)/src/librygel-server/librygel-server-2.0.la \
+	$(top_builddir)/src/librygel-core/librygel-core-2.0.la
 
 if HAVE_GSTREAMER
 check_PROGRAMS += \
@@ -168,17 +168,17 @@ rygel_playbin_renderer_test_SOURCES = rygel-playbin-renderer-test.vala
 
 rygel_playbin_renderer_test_VALAFLAGS = \
 	$(AM_VALAFLAGS) \
-	--pkg rygel-renderer-gst-1.0 \
-	--pkg rygel-renderer-1.0 \
-	--pkg rygel-core-1.0 \
+	--pkg rygel-renderer-gst-2.0 \
+	--pkg rygel-renderer-2.0 \
+	--pkg rygel-core-2.0 \
 	--vapidir $(top_builddir)/src/librygel-renderer \
 	--vapidir $(top_builddir)/src/librygel-renderer-gst \
 	--vapidir $(top_builddir)/src/librygel-core
 
 rygel_playbin_renderer_test_LDADD = \
-	$(top_builddir)/src/librygel-renderer/librygel-renderer-1.0.la \
-	$(top_builddir)/src/librygel-renderer-gst/librygel-renderer-gst-1.0.la \
-	$(top_builddir)/src/librygel-core/librygel-core-1.0.la \
+	$(top_builddir)/src/librygel-renderer/librygel-renderer-2.0.la \
+	$(top_builddir)/src/librygel-renderer-gst/librygel-renderer-gst-2.0.la \
+	$(top_builddir)/src/librygel-core/librygel-core-2.0.la \
 	$(LDADD)
 
 rygel_playbin_renderer_test_CFLAGS = \
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]