From 431d41cb2dc5a85df0c5d8a8a54aa2c35d67f142 Mon Sep 17 00:00:00 2001
From: "Philip.Hazel" <Philip.Hazel@gmail.com>
Date: Wed, 29 Jun 2016 16:43:32 +0000
Subject: [PATCH] File tidies for 10.22-RC1

---
 ChangeLog    |  4 ++--
 NEWS         | 22 ++++++++++++++++++++++
 configure.ac | 10 +++++-----
 src/pcre2.h  |  2 +-
 4 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8590d8c..63b8f35 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,8 +2,8 @@ Change Log for PCRE2
 --------------------
 
 
-Version 10.22 29-January-2016
------------------------------
+Version 10.22 29-June-2016
+--------------------------
 
 1. Applied Jason Hood's patches to RunTest.bat and testdata/wintestoutput3 
 to fix problems with running the tests under Windows.
diff --git a/NEWS b/NEWS
index aaeee5c..38badcb 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,28 @@
 News about PCRE2 releases
 -------------------------
 
+Version 10.22 29-June-2016
+--------------------------
+
+1. ChangeLog has the details of a number of bug fixes.
+
+2. The POSIX wrapper function regcomp() did not used to support back references 
+and subroutine calls if called with the REG_NOSUB option. It now does.
+
+3. A new function, pcre2_code_copy(), is added, to make a copy of a compiled 
+pattern.
+
+4. Support for string callouts is added to pcre2grep.
+
+5. Added the PCRE2_NO_JIT option to pcre2_match().
+
+6. The pcre2_get_error_message() function now returns with a negative error 
+code if the error number it is given is unknown.
+
+7. Several updates have been made to pcre2test and test scripts (see
+ChangeLog).
+
+
 Version 10.21 12-January-2016
 -----------------------------
 
diff --git a/configure.ac b/configure.ac
index 087cd58..2fa2cd3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,16 +11,16 @@ dnl be defined as -RC2, for example. For real releases, it should be empty.
 m4_define(pcre2_major, [10])
 m4_define(pcre2_minor, [22])
 m4_define(pcre2_prerelease, [-RC1])
-m4_define(pcre2_date, [2016-01-29])
+m4_define(pcre2_date, [2016-06-29])
 
 # NOTE: The CMakeLists.txt file searches for the above variables in the first
 # 50 lines of this file. Please update that if the variables above are moved.
 
 # Libtool shared library interface versions (current:revision:age)
-m4_define(libpcre2_8_version,     [3:0:3])
-m4_define(libpcre2_16_version,    [3:0:3])
-m4_define(libpcre2_32_version,    [3:0:3])
-m4_define(libpcre2_posix_version, [0:1:0])
+m4_define(libpcre2_8_version,     [4:0:4])
+m4_define(libpcre2_16_version,    [4:0:4])
+m4_define(libpcre2_32_version,    [4:0:4])
+m4_define(libpcre2_posix_version, [0:2:0])
 
 AC_PREREQ(2.57)
 AC_INIT(PCRE2, pcre2_major.pcre2_minor[]pcre2_prerelease, , pcre2)
diff --git a/src/pcre2.h b/src/pcre2.h
index ff76aa8..681d7c7 100644
--- a/src/pcre2.h
+++ b/src/pcre2.h
@@ -44,7 +44,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #define PCRE2_MAJOR          10
 #define PCRE2_MINOR          22
 #define PCRE2_PRERELEASE     -RC1
-#define PCRE2_DATE           2016-01-29
+#define PCRE2_DATE           2016-06-29
 
 /* When an application links to a PCRE DLL in Windows, the symbols that are
 imported have to be identified as such. When building PCRE2, the appropriate