From 66a531b01486b60db303d8d3c1aa3d6fa40f143d Mon Sep 17 00:00:00 2001
From: Paul Bakker <p.j.bakker@polarssl.org>
Date: Wed, 16 Jan 2013 14:06:28 +0100
Subject: [PATCH] Bumped version numbers to 1.1.5

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

diff --git a/ChangeLog b/ChangeLog
index bafc92a35..1d3948985 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
 PolarSSL ChangeLog
 
-= Branch 1.1
+= Version 1.1.5 released on 2013-01-16
 Bugfix
    * Fixed MPI assembly for SPARC64 platform
    * Handle existence of OpenSSL Trust Extensions at end of X.509 DER blob
diff --git a/doxygen/input/doc_mainpage.h b/doxygen/input/doc_mainpage.h
index e99ab72ea..b8570f093 100644
--- a/doxygen/input/doc_mainpage.h
+++ b/doxygen/input/doc_mainpage.h
@@ -4,7 +4,7 @@
  */
 
 /**
- * @mainpage PolarSSL v1.1.4 source code documentation
+ * @mainpage PolarSSL v1.1.5 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 c36332cb1..ea7310c87 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.1.4"
+PROJECT_NAME           = "PolarSSL v1.1.5"
 
 # 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 ade9d269a..9d61cfb3a 100644
--- a/include/polarssl/version.h
+++ b/include/polarssl/version.h
@@ -3,7 +3,7 @@
  *
  * \brief Run-time version information
  *
- *  Copyright (C) 2006-2012, Brainspark B.V.
+ *  Copyright (C) 2006-2013, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -39,16 +39,16 @@
  */
 #define POLARSSL_VERSION_MAJOR  1
 #define POLARSSL_VERSION_MINOR  1
-#define POLARSSL_VERSION_PATCH  4
+#define POLARSSL_VERSION_PATCH  5
 
 /**
  * The single version number has the following structure:
  *    MMNNPP00
  *    Major version | Minor version | Patch version
  */
-#define POLARSSL_VERSION_NUMBER         0x01010400
-#define POLARSSL_VERSION_STRING         "1.1.4"
-#define POLARSSL_VERSION_STRING_FULL    "PolarSSL 1.1.4"
+#define POLARSSL_VERSION_NUMBER         0x01010500
+#define POLARSSL_VERSION_STRING         "1.1.5"
+#define POLARSSL_VERSION_STRING_FULL    "PolarSSL 1.1.5"
 
 #if defined(POLARSSL_VERSION_C)
 
diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
index 1667b4fb7..aac270024 100644
--- a/library/CMakeLists.txt
+++ b/library/CMakeLists.txt
@@ -47,7 +47,7 @@ add_library(polarssl STATIC ${src})
 else(NOT USE_SHARED_POLARSSL_LIBRARY)
 
 add_library(polarssl SHARED ${src})
-set_target_properties(polarssl PROPERTIES VERSION 1.1.3 SOVERSION 1)
+set_target_properties(polarssl PROPERTIES VERSION 1.1.5 SOVERSION 1)
 
 endif(NOT USE_SHARED_POLARSSL_LIBRARY)
 
diff --git a/tests/suites/test_suite_version.data b/tests/suites/test_suite_version.data
index 3b0e1f314..47115b2f1 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.1.4"
+check_compiletime_version:"1.1.5"
 
 Check runtime library version
-check_runtime_version:"1.1.4"
+check_runtime_version:"1.1.5"