[gupnp-dlna: 5/7] Change API and so version

[Jens Georg <jensgeorg src gnome org>]

commit 9a64cdac538d5ce7dca3b267bec18c30edffb80c
Author: Jens Georg <mail jensge org>
Date:   Tue Sep 18 16:44:16 2012 +0200

    Change API and so version

 Makefile.am                                        |    2 +-
 configure.ac                                       |    6 ++--
 doc/Makefile.am                                    |    2 +-
 ...alled.pc.in => gupnp-dlna-1.1-uninstalled.pc.in |    4 +-
 gupnp-dlna-1.0.pc.in => gupnp-dlna-1.1.pc.in       |    6 ++--
 libgupnp-dlna/Makefile.am                          |   28 ++++++++++----------
 tests/Makefile.am                                  |    2 +-
 tools/Makefile.am                                  |    7 +++-
 8 files changed, 30 insertions(+), 27 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 218bed3..18e77f9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
 SUBDIRS = libgupnp-dlna tools tests data doc
 
-pkgconfig_DATA = gupnp-dlna-1.0.pc
+pkgconfig_DATA = gupnp-dlna-1.1.pc
 pkgconfigdir = $(libdir)/pkgconfig
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
diff --git a/configure.ac b/configure.ac
index 42a98e6..7f8d312 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,7 @@ AM_SILENT_RULES([yes])
 
 dnl library versioning
 dnl Increase when changing the API
-GUPNP_DLNA_CURRENT=2
+GUPNP_DLNA_CURRENT=3
 
 dnl Update when changing implementation of current API,
 dnl reset to 0 when changing CURRENT.  This is the revision of
@@ -77,7 +77,7 @@ tests/test-discoverer.sh
 doc/Makefile
 doc/version.xml
 data/Makefile
-gupnp-dlna-1.0.pc
-gupnp-dlna-1.0-uninstalled.pc
+gupnp-dlna-1.1.pc
+gupnp-dlna-1.1-uninstalled.pc
 ])
 AC_OUTPUT
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 5601294..2dbb80f 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -72,7 +72,7 @@ expand_content_files=
 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
 INCLUDES=-I$(top_srcdir) \
 	 $(GST_CFLAGS)
-GTKDOC_LIBS=$(top_builddir)/libgupnp-dlna/libgupnp-dlna-1.0.la \
+GTKDOC_LIBS=$(top_builddir)/libgupnp-dlna/libgupnp-dlna-1.1.la \
 	    $(GST_LIBS)
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
diff --git a/gupnp-dlna-1.0-uninstalled.pc.in b/gupnp-dlna-1.1-uninstalled.pc.in
similarity index 84%
rename from gupnp-dlna-1.0-uninstalled.pc.in
rename to gupnp-dlna-1.1-uninstalled.pc.in
index 6ab739c..2461511 100644
--- a/gupnp-dlna-1.0-uninstalled.pc.in
+++ b/gupnp-dlna-1.1-uninstalled.pc.in
@@ -3,9 +3,9 @@ exec_prefix=
 libdir=${top_srcdir}/libgupnp-dlna
 includedir=${top_srcdir}/
 
-Name: gupnp-dlna-1.0
+Name: gupnp-dlna-1.1
 Description: GObject-based AV specific UPnP library
 Version: @VERSION@
-Libs: ${libdir}/libgupnp-dlna-1.0.la
+Libs: ${libdir}/libgupnp-dlna-1.1.la
 Cflags: -I${includedir} -I$(top_srcdir)/gst-convenience/gst-libs
 Requires: gstreamer- GST_MAJORMINOR@ gstreamer-base- GST_MAJORMINOR@ gstreamer-video- GST_MAJORMINOR@
diff --git a/gupnp-dlna-1.0.pc.in b/gupnp-dlna-1.1.pc.in
similarity index 72%
rename from gupnp-dlna-1.0.pc.in
rename to gupnp-dlna-1.1.pc.in
index 7b03986..9140215 100644
--- a/gupnp-dlna-1.0.pc.in
+++ b/gupnp-dlna-1.1.pc.in
@@ -3,9 +3,9 @@ exec_prefix= exec_prefix@
 libdir= libdir@
 includedir= includedir@
 
-Name: gupnp-dlna-1.0
+Name: gupnp-dlna-1.1
 Description: GObject-based AV specific UPnP library
 Version: @VERSION@
-Libs: -L${libdir} -lgupnp-dlna-1.0
-Cflags: -I${includedir}/gupnp-dlna-1.0
+Libs: -L${libdir} -lgupnp-dlna-1.1
+Cflags: -I${includedir}/gupnp-dlna-1.1
 Requires: gstreamer- GST_MAJORMINOR@ gstreamer-base- GST_MAJORMINOR@ gstreamer-video- GST_MAJORMINOR@
diff --git a/libgupnp-dlna/Makefile.am b/libgupnp-dlna/Makefile.am
index 4c93cc5..3b22796 100644
--- a/libgupnp-dlna/Makefile.am
+++ b/libgupnp-dlna/Makefile.am
@@ -18,7 +18,7 @@ AM_CFLAGS = -I$(top_srcdir) \
 	    -DDATA_DIR='"$(shareddir)"' \
 	    -DG_LOG_DOMAIN='"gupnp-dlna"'
 
-lib_LTLIBRARIES = libgupnp-dlna-1.0.la
+lib_LTLIBRARIES = libgupnp-dlna-1.1.la
 
 gupnp-dlna-marshal.c: gupnp-dlna-marshal.list
 	$(AM_V_GEN) \
@@ -30,9 +30,9 @@ gupnp-dlna-marshal.h: gupnp-dlna-marshal.list
 
 BUILT_SOURCES = gupnp-dlna-marshal.c gupnp-dlna-marshal.h
 
-libgupnp_dlna_incdir = $(includedir)/gupnp-dlna-1.0/libgupnp-dlna
+libgupnp_dlna_incdir = $(includedir)/gupnp-dlna-1.1/libgupnp-dlna
 
-libgupnp_dlna_1_0_la_LDFLAGS = -version-info $(LTVERSION) -no-undefined
+libgupnp_dlna_1_1_la_LDFLAGS = -version-info $(LTVERSION) -no-undefined
 
 libgupnp_dlna_inc_HEADERS = gupnp-dlna-profile.h \
 			    gupnp-dlna-information.h \
@@ -48,10 +48,10 @@ introspection_sources = $(libgupnp_dlna_inc_HEADERS) \
 			gupnp-dlna-profiles.c \
 			profile-loading.c
 
-libgupnp_dlna_1_0_la_SOURCES = $(introspection_sources) \
+libgupnp_dlna_1_1_la_SOURCES = $(introspection_sources) \
 			       $(BUILT_SOURCES)
 
-libgupnp_dlna_1_0_la_LIBADD = $(LIBXML_LIBS) \
+libgupnp_dlna_1_1_la_LIBADD = $(LIBXML_LIBS) \
 			      $(GST_PBU_LIBS)
 
 -include $(INTROSPECTION_MAKEFILE)
@@ -64,18 +64,18 @@ INTROSPECTION_SCANNER_ARGS = --warn-all				\
 INTROSPECTION_COMPILER_ARGS = --includedir=$(top_srcdir)
 
 if HAVE_INTROSPECTION
-GUPnPDLNA-1.0.gir: libgupnp-dlna-1.0.la
-GUPnPDLNA_1_0_gir_INCLUDES = libxml2-2.0 GObject-2.0 GstPbutils-1.0
-GUPnPDLNA_1_0_gir_CFLAGS =  $(INCLUDES) $(AM_CFLAGS)
-GUPnPDLNA_1_0_gir_LIBS = libgupnp-dlna-1.0.la gstreamer-1.0
-GUPnPDLNA_1_0_gir_FILES = $(introspection_sources)
-GUPnPDLNA_1_0_gir_NAMESPACE = GUPnPDLNA
-GUPnPDLNA_1_0_gir_VERSION = 1.0
+GUPnPDLNA-1.1.gir: libgupnp-dlna-1.1.la
+GUPnPDLNA_1_1_gir_INCLUDES = libxml2-2.0 GObject-2.0 GstPbutils-1.0
+GUPnPDLNA_1_1_gir_CFLAGS =  $(INCLUDES) $(AM_CFLAGS)
+GUPnPDLNA_1_1_gir_LIBS = libgupnp-dlna-1.1.la gstreamer-1.0
+GUPnPDLNA_1_1_gir_FILES = $(introspection_sources)
+GUPnPDLNA_1_1_gir_NAMESPACE = GUPnPDLNA
+GUPnPDLNA_1_1_gir_VERSION = 1.1
 
-INTROSPECTION_GIRS += GUPnPDLNA-1.0.gir
+INTROSPECTION_GIRS += GUPnPDLNA-1.1.gir
 
 girdir = $(datadir)/gir-1.0
-gir_DATA = GUPnPDLNA-1.0.gir
+gir_DATA = GUPnPDLNA-1.1.gir
 
 typelibdir = $(libdir)/girepository-1.0/
 typelib_DATA = $(gir_DATA:.gir=.typelib)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index cbd7766..31fb782 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -4,7 +4,7 @@ AM_CFLAGS = -I$(top_srcdir) $(GST_CFLAGS) $(GST_PBU_CFLAGS) $(LIBXML_CFLAGS)
 LIBS = $(GST_LIBS) \
        $(LIBXML_LIBS) \
        $(GST_PBU_LIBS) \
-       $(top_builddir)/libgupnp-dlna/libgupnp-dlna-1.0.la
+       $(top_builddir)/libgupnp-dlna/libgupnp-dlna-1.1.la
 
 dlna_profile_parser_SOURCES = dlna-profile-parser.c
 dlna_encoding_SOURCES = dlna-encoding.c
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 122be05..71f91a1 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,6 +1,9 @@
-bin_PROGRAMS = gupnp-dlna-info gupnp-dlna-ls-profiles
+bin_PROGRAMS = gupnp-dlna-info-1.1 gupnp-dlna-ls-profiles-1.1
 
 AM_CFLAGS = -I$(top_srcdir) $(GST_CFLAGS) $(GST_PBU_CFLAGS)
+gupnp_dlna_info_1_1_SOURCES = gupnp-dlna-info.c
+gupnp_dlna_ls_profiles_1_1_SOURCES = gupnp-dlna-ls-profiles.c
+
 LIBS = $(GST_LIBS) \
        $(GST_PBU_LIBS) \
-       $(top_builddir)/libgupnp-dlna/libgupnp-dlna-1.0.la
+       $(top_builddir)/libgupnp-dlna/libgupnp-dlna-1.1.la