From 7fc4e3e225d9ea8ac62ff01ea9d7eec4aead8b7e Mon Sep 17 00:00:00 2001
From: Paul Bakker <paul@brainspark.nl>
Date: Mon, 10 Aug 2015 15:06:34 +0100
Subject: [PATCH] Prepare for 1.2.15 release

---
 ChangeLog                            | 2 +-
 doxygen/input/doc_mainpage.h         | 2 +-
 doxygen/polarssl.doxyfile            | 2 +-
 include/polarssl/version.h           | 8 ++++----
 library/CMakeLists.txt               | 2 +-
 tests/suites/test_suite_version.data | 4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d75701093..82824a0ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
 PolarSSL ChangeLog
 
-= Version 1.2.15 released 2015-mm-dd
+= Version 1.2.15 released 2015-08-10
 
 Security
    * Increase the minimum size of Diffie-Hellman parameters accepted by the
diff --git a/doxygen/input/doc_mainpage.h b/doxygen/input/doc_mainpage.h
index 931dbd2fe..8dbb5245e 100644
--- a/doxygen/input/doc_mainpage.h
+++ b/doxygen/input/doc_mainpage.h
@@ -4,7 +4,7 @@
  */
 
 /**
- * @mainpage PolarSSL v1.2.14 source code documentation
+ * @mainpage PolarSSL v1.2.15 source code documentation
  * 
  * This documentation describes the internal structure of PolarSSL.  It was
  * automatically generated from specially formatted comment blocks in
diff --git a/doxygen/polarssl.doxyfile b/doxygen/polarssl.doxyfile
index ce294375f..9259fe3b4 100644
--- a/doxygen/polarssl.doxyfile
+++ b/doxygen/polarssl.doxyfile
@@ -25,7 +25,7 @@ DOXYFILE_ENCODING      = UTF-8
 # The PROJECT_NAME tag is a single word (or a sequence of words surrounded
 # by quotes) that should identify the project.
 
-PROJECT_NAME           = "PolarSSL v1.2.14"
+PROJECT_NAME           = "PolarSSL v1.2.15"
 
 # The PROJECT_NUMBER tag can be used to enter a project or revision number.
 # This could be handy for archiving the generated documentation or
diff --git a/include/polarssl/version.h b/include/polarssl/version.h
index 367125516..948b8339e 100644
--- a/include/polarssl/version.h
+++ b/include/polarssl/version.h
@@ -36,16 +36,16 @@
  */
 #define POLARSSL_VERSION_MAJOR  1
 #define POLARSSL_VERSION_MINOR  2
-#define POLARSSL_VERSION_PATCH  14
+#define POLARSSL_VERSION_PATCH  15
 
 /**
  * The single version number has the following structure:
  *    MMNNPP00
  *    Major version | Minor version | Patch version
  */
-#define POLARSSL_VERSION_NUMBER         0x01020E00
-#define POLARSSL_VERSION_STRING         "1.2.14"
-#define POLARSSL_VERSION_STRING_FULL    "PolarSSL 1.2.14"
+#define POLARSSL_VERSION_NUMBER         0x01020F00
+#define POLARSSL_VERSION_STRING         "1.2.15"
+#define POLARSSL_VERSION_STRING_FULL    "PolarSSL 1.2.15"
 
 #if defined(POLARSSL_VERSION_C)
 
diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
index 2ef1a8aae..00f9b0504 100644
--- a/library/CMakeLists.txt
+++ b/library/CMakeLists.txt
@@ -90,7 +90,7 @@ endif()
 
 if(USE_SHARED_POLARSSL_LIBRARY)
 	add_library(polarssl SHARED ${src})
-	set_target_properties(polarssl PROPERTIES VERSION 1.2.14 SOVERSION 3)
+	set_target_properties(polarssl PROPERTIES VERSION 1.2.15 SOVERSION 3)
 
 	target_link_libraries(polarssl ${libs})
 
diff --git a/tests/suites/test_suite_version.data b/tests/suites/test_suite_version.data
index 63a280401..2ed88d320 100644
--- a/tests/suites/test_suite_version.data
+++ b/tests/suites/test_suite_version.data
@@ -1,5 +1,5 @@
 Check compiletime library version
-check_compiletime_version:"1.2.14"
+check_compiletime_version:"1.2.15"
 
 Check runtime library version
-check_runtime_version:"1.2.14"
+check_runtime_version:"1.2.15"