diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-01-05 09:16:12 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-01-05 09:16:12 -0500 |
| commit | 683f5568ab0ce47b0492aa75dd3015e72f130f81 (patch) | |
| tree | e3b13b3f4978a9fba11a9569452b2fede3a3eb2d | |
| parent | 0eb391941bed827d78a0bf27d7baf887ef91211b (diff) | |
| download | libevent-683f5568ab0ce47b0492aa75dd3015e72f130f81.tar.gz | |
Increment version to 2.1.5-beta
| -rw-r--r-- | CMakeLists.txt | 8 | ||||
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | WIN32-Code/nmake/event2/event-config.h | 4 | ||||
| -rw-r--r-- | configure.ac | 4 |
5 files changed, 11 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index bda6fa43..24d9b711 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,13 +27,13 @@ project(libevent C) set(EVENT_VERSION_MAJOR 2) set(EVENT_VERSION_MINOR 1) -set(EVENT_VERSION_PATCH 4) -set(EVENT_NUMERIC_VERSION 0x02010401) -set(EVENT_VERSION_DEVTAG "-dev") +set(EVENT_VERSION_PATCH 5) +set(EVENT_NUMERIC_VERSION 0x02010500) +set(EVENT_VERSION_DEVTAG "-beta") set(EVENT_ABI_MAJOR 2) set(EVENT_ABI_MINOR 1) -set(EVENT_ABI_PATCH 4) +set(EVENT_ABI_PATCH 5) 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${EVENT_VERSION_DEVTAG}") @@ -1,4 +1,4 @@ -Changes in version 2.1.5-alpha (5 January 2015) +Changes in version 2.1.5-beta (5 January 2015) New APIs (evconnlistener) diff --git a/Makefile.am b/Makefile.am index e2ce2928..3053cc01 100644 --- a/Makefile.am +++ b/Makefile.am @@ -38,7 +38,7 @@ RELEASE = -release 2.1 # # Once an RC is out, DO NOT MAKE ANY ABI-BREAKING CHANGES IN THAT SERIES # UNLESS YOU REALLY REALLY HAVE TO. -VERSION_INFO = 4:0:0 +VERSION_INFO = 5:0:0 # History: RELEASE VERSION_INFO # 2.0.1-alpha -- 2.0 1:0:0 @@ -68,6 +68,7 @@ VERSION_INFO = 4:0:0 # 2.1.2-alpha -- 2.1 1:0:0 (should have been 2:0:1) # 2.1.3-alpha -- 2.1 3:0:0 (ABI changed slightly) # 2.1.4-alpha -- 2.1 4:0:0 (ABI changed slightly) +# 2.1.5-beta -- 2.1 5:0:0 (ABI changed slightly) # ABI version history for this package effectively restarts every time # we change RELEASE. Version 1.4.x had RELEASE of 1.4. diff --git a/WIN32-Code/nmake/event2/event-config.h b/WIN32-Code/nmake/event2/event-config.h index 5ba2d78e..8cbf1902 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 0x02010401 +#define EVENT__NUMERIC_VERSION 0x02010500 /* 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-dev" +#define EVENT__VERSION "2.1.5-beta" /* Define to appropriate substitue if compiler doesnt have __func__ */ #define EVENT____func__ __FUNCTION__ diff --git a/configure.ac b/configure.ac index 8027d6dd..0da4fef9 100644 --- a/configure.ac +++ b/configure.ac @@ -5,7 +5,7 @@ dnl See LICENSE for copying information. dnl dnl Original version Dug Song <dugsong@monkey.org> -AC_INIT(libevent,2.1.4-alpha-dev) +AC_INIT(libevent,2.1.5-beta) 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, 0x02010401, [Numeric representation of the version]) +AC_DEFINE(NUMERIC_VERSION, 0x02010500, [Numeric representation of the version]) dnl Initialize prefix. if test "$prefix" = "NONE"; then |