GNOME.org
 

[gssdp] Bump API and ABI version

commit b0154d4cb804ad8a39f2eff6213581423b9c2843
Author: Jens Georg <mail jensge org>
Date:   Mon Oct 10 22:23:20 2016 +0200

    Bump API and ABI version

 .gitignore                                         |    4 +-
 Makefile.am                                        |    4 +-
 configure.ac                                       |    6 +-
 doc/Makefile.am                                    |    2 +-
 examples/Makefile.am                               |    4 +-
 ...ninstalled.pc.in => gssdp-1.2-uninstalled.pc.in |    4 +-
 gssdp-1.0.pc.in => gssdp-1.2.pc.in                 |    6 +-
 libgssdp/Makefile.am                               |   40 ++++++++++----------
 tests/Makefile.am                                  |    2 +-
 tools/Makefile.am                                  |    2 +-
 vala/{GSSDP-1.0.metadata => GSSDP-1.2.metadata}    |    0
 vala/Makefile.am                                   |   20 +++++-----
 ...gssdp-1.0-custom.vala => gssdp-1.2-custom.vala} |    0
 vala/{gssdp-1.0.deps => gssdp-1.2.deps}            |    0
 14 files changed, 47 insertions(+), 47 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c218df0..df78a87 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,5 +40,5 @@ INSTALL
 
 /tools/gssdp-device-sniffer
 
-/vala/gssdp-1.0.stamp
-/vala/gssdp-1.0.vapi
+/vala/gssdp-1.2.stamp
+/vala/gssdp-1.2.vapi
diff --git a/Makefile.am b/Makefile.am
index 7363921..9761a97 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,10 +8,10 @@ SUBDIRS = libgssdp $(TOOLS_DIR) tests examples doc vala
 
 ACLOCAL_AMFLAGS=${ACLOCAL_FLAGS} -I m4
 
-pkgconfig_DATA= gssdp-1.0.pc
+pkgconfig_DATA= gssdp-1.2.pc
 pkgconfigdir = $(libdir)/pkgconfig
 
-EXTRA_DIST = gssdp-1.0.pc.in gssdp-1.0-uninstalled.pc.in m4/introspection.m4
+EXTRA_DIST = gssdp-1.2.pc.in gssdp-1.2-uninstalled.pc.in m4/introspection.m4
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection
 
diff --git a/configure.ac b/configure.ac
index 1f179e1..05557c7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ([2.64])
 AC_INIT([gssdp],
-        [1.0.0],
+        [1.1.0],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=gupnp&component=gssdp],
         [gssdp],
         [http://www.gupnp.org/])
@@ -169,8 +169,8 @@ examples/Makefile
 vala/Makefile
 doc/Makefile
 doc/version.xml
-gssdp-1.0.pc
-gssdp-1.0-uninstalled.pc
+gssdp-1.2.pc
+gssdp-1.2-uninstalled.pc
 ])
 AC_OUTPUT
 
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 4cd21d6..f1e1fb0 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -71,7 +71,7 @@ expand_content_files=
 # e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
 GTKDOC_CFLAGS=-I$(top_srcdir) $(LIBGSSDP_CFLAGS)
-GTKDOC_LIBS=$(top_builddir)/libgssdp/libgssdp-1.0.la $(LIBGSSDP_LIBS)
+GTKDOC_LIBS=$(top_builddir)/libgssdp/libgssdp-1.2.la $(LIBGSSDP_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 9f47337..bc68d46 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -3,10 +3,10 @@ AM_CFLAGS = $(LIBGSSDP_CFLAGS) -I$(top_srcdir)
 noinst_PROGRAMS = test-browser test-publish
 
 test_browser_SOURCES = test-browser.c
-test_browser_LDADD   = $(top_builddir)/libgssdp/libgssdp-1.0.la $(LIBGSSDP_LIBS)
+test_browser_LDADD   = $(top_builddir)/libgssdp/libgssdp-1.2.la $(LIBGSSDP_LIBS)
 
 test_publish_SOURCES = test-publish.c
-test_publish_LDADD   = $(top_builddir)/libgssdp/libgssdp-1.0.la $(LIBGSSDP_LIBS)
+test_publish_LDADD   = $(top_builddir)/libgssdp/libgssdp-1.2.la $(LIBGSSDP_LIBS)
 
 CLEANFILES = $(BUILT_SOURCES)
 DISTCLEANFILES = $(BUILT_SOURCES)
diff --git a/gssdp-1.0-uninstalled.pc.in b/gssdp-1.2-uninstalled.pc.in
similarity index 80%
rename from gssdp-1.0-uninstalled.pc.in
rename to gssdp-1.2-uninstalled.pc.in
index 445e251..205e63d 100644
--- a/gssdp-1.0-uninstalled.pc.in
+++ b/gssdp-1.2-uninstalled.pc.in
@@ -3,9 +3,9 @@ exec_prefix=
 libdir=${pcfiledir}/libgssdp
 includedir=${pcfiledir}/
 
-Name: gssdp-1.0
+Name: gssdp-1.2
 Description: GObject-based SSDP library
 Version: @VERSION@
-Libs: ${libdir}/libgssdp-1.0.la
+Libs: ${libdir}/libgssdp-1.2.la
 Cflags: -I${includedir}
 Requires.private: gobject-2.0 gio-2.0
diff --git a/gssdp-1.0.pc.in b/gssdp-1.2.pc.in
similarity index 69%
rename from gssdp-1.0.pc.in
rename to gssdp-1.2.pc.in
index 4c320f6..84b8c05 100644
--- a/gssdp-1.0.pc.in
+++ b/gssdp-1.2.pc.in
@@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-Name: gssdp-1.0
+Name: gssdp-1.2
 Description: GObject-based SSDP library
 Version: @VERSION@
-Libs: -L${libdir} -lgssdp-1.0
-Cflags: -I${includedir}/gssdp-1.0
+Libs: -L${libdir} -lgssdp-1.2
+Cflags: -I${includedir}/gssdp-1.2
 Requires.private: gobject-2.0 gio-2.0
diff --git a/libgssdp/Makefile.am b/libgssdp/Makefile.am
index 7674d42..9eca703 100644
--- a/libgssdp/Makefile.am
+++ b/libgssdp/Makefile.am
@@ -8,13 +8,13 @@
 # If any interfaces have been removed since the last public release, then set
 # age to 0.
 
-LTVERSION = 3:0:0
+LTVERSION = 0:0:0
 
 AM_CFLAGS = $(LIBGSSDP_CFLAGS) -I$(top_srcdir) $(WARN_CFLAGS)
 
-libgssdpincdir = $(includedir)/gssdp-1.0/libgssdp
+libgssdpincdir = $(includedir)/gssdp-1.2/libgssdp
 
-lib_LTLIBRARIES = libgssdp-1.0.la
+lib_LTLIBRARIES = libgssdp-1.2.la
 
 libgssdpinc_HEADERS =  gssdp-client.h           \
                        gssdp-error.h            \
@@ -38,8 +38,8 @@ introspection_sources = $(libgssdpinc_HEADERS)        \
                        gssdp-resource-browser.c\
                        gssdp-resource-group.c
 
-libgssdp_1_0_la_LDFLAGS = -version-info $(LTVERSION) $(WARN_LDFLAGS)
-libgssdp_1_0_la_SOURCES = $(introspection_sources)     \
+libgssdp_1_2_la_LDFLAGS = -version-info $(LTVERSION) $(WARN_LDFLAGS)
+libgssdp_1_2_la_SOURCES = $(introspection_sources)     \
                          gssdp-client-private.h        \
                          gssdp-protocol.h              \
                          gssdp-socket-source.c         \
@@ -49,20 +49,20 @@ libgssdp_1_0_la_SOURCES = $(introspection_sources)  \
                          $(BUILT_SOURCES)
 
 if HAVE_PKTINFO
-libgssdp_1_0_la_SOURCES += gssdp-pktinfo-message.c \
+libgssdp_1_2_la_SOURCES += gssdp-pktinfo-message.c \
                                                   gssdp-pktinfo-message.h
 endif
 
-libgssdp_1_0_la_LIBADD = $(LIBGSSDP_LIBS)
+libgssdp_1_2_la_LIBADD = $(LIBGSSDP_LIBS)
 
 if OS_WIN32
 
-libgssdp_1_0_la_LIBADD += -lws2_32 -liphlpapi
-libgssdp_1_0_la_LDFLAGS += -no-undefined
+libgssdp_1_2_la_LIBADD += -lws2_32 -liphlpapi
+libgssdp_1_2_la_LDFLAGS += -no-undefined
 endif
 
 if TARGET_ANDROID
-libgssdp_1_0_la_LIBADD += -llog
+libgssdp_1_2_la_LIBADD += -llog
 endif
 
 EXTRA_DIST = gssdp-marshal.list
@@ -75,23 +75,23 @@ INTROSPECTION_SCANNER_ARGS = \
                             --symbol-prefix=gssdp              \
                             --identifier-prefix=GSSDP          \
                             --add-include-path=$(top_srcdir) \
-                            --pkg-export=gssdp-1.0 \
+                            --pkg-export=gssdp-1.2 \
                             $(WARN_SCANNERFLAGS)
 INTROSPECTION_COMPILER_ARGS = --includedir=$(top_srcdir)
 
 
 if HAVE_INTROSPECTION
-GSSDP-1.0.gir: libgssdp-1.0.la
-GSSDP_1_0_gir_INCLUDES = GObject-2.0 Gio-2.0 Soup-2.4
-GSSDP_1_0_gir_CFLAGS = $(INCLUDES)
-GSSDP_1_0_gir_LIBS = libgssdp-1.0.la
-GSSDP_1_0_gir_FILES = $(introspection_sources)
-GSSDP_1_0_gir_NAMESPACE = GSSDP
-GSSDP_1_0_gir_VERSION = 1.0
-INTROSPECTION_GIRS += GSSDP-1.0.gir
+GSSDP-1.2.gir: libgssdp-1.2.la
+GSSDP_1_2_gir_INCLUDES = GObject-2.0 Gio-2.0 Soup-2.4
+GSSDP_1_2_gir_CFLAGS = $(INCLUDES)
+GSSDP_1_2_gir_LIBS = libgssdp-1.2.la
+GSSDP_1_2_gir_FILES = $(introspection_sources)
+GSSDP_1_2_gir_NAMESPACE = GSSDP
+GSSDP_1_2_gir_VERSION = 1.2
+INTROSPECTION_GIRS += GSSDP-1.2.gir
 
 girdir = $(datadir)/gir-1.0
-gir_DATA = GSSDP-1.0.gir
+gir_DATA = GSSDP-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 6c9befc..6133acd 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -15,7 +15,7 @@ test_functional_SOURCES = test-functional.c
 test_functional_LDFLAGS = $(WARN_LDFLAGS)
 
 LDADD = \
-       $(top_builddir)/libgssdp/libgssdp-1.0.la \
+       $(top_builddir)/libgssdp/libgssdp-1.2.la \
        libtestutil.a \
        $(LIBGSSDP_LIBS)
 
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 840f9bb..01f4f53 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -6,7 +6,7 @@ AM_CFLAGS = $(LIBGSSDP_CFLAGS) $(LIBGTK_CFLAGS) -I$(top_srcdir) -DUI_DIR='"$(uid
 bin_PROGRAMS = gssdp-device-sniffer
 
 gssdp_device_sniffer_SOURCES = gssdp-device-sniffer.c
-gssdp_device_sniffer_LDADD = $(LIBGSSDP_LIBS) $(LIBGTK_LIBS) $(top_builddir)/libgssdp/libgssdp-1.0.la
+gssdp_device_sniffer_LDADD = $(LIBGSSDP_LIBS) $(LIBGTK_LIBS) $(top_builddir)/libgssdp/libgssdp-1.2.la
 gssdp_device_sniffer_LDFLAGS = -export-dynamic $(WARN_LDFLAGS)
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/vala/GSSDP-1.0.metadata b/vala/GSSDP-1.2.metadata
similarity index 100%
rename from vala/GSSDP-1.0.metadata
rename to vala/GSSDP-1.2.metadata
diff --git a/vala/Makefile.am b/vala/Makefile.am
index 6d23189..a559013 100644
--- a/vala/Makefile.am
+++ b/vala/Makefile.am
@@ -1,20 +1,20 @@
 if HAVE_INTROSPECTION
 if HAVE_VAPIGEN
-gssdp-1.0.vapi: gssdp-1.0.stamp
+gssdp-1.2.vapi: gssdp-1.2.stamp
        @true
 
-gssdp-1.0.stamp: $(top_builddir)/libgssdp/GSSDP-1.0.gir \
-               $(srcdir)/GSSDP-1.0.metadata \
-               $(srcdir)/gssdp-1.0-custom.vala
+gssdp-1.2.stamp: $(top_builddir)/libgssdp/GSSDP-1.2.gir \
+               $(srcdir)/GSSDP-1.2.metadata \
+               $(srcdir)/gssdp-1.2-custom.vala
        $(AM_V_GEN)$(VAPIGEN) --metadatadir=$(srcdir) \
-                             --library=gssdp-1.0 --pkg=gio-2.0 --pkg=libsoup-2.4 \
-                             $(top_builddir)/libgssdp/GSSDP-1.0.gir \
-                                 $(srcdir)/gssdp-1.0-custom.vala && \
+                             --library=gssdp-1.2 --pkg=gio-2.0 --pkg=libsoup-2.4 \
+                             $(top_builddir)/libgssdp/GSSDP-1.2.gir \
+                                 $(srcdir)/gssdp-1.2-custom.vala && \
        echo timestmap > $(@F)
 
 vapidir = $(datadir)/vala/vapi
-vapi_DATA = gssdp-1.0.vapi $(srcdir)/gssdp-1.0.deps
-CLEANFILES = gssdp-1.0.vapi gssdp-1.0.stamp
-EXTRA_DIST = gssdp-1.0.deps GSSDP-1.0.metadata gssdp-1.0-custom.vala gssdp-1.0.vapi gssdp-1.0.stamp
+vapi_DATA = gssdp-1.2.vapi $(srcdir)/gssdp-1.2.deps
+CLEANFILES = gssdp-1.2.vapi gssdp-1.2.stamp
+EXTRA_DIST = gssdp-1.2.deps GSSDP-1.2.metadata gssdp-1.2-custom.vala gssdp-1.2.vapi gssdp-1.2.stamp
 endif
 endif
diff --git a/vala/gssdp-1.0-custom.vala b/vala/gssdp-1.2-custom.vala
similarity index 100%
rename from vala/gssdp-1.0-custom.vala
rename to vala/gssdp-1.2-custom.vala
diff --git a/vala/gssdp-1.0.deps b/vala/gssdp-1.2.deps
similarity index 100%
rename from vala/gssdp-1.0.deps
rename to vala/gssdp-1.2.deps
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]