From 40b4462239873b4318e1063721536d2a6ffadda2 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Mon, 20 Feb 2017 10:57:35 +0100 Subject: [PATCH] Version bump [not released yet] --- .travis.yml | 2 +- builds/msvc/version.h | 4 ++-- configure.ac | 6 +++--- msvc-scripts/process.bat | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9ac1e958..489c2837 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,7 +31,7 @@ addons: coverity_scan: project: name: jedisct1/libsodium - version: 1.0.11 + version: 1.0.12 description: libsodium notification_email: coverityscan@pureftpd.org build_command_prepend: ./autogen.sh ; ./configure diff --git a/builds/msvc/version.h b/builds/msvc/version.h index b4319cc8..dfca8fa3 100644 --- a/builds/msvc/version.h +++ b/builds/msvc/version.h @@ -4,10 +4,10 @@ #include "export.h" -#define SODIUM_VERSION_STRING "1.0.11" +#define SODIUM_VERSION_STRING "1.0.12" #define SODIUM_LIBRARY_VERSION_MAJOR 9 -#define SODIUM_LIBRARY_VERSION_MINOR 3 +#define SODIUM_LIBRARY_VERSION_MINOR 4 #ifdef __cplusplus extern "C" { diff --git a/configure.ac b/configure.ac index d40362ee..343d7017 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.65]) -AC_INIT([libsodium],[1.0.11], +AC_INIT([libsodium],[1.0.12], [https://github.com/jedisct1/libsodium/issues], [libsodium], [https://github.com/jedisct1/libsodium]) @@ -17,9 +17,9 @@ ISODATE=`date +%Y-%m-%d` AC_SUBST(ISODATE) SODIUM_LIBRARY_VERSION_MAJOR=9 -SODIUM_LIBRARY_VERSION_MINOR=3 +SODIUM_LIBRARY_VERSION_MINOR=4 DLL_VERSION=8 -SODIUM_LIBRARY_VERSION=19:1:1 +SODIUM_LIBRARY_VERSION=20:0:2 # | | | # +------+ | +---+ # | | | diff --git a/msvc-scripts/process.bat b/msvc-scripts/process.bat index 2e645984..c1b9549b 100755 --- a/msvc-scripts/process.bat +++ b/msvc-scripts/process.bat @@ -1,4 +1,4 @@ -cscript msvc-scripts/rep.vbs //Nologo s/@VERSION@/1.0.11/ < src\libsodium\include\sodium\version.h.in > tmp +cscript msvc-scripts/rep.vbs //Nologo s/@VERSION@/1.0.12/ < src\libsodium\include\sodium\version.h.in > tmp cscript msvc-scripts/rep.vbs //Nologo s/@SODIUM_LIBRARY_VERSION_MAJOR@/9/ < tmp > tmp2 -cscript msvc-scripts/rep.vbs //Nologo s/@SODIUM_LIBRARY_VERSION_MINOR@/3/ < tmp2 > src\libsodium\include\sodium\version.h +cscript msvc-scripts/rep.vbs //Nologo s/@SODIUM_LIBRARY_VERSION_MINOR@/4/ < tmp2 > src\libsodium\include\sodium\version.h del tmp tmp2