From cc960fdae6407ed48e37fb59af7603bdab0f2224 Mon Sep 17 00:00:00 2001
From: Alexandre Quessy <alexandre@quessy.net>
Date: Sun, 8 Apr 2018 17:34:13 -0400
Subject: [PATCH] Prepare 0.6.0

---
 VERSION.txt                      |  2 +-
 docs/Doxyfile                    |  2 +-
 docs/informations/CHANGELOG.html | 48 ++++++++++++++++++++++++++++++++
 mapmap.pro                       |  2 +-
 scripts/update-changelog.sh      |  1 +
 src/core/MM.cpp                  |  2 +-
 6 files changed, 53 insertions(+), 4 deletions(-)

diff --git a/VERSION.txt b/VERSION.txt
index 4b9fcbe..a918a2a 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-0.5.1
+0.6.0
diff --git a/docs/Doxyfile b/docs/Doxyfile
index 3f77b64..7c20ad1 100644
--- a/docs/Doxyfile
+++ b/docs/Doxyfile
@@ -31,7 +31,7 @@ PROJECT_NAME = "MapMap"
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.
 
-PROJECT_NUMBER = "0.5.1"
+PROJECT_NUMBER = "0.6.0"
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
 # base path where the generated documentation will be put.
diff --git a/docs/informations/CHANGELOG.html b/docs/informations/CHANGELOG.html
index 75a24d0..d816ca4 100644
--- a/docs/informations/CHANGELOG.html
+++ b/docs/informations/CHANGELOG.html
@@ -1,5 +1,53 @@
 <h1>Release notes for MapMap</h1>
 
+<h2>2018-04-08 - MapMap 0.6.0</h2>
+
+<ul>
+<li>Add macOS Application Icon</li>
+<li>Fix video rate bug (Closes #369)</li>
+<li>Change the default test card</li>
+<li>Add preference to show controls only on mouse over</li>
+<li>Add simplified and traditional chinese translations</li>
+<li>Add Spanish translation</li>
+<li>Rename "Mesh subdivisions" to "Subdivisions"</li>
+<li>Rename width/height to horizontal/vertical for mesh subdivision naming</li>
+<li>Rename GUI elements: paint, mapping, source, destination, dimension #376</li>
+<li>Fix: Cursor no longer displays in fullscreen without controls (closes #387)</li>
+<li>Allow to change source of the current layer in context menu. Request #377</li>
+<li>Implement scale/rotate icons and minor fix</li>
+<li>Replace CTRL-click for free-hand transforms with re-click</li>
+<li>Prevent adding camera action in OSX and WINDOWS where it is not created (closes #366).</li>
+<li>Fixed linker problem on Ubuntu 17.10 (closes #382)</li>
+<li>Transition to the Mardown syntax for the README file</li>
+<li>Prevent changing paint for mapping if not compatible.</li>
+<li>Allow the change of paint id on mapping using OSC (closes #302).</li>
+<li>Added paintId as property + preserved backwards compatibility for files.</li>
+<li>Allows possibility of changing paint of a mapping from the interface (related to #302).</li>
+<li>Remove infinite recursion in VideoImpl (closes #351).</li>
+<li>Add item ID as part of properties.</li>
+<li>Simplified property browser interface by removing useless top-item property.</li>
+<li>Added tooltips specifying the ID of each element.</li>
+<li>Bugfix: let mappings names adjust size (closes #365).</li>
+<li>Fix problem with OSC messages (unset names in mappings were left empty).</li>
+<li>Integrate transform function</li>
+<li>Improve some icons, zoom, solo mode, prefs, test signal</li>
+<li>Fix the play/pause button when adding media or color paints</li>
+<li>Enabled paint context menu</li>
+<li>Implemented basic rotation/scaling of polygons.</li>
+<li>Fix error in the Mesh::toPolygon() (wrong number of vertices).</li>
+<li>Fit all shapes to view canvas instead current shape</li>
+<li>Add a .travis.yml file for automated builds on travis-ci.org</li>
+<li>Reduce the size of the zoom tool bars</li>
+<li>Add drag and drop feature for media file and project</li>
+<li>Reorganize source code files</li>
+<li>Mouse wheel: press control to zoom.</li>
+<li>Always show scroll bars in mapping canvas</li>
+<li>Boundary checks - fix #319 crash when receiving osc messages</li>
+<li>Fix crash when DEL is pressed while no mappings to delete - fixes #315</li>
+<li>Proper management of mappings related to a paint in undo/redo (relates to #315).</li>
+<li>Only show camera input button on GNU/Linux, since it doesn't work on the other platforms</li>
+</ul>
+
 <h2>2017-01-01 - MapMap 0.5.0</h2>
 
 <ul>
diff --git a/mapmap.pro b/mapmap.pro
index 06ce4e0..72d43f0 100644
--- a/mapmap.pro
+++ b/mapmap.pro
@@ -3,7 +3,7 @@ CONFIG  += qt debug c++11
 TEMPLATE = app
 
 # Always use major.minor.micro version number format
-VERSION = 0.5.1
+VERSION = 0.6.0
 TARGET = mapmap
 
 DEFINES += UNICODE QT_THREAD_SUPPORT QT_CORE_LIB QT_GUI_LIB
diff --git a/scripts/update-changelog.sh b/scripts/update-changelog.sh
index 2754198..0473527 100755
--- a/scripts/update-changelog.sh
+++ b/scripts/update-changelog.sh
@@ -1,5 +1,6 @@
 #!/bin/sh
 cd $(dirname $0)
+cd ..
 cd src/mapmap
 set -o verbose
 # Convert markdown file to html
diff --git a/src/core/MM.cpp b/src/core/MM.cpp
index 93b1d90..ced4970 100644
--- a/src/core/MM.cpp
+++ b/src/core/MM.cpp
@@ -23,7 +23,7 @@
 namespace mmp {
 
 const QString MM::APPLICATION_NAME = "MapMap";
-const QString MM::VERSION = "0.5.1";
+const QString MM::VERSION = "0.6.0";
 const QString MM::COPYRIGHT_OWNERS = "Sofian Audry, Dame Diongue, Alexandre Quessy, Mike Latona, Vasilis Liaskovitis";
 const QString MM::ORGANIZATION_NAME = "MapMap";
 const QString MM::ORGANIZATION_DOMAIN = "mapmap.info";