Bump version in master to 2.2.0-alpha-dev

And according to f8d80a285cf941505277d9060d0357b5b7e543d2 ("Bump version
to 2.1.3-alpha-dev") numeric version have 1 at the end, since it means
"-dev".

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b4a34f3d26ae1e7a7b4bd60352af2233801f4cf3..2d713cf511ca658f16dde0c905b779a515a365a3 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -73,7 +73,7 @@ set(EVENT_ABI_LIBVERSION
 set(EVENT_PACKAGE_VERSION
     "${EVENT_VERSION_MAJOR}.${EVENT_VERSION_MINOR}.${EVENT_VERSION_PATCH}")
 
-set(EVENT_NUMERIC_VERSION 0x02010800)
+set(EVENT_NUMERIC_VERSION 0x02020001)
 
 # only a subset of names can be used, defaults to "beta"
 set(EVENT_STAGE_NAME ${EVENT_VERSION_STAGE}
@@ -84,6 +84,7 @@ set(EVENT__ALLOWED_STAGE_NAMES
     rc
     beta
     alpha
+    alpha-dev
     release)
 
 # attempt to find the EVENT__STAGE_VERSION in the allowed list

diff --git a/Makefile.am b/Makefile.am
index 0f741bc9c3a1835e1d6747c93134ed2e22ce4201..20dba70e83b908ba38e5507be3b379d1c1e99e99 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,7 +18,7 @@ ACLOCAL_AMFLAGS = -I m4
 # will increment for each series until we revise our interfaces enough
 # that we can seriously expect ABI compatibility between series.
 #
-RELEASE = -release 2.1
+RELEASE = -release 2.2
 
 # This is the version info for the libevent binary API.  It has three
 # numbers:
@@ -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 = 6:2:0
+VERSION_INFO = 1:0:0
 
 # History:          RELEASE    VERSION_INFO
 #  2.0.1-alpha --     2.0        1:0:0
@@ -72,6 +72,9 @@ VERSION_INFO = 6:2:0
 #  2.1.6-beta  --     2.1        6:0:0 (ABI changed slightly)
 #  2.1.7-beta  --     2.1        6:1:0 (ABI changed slightly)
 #  2.1.8-stable--     2.1        6:2:0 (ABI changed slightly)
+#
+# For Libevent 2.2:
+#  2.2.0-alpha --     2.2        1:0:0
 
 # 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 e6ed3aa4dcc3abea025e6256a7f2b572efd0b23b..9311818a81287ef87b1edc2066ca07182b880bbc 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 0x02010800
+#define EVENT__NUMERIC_VERSION 0x02020001
 
 /* 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.8-stable"
+#define EVENT__VERSION "2.2.0-alpha-dev"
 
 /* Define to appropriate substitue if compiler doesnt have __func__ */
 #define EVENT____func__ __FUNCTION__

diff --git a/appveyor.yml b/appveyor.yml
index 6beb5457cbb61f488fc558f27f2c796a01b6cbde..3c7c6a29366e945c9ef226a1cf649141c68e89eb 100644 (file)
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 2.1.8.{build}
+version: 2.2.0.{build}
 
 os: Visual Studio 2015
 

diff --git a/cmake/VersionViaGit.cmake b/cmake/VersionViaGit.cmake
index a9882d8a96391ed71ea2521b59faa48f2c5e4350..2e5a66e1ca42aecfccb0a89bb92d726f5a9c3923 100644 (file)
--- a/cmake/VersionViaGit.cmake
+++ b/cmake/VersionViaGit.cmake
@@ -26,9 +26,9 @@ 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 8)
-       set(EVENT_GIT___VERSION_STAGE "beta")
+       set(EVENT_GIT___VERSION_MINOR 2)
+       set(EVENT_GIT___VERSION_PATCH 0)
+       set(EVENT_GIT___VERSION_STAGE "alpha-dev")
 
        find_package(Git)
 

diff --git a/configure.ac b/configure.ac
index 7528d37ee03f4056181ba36d9fdacb27fef75985..066679a8e207ac45d347e579dcdb7b19a916fcac 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.8-stable)
+AC_INIT(libevent,2.2.0-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, 0x02010800, [Numeric representation of the version])
+AC_DEFINE(NUMERIC_VERSION, 0x02020001, [Numeric representation of the version])
 
 dnl Initialize prefix.
 if test "$prefix" = "NONE"; then

diff --git a/whatsnew-2.2.txt b/whatsnew-2.2.txt
new file mode 100644 (file)
index 0000000..e69de29