GNOME.org
 

[gnome-panel/wip/gnome-3.10+: 3/38] libpanel-applet: update version

commit b3762b1571a77f53e66a486a62ffbf27408d84dd
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Wed Sep 3 23:20:50 2014 +0300

    libpanel-applet: update version
    
    - Update API version to 5.0.
    - Don't use version number in library name.
    - Rename from libpanelapplet-4.0.pc to libpanel-applet.pc.
    - Reset library version info to 0:0:0.

 applets/clock/Makefile.am                          |    2 +-
 applets/fish/Makefile.am                           |    2 +-
 applets/notification_area/Makefile.am              |    2 +-
 applets/wncklet/Makefile.am                        |    2 +-
 configure.ac                                       |   13 ++++---
 doc/reference/panel-applet/Makefile.am             |    4 +-
 doc/reference/panel-applet/panel-applet-docs.sgml  |    2 +-
 libpanel-applet/Makefile.am                        |   36 ++++++++++----------
 ...led.pc.in => libpanel-applet-uninstalled.pc.in} |    6 ++--
 ...panelapplet-4.0.pc.in => libpanel-applet.pc.in} |    8 ++--
 10 files changed, 40 insertions(+), 37 deletions(-)
---
diff --git a/applets/clock/Makefile.am b/applets/clock/Makefile.am
index d99375a..1180864 100644
--- a/applets/clock/Makefile.am
+++ b/applets/clock/Makefile.am
@@ -57,7 +57,7 @@ CLOCK_CPPFLAGS =                                              \
        -DGWEATHER_I_KNOW_THIS_IS_UNSTABLE
 
 CLOCK_LDADD =                                          \
-       ../../libpanel-applet/libpanel-applet-4.la      \
+       ../../libpanel-applet/libpanel-applet.la        \
        ../../gnome-panel/libpanel-util/libpanel-util.la        \
        $(CLOCK_LIBS)                                   \
        $(CLOCK_EDS_LIBS)                                       \
diff --git a/applets/fish/Makefile.am b/applets/fish/Makefile.am
index a08e675..2cfeb48 100644
--- a/applets/fish/Makefile.am
+++ b/applets/fish/Makefile.am
@@ -15,7 +15,7 @@ FISH_SOURCES =                \
        $(BUILT_SOURCES)
 
 FISH_LDADD =                                           \
-       ../../libpanel-applet/libpanel-applet-4.la      \
+       ../../libpanel-applet/libpanel-applet.la        \
        $(FISH_LIBS)                                    \
        $(LIBPANEL_APPLET_LIBS)
 
diff --git a/applets/notification_area/Makefile.am b/applets/notification_area/Makefile.am
index 355737e..9dd946a 100644
--- a/applets/notification_area/Makefile.am
+++ b/applets/notification_area/Makefile.am
@@ -28,7 +28,7 @@ NOTIFICATION_AREA_SOURCES = main.c main.h
 
 NOTIFICATION_AREA_LDADD =                              \
        libtray.la                                      \
-       ../../libpanel-applet/libpanel-applet-4.la      \
+       ../../libpanel-applet/libpanel-applet.la        \
        $(X_LIBS)                                       \
        $(NOTIFICATION_AREA_LIBS)                       \
        $(LIBPANEL_APPLET_LIBS)
diff --git a/applets/wncklet/Makefile.am b/applets/wncklet/Makefile.am
index edd87b0..8703d3c 100644
--- a/applets/wncklet/Makefile.am
+++ b/applets/wncklet/Makefile.am
@@ -25,7 +25,7 @@ WNCKLET_SOURCES = \
        $(BUILT_SOURCES)
 
 WNCKLET_LDADD =                                                \
-       ../../libpanel-applet/libpanel-applet-4.la      \
+       ../../libpanel-applet/libpanel-applet.la        \
        $(WNCKLET_LIBS)                                 \
        $(LIBPANEL_APPLET_LIBS)
 
diff --git a/configure.ac b/configure.ac
index 1648f5e..cc70caa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,10 +14,13 @@ AC_CONFIG_MACRO_DIR([m4])
 #   change to C+1:0:0
 # - If the interface is the same as the previous version, change to C:R+1:A
 
-LIBPANEL_APPLET_API_VERSION=4.0
-AC_SUBST([LIBPANEL_APPLET_API_VERSION],[$LIBPANEL_APPLET_API_VERSION])
+LIBPANEL_APPLET_API_VERSION=5.0
+AC_SUBST([LIBPANEL_APPLET_API_VERSION])
 
-LIB_PANEL_APPLET_LT_VERSION=1:1:1
+LIBPANEL_APPLET_GIR_VERSION=5_0
+AC_SUBST([LIBPANEL_APPLET_GIR_VERSION])
+
+LIB_PANEL_APPLET_LT_VERSION=0:0:0
 AC_SUBST(LIB_PANEL_APPLET_LT_VERSION)
 
 GNOME_MAINTAINER_MODE_DEFINES
@@ -314,8 +317,8 @@ gnome-panel/libpanel-applet-private/Makefile
 gnome-panel/libpanel-util/Makefile
 gnome-panel/gnome-panel.desktop.in
 libpanel-applet/Makefile
-libpanel-applet/libpanelapplet-4.0.pc
-libpanel-applet/libpanelapplet-4.0-uninstalled.pc
+libpanel-applet/libpanel-applet.pc
+libpanel-applet/libpanel-applet-uninstalled.pc
 po/Makefile.in
 applets/Makefile
 applets/clock/Makefile
diff --git a/doc/reference/panel-applet/Makefile.am b/doc/reference/panel-applet/Makefile.am
index a0e6f5b..140b6e1 100644
--- a/doc/reference/panel-applet/Makefile.am
+++ b/doc/reference/panel-applet/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = 1.6
 
 # The name of the module, e.g. 'glib'.
 DOC_MODULE=panel-applet
-DOC_MODULE_VERSION=4.0
+DOC_MODULE_VERSION=$(LIBPANEL_APPLET_API_VERSION)
 
 # The top-level SGML file. Change it if you want.
 DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
@@ -55,7 +55,7 @@ GTKDOC_CFLAGS =                                       \
 GTKDOC_LIBS =                                          \
        $(LDFLAGS)                                      \
        $(PANEL_LIBS)                                   \
-       ../../../libpanel-applet/libpanel-applet-4.la
+       ../../../libpanel-applet/libpanel-applet.la
 
 include $(top_srcdir)/gtk-doc.make
 
diff --git a/doc/reference/panel-applet/panel-applet-docs.sgml 
b/doc/reference/panel-applet/panel-applet-docs.sgml
index 5695efa..6b653c7 100644
--- a/doc/reference/panel-applet/panel-applet-docs.sgml
+++ b/doc/reference/panel-applet/panel-applet-docs.sgml
@@ -573,7 +573,7 @@ Icon=hello-world-icon
 
       <informalexample>
        <programlisting>
-LIBPANEL_APPLET_DIR=`$PKG_CONFIG --variable=libpanel_applet_dir libpanelapplet-4.0`
+LIBPANEL_APPLET_DIR=`$PKG_CONFIG --variable=libpanel_applet_dir libpanel-applet`
 AC_SUBST(LIBPANEL_APPLET_DIR)
        </programlisting>
       </informalexample>
diff --git a/libpanel-applet/Makefile.am b/libpanel-applet/Makefile.am
index f54cab9..b84af47 100644
--- a/libpanel-applet/Makefile.am
+++ b/libpanel-applet/Makefile.am
@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = libpanel-applet-4.la
+lib_LTLIBRARIES = libpanel-applet.la
 noinst_PROGRAMS = test-dbus-applet
 
 AM_CPPFLAGS =                                                  \
@@ -9,12 +9,12 @@ AM_CPPFLAGS =                                                 \
 
 AM_CFLAGS = $(WARN_CFLAGS)
 
-libpanel_appletincludedir = $(includedir)/gnome-panel-4.0/libpanel-applet
+libpanel_appletincludedir = $(includedir)/gnome-panel/libpanel-applet
 libpanel_appletinclude_HEADERS =       \
        panel-applet.h                  \
        panel-applet-enums.h
 
-libpanel_applet_4_la_SOURCES =         \
+libpanel_applet_la_SOURCES =           \
        $(BUILT_SOURCES)                \
        panel-applet.h                  \
        panel-applet.c                  \
@@ -23,19 +23,19 @@ libpanel_applet_4_la_SOURCES =              \
        panel-applet-bindings.h         \
        panel-applet-bindings.c
 
-libpanel_applet_4_la_LIBADD  = \
+libpanel_applet_la_LIBADD  = \
        $(LIBPANEL_APPLET_LIBS) \
        $(X_LIBS)
 
-libpanel_applet_4_la_LDFLAGS = \
+libpanel_applet_la_LDFLAGS = \
        -version-info $(LIB_PANEL_APPLET_LT_VERSION)    \
        -no-undefined
 
 test_dbus_applet_LDADD =       \
        $(LIBPANEL_APPLET_LIBS) \
-       libpanel-applet-4.la
+       libpanel-applet.la
 
-$(libpanel_applet_4_la_OBJECTS) $(test_dbus_applet_OBJECTS): $(BUILT_SOURCES)
+$(libpanel_applet_la_OBJECTS) $(test_dbus_applet_OBJECTS): $(BUILT_SOURCES)
 
 panel-applet-marshal.h: panel-applet-marshal.list $(GLIB_GENMARSHAL)
        $(AM_V_GEN)$(GLIB_GENMARSHAL) $< --header --prefix=panel_applet_marshal > $@
@@ -81,9 +81,9 @@ BUILT_SOURCES = \
        panel-applet-marshal.h
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libpanelapplet-4.0.pc
+pkgconfig_DATA = libpanel-applet.pc
 
-appletdir       = $(datadir)/gnome-panel/applets
+appletdir       = $(appletsdir)
 applet_in_files = org.gnome.panel.TestApplet.panel-applet.in
 noinst_DATA     = $(applet_in_files:.panel-applet.in=.panel-applet)
 
@@ -92,8 +92,8 @@ noinst_DATA     = $(applet_in_files:.panel-applet.in=.panel-applet)
 EXTRA_DIST =                                           \
        org.gnome.panel.TestApplet.panel-applet.in      \
        panel-applet-marshal.list                       \
-       libpanelapplet-4.0.pc.in                        \
-       libpanelapplet-4.0-uninstalled.pc.in
+       libpanel-applet.pc.in                   \
+       libpanel-applet-uninstalled.pc.in
 
 CLEANFILES = $(BUILT_SOURCES) $(noinst_DATA)
 
@@ -113,13 +113,13 @@ built_introspection_sources =     \
        panel-applet-enums.c    \
        panel-applet-enums.h
 
-PanelApplet-4.0.gir: libpanel-applet-4.la
-PanelApplet_4_0_gir_INCLUDES = GObject-2.0 Gtk-3.0
-PanelApplet_4_0_gir_CFLAGS = $(AM_CPPFLAGS)
-PanelApplet_4_0_gir_LIBS = libpanel-applet-4.la
-PanelApplet_4_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_sources)) $(addprefix 
$(builddir)/,$(built_introspection_sources))
-PanelApplet_4_0_gir_SCANNERFLAGS = --identifier-prefix=Panel --symbol-prefix=panel 
--pkg-export=libpanelapplet-4.0
-INTROSPECTION_GIRS += PanelApplet-4.0.gir
+PanelApplet-$(LIBPANEL_APPLET_API_VERSION).gir: libpanel-applet.la
+PanelApplet_ LIBPANEL_APPLET_GIR_VERSION@_gir_INCLUDES = GObject-2.0 Gtk-3.0
+PanelApplet_ LIBPANEL_APPLET_GIR_VERSION@_gir_CFLAGS = $(AM_CPPFLAGS)
+PanelApplet_ LIBPANEL_APPLET_GIR_VERSION@_gir_LIBS = libpanel-applet.la
+PanelApplet_ LIBPANEL_APPLET_GIR_VERSION@_gir_FILES = $(addprefix $(srcdir)/,$(introspection_sources)) 
$(addprefix $(builddir)/,$(built_introspection_sources))
+PanelApplet_ LIBPANEL_APPLET_GIR_VERSION@_gir_SCANNERFLAGS = --identifier-prefix=Panel --symbol-prefix=panel 
--pkg-export=libpanel-applet
+INTROSPECTION_GIRS += PanelApplet-$(LIBPANEL_APPLET_API_VERSION).gir
 
 girdir = $(INTROSPECTION_GIRDIR)
 gir_DATA = $(INTROSPECTION_GIRS)
diff --git a/libpanel-applet/libpanelapplet-4.0-uninstalled.pc.in 
b/libpanel-applet/libpanel-applet-uninstalled.pc.in
similarity index 66%
rename from libpanel-applet/libpanelapplet-4.0-uninstalled.pc.in
rename to libpanel-applet/libpanel-applet-uninstalled.pc.in
index 2e5acce..87c3a0a 100644
--- a/libpanel-applet/libpanelapplet-4.0-uninstalled.pc.in
+++ b/libpanel-applet/libpanel-applet-uninstalled.pc.in
@@ -5,9 +5,9 @@ includedir= includedir@
 
 libpanel_applet_api_version= LIBPANEL_APPLET_API_VERSION@
 
-Name: libpanel-applet-4
-Description: libpanel-applet-4
+Name: libpanel-applet
+Description: libpanel-applet
 Requires: glib-2.0 gtk+-3.0
 Version: @VERSION@
-Libs: ${pc_top_builddir}/${pcfiledir}/libpanel-applet-4.la
+Libs: ${pc_top_builddir}/${pcfiledir}/libpanel-applet.la
 Cflags: -I${pc_top_builddir}/${pcfiledir}
diff --git a/libpanel-applet/libpanelapplet-4.0.pc.in b/libpanel-applet/libpanel-applet.pc.in
similarity index 65%
rename from libpanel-applet/libpanelapplet-4.0.pc.in
rename to libpanel-applet/libpanel-applet.pc.in
index b6f989c..e5a0181 100644
--- a/libpanel-applet/libpanelapplet-4.0.pc.in
+++ b/libpanel-applet/libpanel-applet.pc.in
@@ -8,9 +8,9 @@ datadir= datadir@
 libpanel_applet_api_version= LIBPANEL_APPLET_API_VERSION@
 libpanel_applet_dir= appletsdir_pkgconfig@
 
-Name: libpanel-applet-4
-Description: libpanel-applet-4
+Name: libpanel-applet
+Description: libpanel-applet
 Requires: glib-2.0 gtk+-3.0
 Version: @VERSION@
-Libs: -L${libdir} -lpanel-applet-4
-Cflags: -I${includedir}/gnome-panel-4.0/libpanel-applet
+Libs: -L${libdir} -lpanel-applet
+Cflags: -I${includedir}/gnome-panel/libpanel-applet
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]