From 9a3186f5c0777b8e23ae4899b805ff5f4a833b3e Mon Sep 17 00:00:00 2001 From: Chris Frey Date: Tue, 15 May 2012 22:14:10 -0400 Subject: [PATCH] Version: fixed pkg-config files to use major version 18 instead of old 0 This will require a change in any applications that compile against Barry, to use the -18 pkg-config names instead of the old -0 name. Apologies in advance that this wasn't caught in the 0.18.0 release. --- Makefile.am | 8 ++++---- configure.ac | 12 ++++++------ desktop/configure.ac | 2 +- gui/configure.ac | 4 ++-- libbarry-0.pc.in => libbarry-18.pc.in | 0 libbarryalx-0.pc.in => libbarryalx-18.pc.in | 0 libbarrybackup-0.pc.in => libbarrybackup-18.pc.in | 2 +- libbarrydp-0.pc.in => libbarrydp-18.pc.in | 0 libbarryjdwp-0.pc.in => libbarryjdwp-18.pc.in | 2 +- libbarrysync-0.pc.in => libbarrysync-18.pc.in | 2 +- opensync-plugin-0.4x/configure.ac | 4 ++-- opensync-plugin/configure.ac | 4 ++-- 12 files changed, 20 insertions(+), 20 deletions(-) rename libbarry-0.pc.in => libbarry-18.pc.in (100%) rename libbarryalx-0.pc.in => libbarryalx-18.pc.in (100%) rename libbarrybackup-0.pc.in => libbarrybackup-18.pc.in (93%) rename libbarrydp-0.pc.in => libbarrydp-18.pc.in (100%) rename libbarryjdwp-0.pc.in => libbarryjdwp-18.pc.in (92%) rename libbarrysync-0.pc.in => libbarrysync-18.pc.in (90%) diff --git a/Makefile.am b/Makefile.am index 6bcc918d..efa5b156 100644 --- a/Makefile.am +++ b/Makefile.am @@ -27,15 +27,15 @@ SUBDIRS = po . src tools examples man test # conditionally configured nested subdirectories are listed in $(subdirs) SUBDIRS += $(subdirs) -pkgconfig_DATA = libbarry-0.pc libbarrydp-0.pc libbarryjdwp-0.pc +pkgconfig_DATA = libbarry-18.pc libbarrydp-18.pc libbarryjdwp-18.pc if WITH_SYNC -pkgconfig_DATA += libbarrysync-0.pc +pkgconfig_DATA += libbarrysync-18.pc endif if WITH_BACKUP -pkgconfig_DATA += libbarrybackup-0.pc +pkgconfig_DATA += libbarrybackup-18.pc endif if WITH_ALX -pkgconfig_DATA += libbarryalx-0.pc +pkgconfig_DATA += libbarryalx-18.pc endif VERSIONED_INCLUDE = barry@BARRY_MAJOR@ diff --git a/configure.ac b/configure.ac index 08336653..c405495a 100644 --- a/configure.ac +++ b/configure.ac @@ -471,12 +471,12 @@ AC_CONFIG_FILES([Makefile examples/Makefile man/Makefile test/Makefile - libbarry-0.pc - libbarrydp-0.pc - libbarryjdwp-0.pc - libbarrysync-0.pc - libbarrybackup-0.pc - libbarryalx-0.pc]) + libbarry-18.pc + libbarrydp-18.pc + libbarryjdwp-18.pc + libbarrysync-18.pc + libbarrybackup-18.pc + libbarryalx-18.pc]) # # nested packages diff --git a/desktop/configure.ac b/desktop/configure.ac index 59c367a1..772ddbee 100644 --- a/desktop/configure.ac +++ b/desktop/configure.ac @@ -167,7 +167,7 @@ if test "x$with_evolution" != xno ; then ]) fi -PKG_CHECK_MODULES([BARRY], [libbarry-0 libbarrysync-0 libbarrybackup-0]) +PKG_CHECK_MODULES([BARRY], [libbarry-18 libbarrysync-18 libbarrybackup-18]) PKG_CHECK_MODULES([GLIB2], [glib-2.0]) PKG_CHECK_MODULES([LIBXMLPP], [libxml++-2.6]) PKG_CHECK_MODULES([OPENSYNC22], [opensync-1.0], [], [OS22NOTFOUND=yes]) diff --git a/gui/configure.ac b/gui/configure.ac index 654bdaf1..c4c25a82 100644 --- a/gui/configure.ac +++ b/gui/configure.ac @@ -23,8 +23,8 @@ AC_PROG_LIBTOOL AC_LANG([C++]) -PKG_CHECK_MODULES([BARRY], [libbarry-0]) -PKG_CHECK_MODULES([BARRYBACKUP], [libbarrybackup-0]) +PKG_CHECK_MODULES([BARRY], [libbarry-18]) +PKG_CHECK_MODULES([BARRYBACKUP], [libbarrybackup-18]) PKG_CHECK_MODULES([GTKMM], [gtkmm-2.4 libglademm-2.4 gthread-2.0]) # Carry the special tree build environment variables from parent configure, diff --git a/libbarry-0.pc.in b/libbarry-18.pc.in similarity index 100% rename from libbarry-0.pc.in rename to libbarry-18.pc.in diff --git a/libbarryalx-0.pc.in b/libbarryalx-18.pc.in similarity index 100% rename from libbarryalx-0.pc.in rename to libbarryalx-18.pc.in diff --git a/libbarrybackup-0.pc.in b/libbarrybackup-18.pc.in similarity index 93% rename from libbarrybackup-0.pc.in rename to libbarrybackup-18.pc.in index ea2f2e85..335a70dd 100644 --- a/libbarrybackup-0.pc.in +++ b/libbarrybackup-18.pc.in @@ -7,7 +7,7 @@ Name: Barry Description: C++ library for reading and writing Barry backup files URL: http://sourceforge.net/projects/barry Version: @VERSION@ -Requires: libbarry-0 +Requires: libbarry-18 Libs: -L${libdir} -lbarrybackup Cflags: -I${includedir} diff --git a/libbarrydp-0.pc.in b/libbarrydp-18.pc.in similarity index 100% rename from libbarrydp-0.pc.in rename to libbarrydp-18.pc.in diff --git a/libbarryjdwp-0.pc.in b/libbarryjdwp-18.pc.in similarity index 92% rename from libbarryjdwp-0.pc.in rename to libbarryjdwp-18.pc.in index ed535ea1..c820b1e7 100644 --- a/libbarryjdwp-0.pc.in +++ b/libbarryjdwp-18.pc.in @@ -7,7 +7,7 @@ Name: Barry Description: C++ library for using the BlackBerry Java debugger URL: http://sourceforge.net/projects/barry Version: @VERSION@ -Requires: libbarrydp-0 +Requires: libbarrydp-18 Libs: -L${libdir} -lbarryjdwp Cflags: -I${includedir} diff --git a/libbarrysync-0.pc.in b/libbarrysync-18.pc.in similarity index 90% rename from libbarrysync-0.pc.in rename to libbarrysync-18.pc.in index dd7e0a8b..ac264f15 100644 --- a/libbarrysync-0.pc.in +++ b/libbarrysync-18.pc.in @@ -7,7 +7,7 @@ Name: Barry Description: C++ library for sync and vformat parsing URL: http://sourceforge.net/projects/barry Version: @VERSION@ -Requires: glib-2.0 libbarry-0 +Requires: glib-2.0 libbarry-18 Libs: -L${libdir} -lbarrysync Cflags: -I${includedir} diff --git a/opensync-plugin-0.4x/configure.ac b/opensync-plugin-0.4x/configure.ac index bd39c6b9..288ac792 100644 --- a/opensync-plugin-0.4x/configure.ac +++ b/opensync-plugin-0.4x/configure.ac @@ -28,8 +28,8 @@ AC_LANG([C++]) PKG_CHECK_MODULES([GLIB2], [glib-2.0]) PKG_CHECK_MODULES([OPENSYNC4X], [libopensync1]) -PKG_CHECK_MODULES([BARRY], [libbarry-0]) -PKG_CHECK_MODULES([BARRYSYNC], [libbarrysync-0]) +PKG_CHECK_MODULES([BARRY], [libbarry-18]) +PKG_CHECK_MODULES([BARRYSYNC], [libbarrysync-18]) # Carry the special tree build environment variables from parent configure, # just in case user is doing a complete tree build with --enable-opensync-plugin diff --git a/opensync-plugin/configure.ac b/opensync-plugin/configure.ac index 9f091486..2fd501cf 100644 --- a/opensync-plugin/configure.ac +++ b/opensync-plugin/configure.ac @@ -28,8 +28,8 @@ AC_LANG([C++]) PKG_CHECK_MODULES([GLIB2], [glib-2.0]) PKG_CHECK_MODULES([OPENSYNC2X], [opensync-1.0]) -PKG_CHECK_MODULES([BARRY], [libbarry-0]) -PKG_CHECK_MODULES([BARRYSYNC], [libbarrysync-0]) +PKG_CHECK_MODULES([BARRY], [libbarry-18]) +PKG_CHECK_MODULES([BARRYSYNC], [libbarrysync-18]) # Carry the special tree build environment variables from parent configure, # just in case user is doing a complete tree build with --enable-opensync-plugin -- 2.11.4.GIT