Bump version to 2.1.6-beta everywhere

- cmake basic
- cmake detecting from git -- event_fuzzy_version_from_git()
- autotools
- win32
- appveyor

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0323be13b0a893e4889e4a95c5103171dc8aa90c..a9ca7e8b9116da965b3032bf3cdebf8c3c55fc85 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -72,7 +72,7 @@ set(EVENT_ABI_LIBVERSION
 set(EVENT_PACKAGE_VERSION
     "${EVENT_VERSION_MAJOR}.${EVENT_VERSION_MINOR}.${EVENT_VERSION_PATCH}")
 
-set(EVENT_NUMERIC_VERSION 0x02010500)
+set(EVENT_NUMERIC_VERSION 0x02010600)
 
 # only a subset of names can be used, defaults to "beta"
 set(EVENT_STAGE_NAME ${EVENT_VERSION_STAGE}

diff --git a/Makefile.am b/Makefile.am
index 71fa834e83a6fe9196f9088204931cae256df6a4..98c9ea6e3c831cd75a2a6bd45700c44250fcfb72 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,7 +34,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 = 5:0:0
+VERSION_INFO = 6:0:0
 
 # History:          RELEASE    VERSION_INFO
 #  2.0.1-alpha --     2.0        1:0:0
@@ -65,6 +65,7 @@ VERSION_INFO = 5:0:0
 #  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)
+#  2.1.6-beta  --     2.1        6: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 8cbf1902891f4d8c18e4fa0078a7b436a3dda093..a6dbfdf7aafe4cbcce437c336ff9d945da433602 100644 (file)
--- 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 0x02010500
+#define EVENT__NUMERIC_VERSION 0x02010600
 
 /* 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.5-beta"
+#define EVENT__VERSION "2.1.6-beta"
 
 /* Define to appropriate substitue if compiler doesnt have __func__ */
 #define EVENT____func__ __FUNCTION__

diff --git a/appveyor.yml b/appveyor.yml
index 4c16ee3196d21ff5d777104e792f3598d6601372..f2bcc589616045c3f583b80965b1df818d54ff27 100644 (file)
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 2.1.5.{build}
+version: 2.1.6.{build}
 
 os: Visual Studio 2015
 

diff --git a/cmake/VersionViaGit.cmake b/cmake/VersionViaGit.cmake
index f183a64713cd09a7fedc01ab2c1613f47d4e0ed7..442a0a6889abf06fe020675ccaaff953675a790d 100644 (file)
--- a/cmake/VersionViaGit.cmake
+++ b/cmake/VersionViaGit.cmake
@@ -27,7 +27,7 @@ macro(event_fuzzy_version_from_git)
        # set our defaults.
        set(EVENT_GIT___VERSION_MAJOR 2)
        set(EVENT_GIT___VERSION_MINOR 1)
-       set(EVENT_GIT___VERSION_PATCH 5)
+       set(EVENT_GIT___VERSION_PATCH 6)
        set(EVENT_GIT___VERSION_STAGE "beta")
 
        find_package(Git)

diff --git a/configure.ac b/configure.ac
index 0c41de652ca4d6500487e999b0c48df392095a89..074832427754d24bfab987f4009ae6ca0841a521 100644 (file)
--- 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.5-beta)
+AC_INIT(libevent,2.1.6-beta)
 AC_PREREQ(2.59)
 AC_CONFIG_SRCDIR(event.c)
 
@@ -25,7 +25,7 @@ AM_INIT_AUTOMAKE(m4_esyscmd([echo foreign 1.9 subdir-objects
 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, 0x02010500, [Numeric representation of the version])
+AC_DEFINE(NUMERIC_VERSION, 0x02010600, [Numeric representation of the version])
 
 dnl Initialize prefix.
 if test "$prefix" = "NONE"; then