From 3b06cd02288d2176575104951e99ba5c3b648353 Mon Sep 17 00:00:00 2001 From: Alexander Vdolainen Date: Sat, 25 Jul 2015 03:45:03 +0300 Subject: [PATCH] returning back to sntl name; --- configure.ac | 2 +- debian/changelog | 12 ++++++------ debian/files | 4 ++-- debian/libsntl.substvars | 2 +- debian/shlibs.local.ex | 2 +- lib/Makefile.am | 16 ++++++++-------- lib/{libsntllv2.pc.in => libsntl.pc.in} | 2 +- tests/Makefile.am | 2 +- 8 files changed, 21 insertions(+), 21 deletions(-) rename lib/{libsntllv2.pc.in => libsntl.pc.in} (90%) diff --git a/configure.ac b/configure.ac index 26d18e5..b8d9cc7 100644 --- a/configure.ac +++ b/configure.ac @@ -63,7 +63,7 @@ AM_CONDITIONAL(BUILD_WIN32, test "x$enable_win32_build" = "xyes") AC_OUTPUT([ Makefile -lib/libsntllv2.pc +lib/libsntl.pc lib/Makefile include/Makefile examples/Makefile diff --git a/debian/changelog b/debian/changelog index d07fdf9..faaba8b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,12 @@ libsntl (0.3.0) stable; urgency=high - * New improved architecture - * Performance tricks - * Long messages - * Extended API - * It's incompatible with 0.2.xx and below by protocol + * New improved architecture + * Performance tricks + * Long messages + * Extended API + * It's incompatible with 0.2.xx and below by protocol - -- Alexander Vdolainen Thu, 16 Jul 2015 22:50:32 +0200 + -- Alexander Vdolainen Thu, 16 Jul 2015 22:50:32 +0200 libsntl (0.2.1) stable; urgency=low diff --git a/debian/files b/debian/files index 164faed..9aff3c4 100644 --- a/debian/files +++ b/debian/files @@ -1,2 +1,2 @@ -libsntl-dev_0.2.1_amd64.deb libdevel extra -libsntl_0.2.1_amd64.deb libs extra +libsntl-dev_0.3.0_amd64.deb libdevel extra +libsntl_0.3.0_amd64.deb libs extra diff --git a/debian/libsntl.substvars b/debian/libsntl.substvars index 2f9fbbd..fd5aa20 100644 --- a/debian/libsntl.substvars +++ b/debian/libsntl.substvars @@ -1,2 +1,2 @@ -shlibs:Depends=libc6 (>= 2.3.2), libsexpr, libssl1.0.0 (>= 1.0.1), libtdata, libuuid1 (>= 2.20.1) +shlibs:Depends=libc6 (>= 2.2.5), libsexpr, libssl1.0.0 (>= 1.0.1), libtdata, libuuid1 (>= 2.20.1) misc:Depends= diff --git a/debian/shlibs.local.ex b/debian/shlibs.local.ex index 5c6fe79..1746db8 100644 --- a/debian/shlibs.local.ex +++ b/debian/shlibs.local.ex @@ -1 +1 @@ -libsntl 0.2.0 libsntl (>> 0.2.0), libsntl (<< 0.2.99) +libsntl 0.3.0 libsntl (>> 0.3.0), libsntl (<< 0.3.99) diff --git a/lib/Makefile.am b/lib/Makefile.am index 5e9e6a7..0b7490e 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -10,25 +10,25 @@ AM_CFLAGS =\ -Wall\ -g -lib_LTLIBRARIES = libsntllv2.la +lib_LTLIBRARIES = libsntl.la -libsntllv2_la_SOURCES = \ +libsntl_la_SOURCES = \ connex.c sntllv2.c chansx.c messagesx.c rpclist.c uuid.c -libsntllv2_la_LDFLAGS = -Wl,--export-dynamic +libsntl_la_LDFLAGS = -Wl,--export-dynamic -libsntllv2_la_LIBADD = -lpthread -lcrypto $(LIBTDATA_LIBS) $(LIBSEXPR_LIBS) $(OPENSSL_LIBS) +libsntl_la_LIBADD = -lpthread -lcrypto $(LIBTDATA_LIBS) $(LIBSEXPR_LIBS) $(OPENSSL_LIBS) if BUILD_WIN32 -libsntllv2_la_LIBADD += -luuid +libsntl_la_LIBADD += -luuid else -libsntllv2_la_LIBADD += $(LIBUUID_LIBS) +libsntl_la_LIBADD += $(LIBUUID_LIBS) endif !BUILD_WIN32 pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libsntllv2.pc +pkgconfig_DATA = libsntl.pc EXTRA_DIST = \ - libsntllv2.pc.in + libsntl.pc.in diff --git a/lib/libsntllv2.pc.in b/lib/libsntl.pc.in similarity index 90% rename from lib/libsntllv2.pc.in rename to lib/libsntl.pc.in index 4b09ce6..cd463bb 100644 --- a/lib/libsntllv2.pc.in +++ b/lib/libsntl.pc.in @@ -9,5 +9,5 @@ Name: libsntllv2 Description: Secure Network Transport Layer library implementation Version: @VERSION@ Requires: -Libs: -L${libdir} -lsntllv2 +Libs: -L${libdir} -lsntl Cflags: -I${includedir} diff --git a/tests/Makefile.am b/tests/Makefile.am index dfa9ce4..3753f65 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -11,7 +11,7 @@ AM_CPPFLAGS = \ AM_CFLAGS = -Wall -g # where to find libsntl -libsntl = ../lib/.libs/libsntllv2.la +libsntl = ../lib/.libs/libsntl.la if !BUILD_WIN32