From 86394501342fc7174a069a2d52d53f31b7ee62da Mon Sep 17 00:00:00 2001
From: "Steven G. Johnson" <stevenj@alum.mit.edu>
Date: Wed, 2 May 2018 08:23:40 -0400
Subject: NEWS for upcoming 2.2 release, version bump

---
 CMakeLists.txt |  4 ++--
 MANIFEST       |  6 +++---
 Makefile       |  4 ++--
 NEWS.md        | 18 ++++++++++++++++++
 utf8proc.h     |  4 ++--
 5 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d07dee1..a255b5b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,8 +10,8 @@ project (utf8proc C)
 # API version number (defined in utf8proc.h).
 # Be sure to also update these in Makefile and MANIFEST!
 set(SO_MAJOR 2)
-set(SO_MINOR 1)
-set(SO_PATCH 1)
+set(SO_MINOR 2)
+set(SO_PATCH 0)
 
 if (NOT MSVC)
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2 -std=c99 -pedantic -Wall")
diff --git a/MANIFEST b/MANIFEST
index db9620c..9396825 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -2,6 +2,6 @@ include/
 include/utf8proc.h
 lib/
 lib/libutf8proc.a
-lib/libutf8proc.so -> libutf8proc.so.2.1.1
-lib/libutf8proc.so.2 -> libutf8proc.so.2.1.1
-lib/libutf8proc.so.2.1.1
+lib/libutf8proc.so -> libutf8proc.so.2.2.0
+lib/libutf8proc.so.2 -> libutf8proc.so.2.2.0
+lib/libutf8proc.so.2.2.0
diff --git a/Makefile b/Makefile
index 5efd7e8..b03d94f 100644
--- a/Makefile
+++ b/Makefile
@@ -20,8 +20,8 @@ UCFLAGS = $(CFLAGS) $(PICFLAG) $(C99FLAG) $(WCFLAGS) -DUTF8PROC_EXPORTS $(UTF8PR
 # The API version number is defined in utf8proc.h.
 # Be sure to also update these ABI versions in MANIFEST and CMakeLists.txt!
 MAJOR=2
-MINOR=1
-PATCH=1
+MINOR=2
+PATCH=0
 
 OS := $(shell uname)
 ifeq ($(OS),Darwin) # MacOS X
diff --git a/NEWS.md b/NEWS.md
index 6e6d1ab..eb4fce7 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,5 +1,19 @@
 # utf8proc release history #
 
+## Version 2.2 alpha ##
+
+- Unicode 10 support ([#132]).
+
+- `utf8proc_NFKC_Casefold` convenience function for `NFKC_Casefold`
+  normalization ([#133]).
+
+- `UTF8PROC_STRIPNA` option to strip unassigned codepoints ([#133]).
+
+- Support building static libraries on Windows (callers need to
+  `#define UTF8PROC_STATIC`) ([#123]).
+
+- `cmake` fix to avoid defining `UTF8PROC_EXPORTS` globally ([#121]).
+
 ## Version 2.1.1 ##
 
 2018-04-27
@@ -312,5 +326,9 @@ Release of version 1.0.1
 [#94]: https://github.com/JuliaLang/utf8proc/issues/94
 [#99]: https://github.com/JuliaLang/utf8proc/issues/99
 [#113]: https://github.com/JuliaLang/utf8proc/issues/113
+[#121]: https://github.com/JuliaLang/utf8proc/issues/121
+[#123]: https://github.com/JuliaLang/utf8proc/issues/123
 [#125]: https://github.com/JuliaLang/utf8proc/issues/125
 [#128]: https://github.com/JuliaLang/utf8proc/issues/128
+[#132]: https://github.com/JuliaLang/utf8proc/issues/132
+[#133]: https://github.com/JuliaLang/utf8proc/issues/133
diff --git a/utf8proc.h b/utf8proc.h
index aa61658..20a35a4 100644
--- a/utf8proc.h
+++ b/utf8proc.h
@@ -71,9 +71,9 @@
 /** The MAJOR version number (increased when backwards API compatibility is broken). */
 #define UTF8PROC_VERSION_MAJOR 2
 /** The MINOR version number (increased when new functionality is added in a backwards-compatible manner). */
-#define UTF8PROC_VERSION_MINOR 1
+#define UTF8PROC_VERSION_MINOR 2
 /** The PATCH version (increased for fixes that do not change the API). */
-#define UTF8PROC_VERSION_PATCH 1
+#define UTF8PROC_VERSION_PATCH 0
 /** @} */
 
 #include <stdlib.h>
-- 
cgit v1.2.3