diff --git a/CMakeLists.txt b/CMakeLists.txt index 7de46724..0a12660b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,14 +27,15 @@ project(libevent C) set(EVENT_VERSION_MAJOR 2) set(EVENT_VERSION_MINOR 1) set(EVENT_VERSION_PATCH 4) -set(EVENT_NUMERIC_VERSION 0x02010400) +set(EVENT_NUMERIC_VERSION 0x02010401) +set(EVENT_VERSION_DEVTAG "-dev") set(EVENT_ABI_MAJOR 2) set(EVENT_ABI_MINOR 1) set(EVENT_ABI_PATCH 4) set(EVENT_ABI_LIBVERSION "${EVENT_ABI_MAJOR}.${EVENT_ABI_MINOR}.${EVENT_ABI_PATCH}") -set(EVENT_VERSION "${EVENT_VERSION_MAJOR}.${EVENT_VERSION_MINOR}.${EVENT_VERSION_PATCH}-alpha") +set(EVENT_VERSION "${EVENT_VERSION_MAJOR}.${EVENT_VERSION_MINOR}.${EVENT_VERSION_PATCH}-alpha${EVENT_VERSION_DEVTAG}") set(EVENT_PACKAGE_VERSION "${EVENT_VERSION_MAJOR}.${EVENT_VERSION_MINOR}.${EVENT_VERSION_PATCH}") option(EVENT__BUILD_SHARED_LIBRARIES "Define if libevent should be built with shared libraries instead of archives" OFF) diff --git a/ChangeLog b/ChangeLog index 9ada8d7e..a21cabe2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +Changes in version 2.1.5-alpha (?? ??? 2014) + + Changes in version 2.1.4-alpha (21 Mar 2014) Libevent 2.1.4-alpha adds a number of new miscellaneous APIs to make diff --git a/WIN32-Code/nmake/event2/event-config.h b/WIN32-Code/nmake/event2/event-config.h index 170ce010..5ba2d78e 100644 --- a/WIN32-Code/nmake/event2/event-config.h +++ b/WIN32-Code/nmake/event2/event-config.h @@ -274,7 +274,7 @@ /* #undef EVENT__HAVE_WORKING_KQUEUE */ /* Numeric representation of the version */ -#define EVENT__NUMERIC_VERSION 0x02010400 +#define EVENT__NUMERIC_VERSION 0x02010401 /* Name of package */ #define EVENT__PACKAGE "libevent" @@ -331,7 +331,7 @@ #define EVENT__TIME_WITH_SYS_TIME 1 /* Version number of package */ -#define EVENT__VERSION "2.1.4-alpha" +#define EVENT__VERSION "2.1.4-alpha-dev" /* Define to appropriate substitue if compiler doesnt have __func__ */ #define EVENT____func__ __FUNCTION__ diff --git a/configure.ac b/configure.ac index bca7462c..b843eb1f 100644 --- a/configure.ac +++ b/configure.ac @@ -5,7 +5,7 @@ dnl See LICENSE for copying information. dnl dnl Original version Dug Song -AC_INIT(libevent,2.1.4-alpha) +AC_INIT(libevent,2.1.4-alpha-dev) AC_PREREQ(2.59) AC_CONFIG_SRCDIR(event.c) @@ -14,7 +14,7 @@ AM_INIT_AUTOMAKE dnl AM_SILENT_RULES req. automake 1.11. [no] defaults V=1 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) AC_CONFIG_HEADERS(config.h evconfig-private.h:evconfig-private.h.in) -AC_DEFINE(NUMERIC_VERSION, 0x02010400, [Numeric representation of the version]) +AC_DEFINE(NUMERIC_VERSION, 0x02010401, [Numeric representation of the version]) dnl Initialize prefix. if test "$prefix" = "NONE"; then