GNOME.org
 

[libepc/gtk4: 1/13] Change ABI from libepc-1.0 to libepc-2.0

commit a1516a752a0982676795edf168d444c0a39ce69b
Author: Murray Cumming <murrayc murrayc com>
Date:   Fri Nov 18 08:07:39 2016 +0100

    Change ABI from libepc-1.0 to libepc-2.0
    
    And changed libepc-ui-1.0 to libepc-ui-2.0.
    This is so we can use gtk+-4.0 instead of gtk+-3.0
    and avahi-ui-gtk-4.0
      https://github.com/lathiat/avahi/pull/90
    instead of avahi-ui-gtk-3.0.

 Makefile.am                                |   34 ++++++++++++++--------------
 configure.ac                               |    8 +++---
 docs/reference/libepc/Makefile.am          |    6 ++--
 libepc-1.0.pc.in => libepc-2.0.pc.in       |    4 +-
 libepc-ui-1.0.pc.in => libepc-ui-2.0.pc.in |    6 ++--
 5 files changed, 29 insertions(+), 29 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 7475a14..acf0d25 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,8 +10,8 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 # -- DIRECTORY DECLARATIONS --
 # ============================
 
-libepc_includedir = $(includedir)/libepc-1.0/libepc
-libepc_ui_includedir = $(includedir)/libepc-ui-1.0/libepc-ui
+libepc_includedir = $(includedir)/libepc-2.0/libepc
+libepc_ui_includedir = $(includedir)/libepc-ui-2.0/libepc-ui
 pkgconfigdir = $(libdir)/pkgconfig
 
 gtkdoc_builddir=$(top_builddir)/docs/reference/libepc
@@ -23,8 +23,8 @@ gtkdoc_srcdir=$(top_srcdir)/docs/reference/libepc
 # ==================
 
 lib_LTLIBRARIES = \
-       libepc/libepc-1.0.la \
-       libepc-ui/libepc-ui-1.0.la
+       libepc/libepc-2.0.la \
+       libepc-ui/libepc-ui-2.0.la
 noinst_LTLIBRARIES = \
        tests/libepc-tests.la
 noinst_PROGRAMS = \
@@ -77,15 +77,15 @@ libepc_ui_include_HEADERS = \
        $(srcdir)/libepc-ui/password-dialog.h \
        $(srcdir)/libepc-ui/progress-window.h
 pkgconfig_DATA = \
-       libepc-1.0.pc \
-       libepc-ui-1.0.pc
+       libepc-2.0.pc \
+       libepc-ui-2.0.pc
 dist_noinst_SCRIPTS = \
        $(srcdir)/tests/test-runner.sh
 dist_noinst_DATA = \
        $(srcdir)/examples/publisher.ui
        $(srcdir)/gtk-doc.make \
-       $(gtkdoc_srcdir)/libepc-1.0-docs.xml \
-       $(gtkdoc_srcdir)/libepc-1.0-sections.txt \
+       $(gtkdoc_srcdir)/libepc-2.0-docs.xml \
+       $(gtkdoc_srcdir)/libepc-2.0-sections.txt \
        $(srcdir)/intltool-extract.in \
        $(srcdir)/intltool-merge.in \
        $(srcdir)/intltool-update.in
@@ -99,7 +99,7 @@ BUILT_SOURCES = \
        libepc/enums.h \
        libepc/marshal.c \
        libepc/marshal.h
-libepc_libepc_1_0_la_SOURCES = \
+libepc_libepc_2_0_la_SOURCES = \
        $(libepc_include_HEADERS) \
        libepc/consumer.c \
        libepc/contents.c \
@@ -116,7 +116,7 @@ libepc_libepc_1_0_la_SOURCES = \
        libepc/service-type.c \
        libepc/shell.c \
        libepc/tls.c
-libepc_ui_libepc_ui_1_0_la_SOURCES = \
+libepc_ui_libepc_ui_2_0_la_SOURCES = \
        $(libepc_ui_include_HEADERS) \
        libepc-ui/password-dialog.c \
        libepc-ui/progress-window.c
@@ -135,16 +135,16 @@ AM_CFLAGS = \
        -DGETTEXT_PACKAGE=\"@GETTEXT_PACKAGE@\"
 
 example_epc_cflags = $(AM_CFLAGS) $(LIBEPC_CFLAGS)
-example_epc_libs = libepc/libepc-1.0.la $(LIBEPC_LIBS)
+example_epc_libs = libepc/libepc-2.0.la $(LIBEPC_LIBS)
 example_epc_ui_cflags = $(example_epc_cflags) $(LIBEPC_UI_CFLAGS)
-example_epc_ui_libs = $(example_epc_libs) libepc-ui/libepc-ui-1.0.la $(LIBEPC_UI_LIBS)
+example_epc_ui_libs = $(example_epc_libs) libepc-ui/libepc-ui-2.0.la $(LIBEPC_UI_LIBS)
 
-libepc_libepc_1_0_la_CFLAGS                    = $(AM_CFLAGS) $(LIBEPC_CFLAGS) -DG_LOG_DOMAIN=\"libepc\"
-libepc_libepc_1_0_la_LDFLAGS                   = $(LIBEPC_LIBS) -version-info $(LT_VERSION_INFO)
+libepc_libepc_2_0_la_CFLAGS                    = $(AM_CFLAGS) $(LIBEPC_CFLAGS) -DG_LOG_DOMAIN=\"libepc\"
+libepc_libepc_2_0_la_LDFLAGS                   = $(LIBEPC_LIBS) -version-info $(LT_VERSION_INFO)
 
-libepc_ui_libepc_ui_1_0_la_CFLAGS              = $(AM_CFLAGS) $(LIBEPC_UI_CFLAGS) 
-DG_LOG_DOMAIN=\"libepc-ui\"
-libepc_ui_libepc_ui_1_0_la_LDFLAGS             = $(LIBEPC_UI_LIBS) -version-info $(LT_VERSION_INFO)
-libepc_ui_libepc_ui_1_0_la_LIBADD              = libepc/libepc-1.0.la
+libepc_ui_libepc_ui_2_0_la_CFLAGS              = $(AM_CFLAGS) $(LIBEPC_UI_CFLAGS) 
-DG_LOG_DOMAIN=\"libepc-ui\"
+libepc_ui_libepc_ui_2_0_la_LDFLAGS             = $(LIBEPC_UI_LIBS) -version-info $(LT_VERSION_INFO)
+libepc_ui_libepc_ui_2_0_la_LIBADD              = libepc/libepc-2.0.la
 
 examples_list_resources_CFLAGS                 = $(example_epc_cflags)
 examples_list_resources_LDADD                  = $(example_epc_libs)
diff --git a/configure.ac b/configure.ac
index aec8a6c..be96382 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.63])
-AC_INIT([libepc], [0.4.5], [https://bugzilla.gnome.org/enter_bug.cgi?product=libepc], [libepc], 
[http://live.gnome.org/libepc])
+AC_INIT([libepc], [1.9.1], [https://bugzilla.gnome.org/enter_bug.cgi?product=libepc], [libepc], 
[http://live.gnome.org/libepc])
 AM_INIT_AUTOMAKE([1.10.3 -Wall dist-bzip2 no-define subdir-objects])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
@@ -20,7 +20,7 @@ dnl    the last update, increment CURRENT, and set REVISION to 0.
 dnl 4. If any interfaces have been added, then increment AGE.
 dnl 5. If any interfaces have been removed, then set AGE to 0.
 dnl
-LT_VERSION_INFO="3:0:0"
+LT_VERSION_INFO="1:0:0"
 AC_SUBST(LT_VERSION_INFO)
 
 GETTEXT_PACKAGE=libepc
@@ -90,7 +90,7 @@ AC_SUBST(LIBEPC_LIBS)
 
 #AC_CHECK_HEADERS([fcntl.h sys/ioctl.h sys/socket.h])
 AC_TYPE_UINT16_T
- 
+
 #AC_CHECK_FUNCS([memset setlocale socket strchr])
 AC_CHECK_LIB([avahi-ui-gtk3],
              [aui_service_dialog_set_service_type_name],
@@ -103,7 +103,7 @@ AC_CONFIG_FILES([
   Makefile
   po/Makefile.in
   docs/reference/libepc/Makefile
-  libepc-1.0.pc libepc-ui-1.0.pc
+  libepc-2.0.pc libepc-ui-2.0.pc
 ])
 
 AC_OUTPUT
diff --git a/docs/reference/libepc/Makefile.am b/docs/reference/libepc/Makefile.am
index 856de34..0be7a72 100644
--- a/docs/reference/libepc/Makefile.am
+++ b/docs/reference/libepc/Makefile.am
@@ -9,7 +9,7 @@ AUTOMAKE_OPTIONS = 1.6
 # of using the various options.
 
 # The name of the module, e.g. 'glib'.
-DOC_MODULE=libepc-1.0
+DOC_MODULE=libepc-2.0
 
 # The top-level SGML file. You can change this if you want to.
 DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.xml
@@ -70,8 +70,8 @@ expand_content_files=
 AM_CFLAGS = $(LIBEPC_CFLAGS)
 
 GTKDOC_LIBS = \
-       $(top_builddir)/libepc-ui/libepc-ui-1.0.la \
-       $(top_builddir)/libepc/libepc-1.0.la
+       $(top_builddir)/libepc-ui/libepc-ui-2.0.la \
+       $(top_builddir)/libepc/libepc-2.0.la
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
 include $(top_srcdir)/gtk-doc.make
diff --git a/libepc-1.0.pc.in b/libepc-2.0.pc.in
similarity index 81%
rename from libepc-1.0.pc.in
rename to libepc-2.0.pc.in
index fe025f8..bfac736 100644
--- a/libepc-1.0.pc.in
+++ b/libepc-2.0.pc.in
@@ -7,5 +7,5 @@ Name: Easy Publish and Consume Library
 Description: a library to easily publish and consume values on networks
 Version: @PACKAGE_VERSION@
 Requires: avahi-client avahi-glib gnutls libsoup-@LIBSOUP_API@
-Cflags: -I${includedir}/libepc-1.0
-Libs: -L${libdir} -lepc-1.0
+Cflags: -I${includedir}/libepc-2.0
+Libs: -L${libdir} -lepc-2.0
diff --git a/libepc-ui-1.0.pc.in b/libepc-ui-2.0.pc.in
similarity index 68%
rename from libepc-ui-1.0.pc.in
rename to libepc-ui-2.0.pc.in
index 58e06ef..89751b3 100644
--- a/libepc-ui-1.0.pc.in
+++ b/libepc-ui-2.0.pc.in
@@ -6,7 +6,7 @@ includedir=@includedir@
 Name: Easy Publish and Consume Widgets
 Description: widgets for the Easy Publish and Consume Library
 Version: @PACKAGE_VERSION@
-Requires: libepc-1.0 gtk+-3.0
-Cflags: -I${includedir}/libepc-ui-1.0
-Libs: -L${libdir} -lepc-ui-1.0
+Requires: libepc-2.0 gtk+-3.0
+Cflags: -I${includedir}/libepc-ui-2.0
+Libs: -L${libdir} -lepc-ui-2.0
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]