GNOME.org
 

[gupnp: 11/18] Bump API/ABI versions

commit 7fe77e02e890346baa8daa28b8d7e4a3f834b45b
Author: Jens Georg <mail jensge org>
Date:   Fri Sep 30 11:54:54 2016 +0200

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

 Makefile.am                                        |    4 +-
 configure.ac                                       |    6 ++--
 doc/Makefile.am                                    |    2 +-
 examples/Makefile.am                               |    2 +-
 examples/browse.js                                 |    2 +
 examples/get-volume.js                             |    1 +
 examples/last-change.js                            |    2 +
 ...ninstalled.pc.in => gupnp-1.2-uninstalled.pc.in |    4 +-
 gupnp-1.0.pc.in => gupnp-1.2.pc.in                 |    6 ++--
 libgupnp/Makefile.am                               |   32 ++++++++++----------
 tests/Makefile.am                                  |   10 +++---
 tests/gtest/Makefile.am                            |    2 +-
 vala/{GUPnP-1.0.metadata => GUPnP-1.2.metadata}    |    0
 vala/Makefile.am                                   |   20 ++++++------
 ...gupnp-1.0-custom.vala => gupnp-1.2-custom.vala} |    0
 vala/{gupnp-1.0.deps => gupnp-1.2.deps}            |    0
 16 files changed, 49 insertions(+), 44 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 1185e35..f9df539 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,10 +2,10 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
 SUBDIRS = libgupnp tools examples tests doc vala
 
-pkgconfig_DATA= gupnp-1.0.pc
+pkgconfig_DATA= gupnp-1.2.pc
 pkgconfigdir = $(libdir)/pkgconfig
 
-EXTRA_DIST = gupnp-1.0.pc.in gupnp-1.0-uninstalled.pc.in
+EXTRA_DIST = gupnp-1.2.pc.in gupnp-1.2-uninstalled.pc.in
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection
 
diff --git a/configure.ac b/configure.ac
index 586a9ee..ba80b4a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ([2.64])
 AC_INIT([gupnp],
-        [1.0.0],
+        [1.1.0],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=gupnp&component=gupnp],
         [gupnp],
         [http://www.gupnp.org/])
@@ -164,8 +164,8 @@ tests/gtest/Makefile
 doc/Makefile
 doc/version.xml
 vala/Makefile
-gupnp-1.0.pc
-gupnp-1.0-uninstalled.pc
+gupnp-1.2.pc
+gupnp-1.2-uninstalled.pc
 ])
 AC_OUTPUT
 
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 2e92132..b6e5fba 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -92,7 +92,7 @@ expand_content_files=client-tutorial.xml server-tutorial.xml
 # e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
 GTKDOC_CFLAGS=-I$(top_srcdir) $(LIBGUPNP_CFLAGS)
-GTKDOC_LIBS=$(top_builddir)/libgupnp/libgupnp-1.0.la $(LIBGUPNP_LIBS)
+GTKDOC_LIBS=$(top_builddir)/libgupnp/libgupnp-1.2.la $(LIBGUPNP_LIBS)
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
 include $(top_srcdir)/gtk-doc.make
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 853cb7c..dbd8606 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1,5 +1,5 @@
 AM_CFLAGS = $(LIBGUPNP_CFLAGS) -I$(top_srcdir) $(GTHREAD_CFLAGS)
-LDADD = $(top_builddir)/libgupnp/libgupnp-1.0.la
+LDADD = $(top_builddir)/libgupnp/libgupnp-1.2.la
 
 noinst_PROGRAMS = light-server light-client
 
diff --git a/examples/browse.js b/examples/browse.js
index e7ec30e..d790ff5 100755
--- a/examples/browse.js
+++ b/examples/browse.js
@@ -26,6 +26,8 @@
 // OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 // DAMAGE.
 
+imports.gi.versions.GUPnP = "1.2"
+
 const Mainloop = imports.mainloop;
 const GUPnP = imports.gi.GUPnP;
 const GObject = imports.gi.GObject;
diff --git a/examples/get-volume.js b/examples/get-volume.js
index 8f2939e..81b1345 100755
--- a/examples/get-volume.js
+++ b/examples/get-volume.js
@@ -26,6 +26,7 @@
 // OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 // DAMAGE.
 
+imports.gi.versions.GUPnP = "1.2"
 
 const Mainloop = imports.mainloop;
 const GUPnP = imports.gi.GUPnP;
diff --git a/examples/last-change.js b/examples/last-change.js
index a68e0d7..87e7a3c 100755
--- a/examples/last-change.js
+++ b/examples/last-change.js
@@ -26,6 +26,8 @@
 // OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 // DAMAGE.
 
+imports.gi.versions.GUPnP = "1.2"
+
 const Mainloop = imports.mainloop;
 const GUPnP = imports.gi.GUPnP;
 const GObject = imports.gi.GObject;
diff --git a/gupnp-1.0-uninstalled.pc.in b/gupnp-1.2-uninstalled.pc.in
similarity index 82%
rename from gupnp-1.0-uninstalled.pc.in
rename to gupnp-1.2-uninstalled.pc.in
index c44a201..cd7128e 100644
--- a/gupnp-1.0-uninstalled.pc.in
+++ b/gupnp-1.2-uninstalled.pc.in
@@ -3,9 +3,9 @@ exec_prefix=
 libdir=${pcfiledir}/libgupnp
 includedir=${pcfiledir}/
 
-Name: gupnp-1.0
+Name: gupnp-1.2
 Description: GObject-based UPnP library
 Version: @VERSION@
-Libs: ${libdir}/libgupnp-1.0.la
+Libs: ${libdir}/libgupnp-1.2.la
 Cflags: -I${includedir}
 Requires.private: gssdp-1.0 libxml-2.0 libsoup-2.4 @UUID_LIBS@
diff --git a/gupnp-1.0.pc.in b/gupnp-1.2.pc.in
similarity index 71%
rename from gupnp-1.0.pc.in
rename to gupnp-1.2.pc.in
index 51e0128..71f2830 100644
--- a/gupnp-1.0.pc.in
+++ b/gupnp-1.2.pc.in
@@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-Name: gupnp-1.0
+Name: gupnp-1.2
 Description: GObject-based UPnP library
 Version: @VERSION@
-Libs: -L${libdir} -lgupnp-1.0
-Cflags: -I${includedir}/gupnp-1.0
+Libs: -L${libdir} -lgupnp-1.2
+Cflags: -I${includedir}/gupnp-1.2
 Requires.private: gssdp-1.0 libxml-2.0 libsoup-2.4 @UUID_LIBS@
diff --git a/libgupnp/Makefile.am b/libgupnp/Makefile.am
index c7ad085..d95f271 100644
--- a/libgupnp/Makefile.am
+++ b/libgupnp/Makefile.am
@@ -1,4 +1,4 @@
-LTVERSION = 4:0:0
+LTVERSION = 0:0:0
 
 if OS_WIN32
 CONTEXT_MANAGER_IMPL = gupnp-windows-context-manager.c \
@@ -46,9 +46,9 @@ AM_CFLAGS = $(LIBGUPNP_CFLAGS) \
            $(CONTEXT_MANAGER_CFLAGS) \
         $(WARN_CFLAGS)
 
-libgupnpincdir = $(includedir)/gupnp-1.0/libgupnp
+libgupnpincdir = $(includedir)/gupnp-1.2/libgupnp
 
-lib_LTLIBRARIES = libgupnp-1.0.la
+lib_LTLIBRARIES = libgupnp-1.2.la
 
 libgupnpinc_HEADERS = gupnp-acl.h                      \
                      gupnp-context.h                   \
@@ -98,9 +98,9 @@ gupnp-marshal.h: gupnp-marshal.list
 
 BUILT_SOURCES = gupnp-marshal.c gupnp-marshal.h
 
-libgupnp_1_0_la_LDFLAGS = -version-info $(LTVERSION) $(WIN32_LDFLAGS) $(WARN_LDFLAGS)
+libgupnp_1_2_la_LDFLAGS = -version-info $(LTVERSION) $(WIN32_LDFLAGS) $(WARN_LDFLAGS)
 
-libgupnp_1_0_la_SOURCES = $(introspection_sources)             \
+libgupnp_1_2_la_SOURCES = $(introspection_sources)             \
                          http-headers.c                        \
                          http-headers.h                        \
                          gupnp-context-private.h               \
@@ -122,7 +122,7 @@ libgupnp_1_0_la_SOURCES = $(introspection_sources)          \
                          guul.h \
                          $(BUILT_SOURCES)
 
-libgupnp_1_0_la_LIBADD = $(LIBGUPNP_LIBS) $(DBUS_GLIB_LIBS) $(CONTEXT_MANAGER_LIBS) $(GUUL_LIBS)
+libgupnp_1_2_la_LIBADD = $(LIBGUPNP_LIBS) $(DBUS_GLIB_LIBS) $(CONTEXT_MANAGER_LIBS) $(GUUL_LIBS)
 
 EXTRA_DIST = gupnp-marshal.list           \
             gupnp-network-manager.c       \
@@ -142,23 +142,23 @@ INTROSPECTION_SCANNER_ARGS = \
                             --symbol-prefix=gupnp      \
                             --identifier-prefix=GUPnP  \
                             --add-include-path=$(top_srcdir) \
-                            --pkg-export=gupnp-1.0 \
+                            --pkg-export=gupnp-1.2 \
                  $(WARN_SCANNERFLAGS)
 INTROSPECTION_COMPILER_ARGS = --includedir=$(top_srcdir)
 
 if HAVE_INTROSPECTION
-GUPnP-1.0.gir: libgupnp-1.0.la
-GUPnP_1_0_gir_INCLUDES = libxml2-2.0 GObject-2.0 Soup-2.4 GSSDP-1.0
-GUPnP_1_0_gir_CFLAGS = -DGOBJECT_INTROSPECTION_SKIP $(INCLUDES) $(AM_CFLAGS)
-GUPnP_1_0_gir_LIBS = libgupnp-1.0.la
-GUPnP_1_0_gir_FILES = $(introspection_sources)
-GUPnP_1_0_gir_NAMESPACE = GUPnP
-GUPnP_1_0_gir_VERSION = 1.0
+GUPnP-1.2.gir: libgupnp-1.2.la
+GUPnP_1_2_gir_INCLUDES = libxml2-2.0 GObject-2.0 Soup-2.4 GSSDP-1.0
+GUPnP_1_2_gir_CFLAGS = -DGOBJECT_INTROSPECTION_SKIP $(INCLUDES) $(AM_CFLAGS)
+GUPnP_1_2_gir_LIBS = libgupnp-1.2.la
+GUPnP_1_2_gir_FILES = $(introspection_sources)
+GUPnP_1_2_gir_NAMESPACE = GUPnP
+GUPnP_1_2_gir_VERSION = 1.2
 
-INTROSPECTION_GIRS += GUPnP-1.0.gir
+INTROSPECTION_GIRS += GUPnP-1.2.gir
 
 girdir = $(datadir)/gir-1.0
-gir_DATA = GUPnP-1.0.gir
+gir_DATA = GUPnP-1.2.gir
 
 typelibdir = $(libdir)/girepository-1.0/
 typelib_DATA = $(gir_DATA:.gir=.typelib)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index b47ea80..b7571a8 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -9,31 +9,31 @@ noinst_PROGRAMS = test-browsing      \
                  test-white-list
 
 test_browsing_SOURCES = test-browsing.c
-test_browsing_LDADD   = $(top_builddir)/libgupnp/libgupnp-1.0.la \
+test_browsing_LDADD   = $(top_builddir)/libgupnp/libgupnp-1.2.la \
                        $(GTHREAD_LIBS) \
                        $(LIBGUPNP_LIBS)
 test_browsing_LDFLAGS = $(WARN_LDFLAGS)
 
 test_proxy_SOURCES = test-proxy.c
-test_proxy_LDADD   = $(top_builddir)/libgupnp/libgupnp-1.0.la \
+test_proxy_LDADD   = $(top_builddir)/libgupnp/libgupnp-1.2.la \
                     $(GTHREAD_LIBS) \
                     $(LIBGUPNP_LIBS)
 test_proxy_LDFLAGS = $(WARN_LDFLAGS)
 
 test_introspection_SOURCES = test-introspection.c
-test_introspection_LDADD   = $(top_builddir)/libgupnp/libgupnp-1.0.la \
+test_introspection_LDADD   = $(top_builddir)/libgupnp/libgupnp-1.2.la \
                             $(GTHREAD_LIBS) \
                             $(LIBGUPNP_LIBS)
 test_introspection_LDFLAGS = $(WARN_LDFLAGS)
 
 test_server_SOURCES = test-server.c
-test_server_LDADD   = $(top_builddir)/libgupnp/libgupnp-1.0.la \
+test_server_LDADD   = $(top_builddir)/libgupnp/libgupnp-1.2.la \
                      $(GTHREAD_LIBS) \
                      $(LIBGUPNP_LIBS)
 test_server_LDFLAGS = -export-dynamic $(WARN_LDFLAGS)
 
 test_white_list_SOURCES = test-white-list.c
-test_white_list_LDADD   = $(top_builddir)/libgupnp/libgupnp-1.0.la \
+test_white_list_LDADD   = $(top_builddir)/libgupnp/libgupnp-1.2.la \
                          $(GTHREAD_LIBS) \
                          $(LIBGUPNP_LIBS)
 test_white_list_LDFLAGS = $(WARN_LDFLAGS)
diff --git a/tests/gtest/Makefile.am b/tests/gtest/Makefile.am
index 24f56a6..5fe33f4 100644
--- a/tests/gtest/Makefile.am
+++ b/tests/gtest/Makefile.am
@@ -9,7 +9,7 @@ test_context_SOURCES = test-context.c
 test_bugs_SOURCES = test-bugs.c
 
 LDADD = \
-       $(top_builddir)/libgupnp/libgupnp-1.0.la \
+       $(top_builddir)/libgupnp/libgupnp-1.2.la \
        $(LIBGUPNP_LIBS)
 AM_CFLAGS = \
            $(LIBGUPNP_CFLAGS) \
diff --git a/vala/GUPnP-1.0.metadata b/vala/GUPnP-1.2.metadata
similarity index 100%
rename from vala/GUPnP-1.0.metadata
rename to vala/GUPnP-1.2.metadata
diff --git a/vala/Makefile.am b/vala/Makefile.am
index d60fdbf..0ad4f35 100644
--- a/vala/Makefile.am
+++ b/vala/Makefile.am
@@ -1,21 +1,21 @@
 if HAVE_INTROSPECTION
 if HAVE_VAPIGEN
-gupnp-1.0.vapi: gupnp-1.0.stamp
+gupnp-1.2.vapi: gupnp-1.2.stamp
        @true
 
-gupnp-1.0.stamp: $(top_builddir)/libgupnp/GUPnP-1.0.gir \
-               $(srcdir)/GUPnP-1.0.metadata \
-               $(srcdir)/gupnp-1.0-custom.vala
+gupnp-1.2.stamp: $(top_builddir)/libgupnp/GUPnP-1.2.gir \
+               $(srcdir)/GUPnP-1.2.metadata \
+               $(srcdir)/gupnp-1.2-custom.vala
        $(AM_V_GEN)$(VAPIGEN) --metadatadir=$(srcdir) \
                                  --pkg=libsoup-2.4 \
-                             --library=gupnp-1.0 --pkg=gio-2.0 --pkg=libxml-2.0 \
-                             $(top_builddir)/libgupnp/GUPnP-1.0.gir \
-                                 $(srcdir)/gupnp-1.0-custom.vala && \
+                             --library=gupnp-1.2 --pkg=gio-2.0 --pkg=libxml-2.0 \
+                             $(top_builddir)/libgupnp/GUPnP-1.2.gir \
+                                 $(srcdir)/gupnp-1.2-custom.vala && \
        echo timestmap > $(@F)
 
 vapidir = $(datadir)/vala/vapi
-vapi_DATA = gupnp-1.0.vapi $(srcdir)/gupnp-1.0.deps
-CLEANFILES = gupnp-1.0.vapi gupnp-1.0.stamp
-EXTRA_DIST = gupnp-1.0.deps GUPnP-1.0.metadata gupnp-1.0-custom.vala gupnp-1.0.vapi gupnp-1.0.stamp
+vapi_DATA = gupnp-1.2.vapi $(srcdir)/gupnp-1.2.deps
+CLEANFILES = gupnp-1.2.vapi gupnp-1.2.stamp
+EXTRA_DIST = gupnp-1.2.deps GUPnP-1.2.metadata gupnp-1.2-custom.vala gupnp-1.2.vapi gupnp-1.2.stamp
 endif
 endif
diff --git a/vala/gupnp-1.0-custom.vala b/vala/gupnp-1.2-custom.vala
similarity index 100%
rename from vala/gupnp-1.0-custom.vala
rename to vala/gupnp-1.2-custom.vala
diff --git a/vala/gupnp-1.0.deps b/vala/gupnp-1.2.deps
similarity index 100%
rename from vala/gupnp-1.0.deps
rename to vala/gupnp-1.2.deps
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]