From 0de0fe58418db307c72d71b99d924517b6a0142e Mon Sep 17 00:00:00 2001
From: Claire Lemaitre <claire.lemaitre@inria.fr>
Date: Wed, 13 Jun 2018 11:47:14 +0200
Subject: [PATCH] preparing new release 2.3.0

---
 CHANGELOG.md   | 37 +++++++++++++++++++++++++++++++++++++
 CMakeLists.txt |  4 ++--
 README.md      |  4 ++--
 3 files changed, 41 insertions(+), 4 deletions(-)
 create mode 100644 CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..2c29d16
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,37 @@
+# Change Log
+
+--------------------------------------------------------------------------------
+## [Unreleased]
+
+--------------------------------------------------------------------------------
+## [2.3.0] - 2018-06-13
+
+Many new features and bug fixes since latest official release, including:
+
+* Switching gatb-core version from 1.2.1 to 1.4.1 (see the details in file `thirdparty/gatb-core/gatb-core/RELEASES.md` or on the [github releases page](https://github.com/GATB/gatb-core/releases)). Importantly for DSK :
+	
+	* Faster k-mer counting (inspired by KMC3 but not yet as fast :).
+	* Compiling GATB-Core library now requires c++/11 capable compilers.
+	* CMake 3.1.0 is the minimum release of CMake required to compile GATB-Core.
+	* Bug fixes in some multi-threaded situations.
+
+* Some new features (also coming from updates in gatb-core but not yet in an official gatb-core release):
+
+	* An easier way to plot the kmer abundance profile (option `-histo` and R script in the `utils/` directory).
+	* New feature: can output kmer count abundance matrix between a genome assembly and sequencing read datasets to plot a kmer comparison plot, inspired by [KAT (Kmer Analysis Toolkit)](https://github.com/TGAC/KAT) (option `-histo2D` and R script in the `utils/` directory).
+	* New custom solidity option to output kmers specific to a subset of the input files. (`-solidity-custom`).
+
+
+--------------------------------------------------------------------------------
+## [2.2.2] - 2016-07-16
+
+This is a bugfix release since 2.1.0. No new features. More stability.
+
+Note: in the binary release tar file, the correct `simple_test.sh` script is in the `test/` folder.
+
+Thanks to Hamid Mohamadi for noting a mistake in the README.
+
+--------------------------------------------------------------------------------
+## [1.0.6] - 2016-03-25
+
+Initial github release. disregard the version name, this is DSK v2 not v1.
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8cf619c..db409d0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,13 +1,13 @@
 project(dsk)
 
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 3.1)
 
 ################################################################################
 # The version number.
 ################################################################################
 # The default version number is the latest official build
 SET (gatb-tool_VERSION_MAJOR 2)
-SET (gatb-tool_VERSION_MINOR 2)
+SET (gatb-tool_VERSION_MINOR 3)
 SET (gatb-tool_VERSION_PATCH 0)
 
 # But, it is possible to define another release number during a local build
diff --git a/README.md b/README.md
index a109836..c5b172f 100644
--- a/README.md
+++ b/README.md
@@ -17,9 +17,9 @@ See "Results visualization" section to learn how to use its output.
 
 ## Requirements
 
-CMake 2.6+; see http://www.cmake.org/cmake/resources/software.html
+CMake 3.1+; see http://www.cmake.org/cmake/resources/software.html
 
-c++ compiler; compilation was tested with gcc and g++ version>=4.5 (Linux) and clang version>=4.1 (Mac OSX).
+C++/11 capable compiler (e.g. gcc 4.7+, clang 3.5+, Apple/clang 6.0+).
 
 ## Instructions