From: Paul Bauer <paul.bauer.q@gmail.com>
Date: Mon, 16 Dec 2019 11:39:33 +0000 (+0100)
Subject: Prepare for GROMACS 2019.6
X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=commitdiff_plain;h=ea409ccc85e1f66961673fe7d539b7a0693d6e39;p=alexxy%2Fgromacs.git

Prepare for GROMACS 2019.6

Reset doi strings

Change-Id: I38fa39c52cde5d967525770ec2a6381b7fcee33a
---

diff --git a/cmake/gmxVersionInfo.cmake b/cmake/gmxVersionInfo.cmake
index a46ce88045..181440e2b8 100644
--- a/cmake/gmxVersionInfo.cmake
+++ b/cmake/gmxVersionInfo.cmake
@@ -195,7 +195,7 @@
 # The GROMACS convention is that these are the version number of the next
 # release that is going to be made from this branch.
 set(GMX_VERSION_MAJOR 2019)
-set(GMX_VERSION_PATCH 5)
+set(GMX_VERSION_PATCH 6)
 # The suffix, on the other hand, is used mainly for betas and release
 # candidates, where it signifies the most recent such release from
 # this branch; it will be empty before the first such release, as well
@@ -257,8 +257,8 @@ endif()
 # from Zenodo for the manual and source code
 # Has to be done by hand before every final release
 # Use force to override anything given as a cmake command line input
-set(GMX_MANUAL_DOI "10.5281/zenodo.3577988" CACHE INTERNAL "reserved doi for GROMACS manual" FORCE)
-set(GMX_SOURCE_DOI "10.5281/zenodo.3577986" CACHE INTERNAL "reserved doi for GROMACS source code" FORCE)
+set(GMX_MANUAL_DOI "" CACHE INTERNAL "reserved doi for GROMACS manual" FORCE)
+set(GMX_SOURCE_DOI "" CACHE INTERNAL "reserved doi for GROMACS source code" FORCE)
 
 #####################################################################
 # git version info management
diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
index 341e14c125..204e2fea88 100644
--- a/docs/CMakeLists.txt
+++ b/docs/CMakeLists.txt
@@ -367,6 +367,7 @@ if (SPHINX_FOUND)
         how-to/visualize.rst
         install-guide/index.rst
         release-notes/index.rst
+        release-notes/2019/2019.6.rst
         release-notes/2019/2019.5.rst
         release-notes/2019/2019.4.rst
         release-notes/2019/2019.3.rst
diff --git a/docs/release-notes/2019/2019.6.rst b/docs/release-notes/2019/2019.6.rst
new file mode 100644
index 0000000000..68cb9a827b
--- /dev/null
+++ b/docs/release-notes/2019/2019.6.rst
@@ -0,0 +1,28 @@
+GROMACS 2019.6 release notes
+----------------------------
+
+This version was released on TODO, 2020. These release notes
+document the changes that have taken place in GROMACS since the
+previous 2019.5 version, to fix known issues. It also incorporates all
+fixes made in version 2018.8 and earlier, which you can find described
+in the :ref:`release-notes`.
+
+.. Note to developers!
+   Please use """"""" to underline the individual entries for fixed issues in the subfolders,
+   otherwise the formatting on the webpage is messed up.
+   Also, please use the syntax :issue:`number` to reference issues on redmine, without the
+   a space between the colon and number!
+
+Fixes where mdrun could behave incorrectly
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Fixes for ``gmx`` tools
+^^^^^^^^^^^^^^^^^^^^^^^
+
+Fixes that affect portability
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+
+Miscellaneous
+^^^^^^^^^^^^^
+
diff --git a/docs/release-notes/index.rst b/docs/release-notes/index.rst
index 621e426465..a5723a0672 100644
--- a/docs/release-notes/index.rst
+++ b/docs/release-notes/index.rst
@@ -29,6 +29,7 @@ Patch releases
 .. toctree::
    :maxdepth: 1
 
+   2019/2019.6
    2019/2019.5
    2019/2019.4
    2019/2019.3