From: Paul Bauer <paul.bauer.q@gmail.com>
Date: Mon, 24 Feb 2020 14:49:29 +0000 (+0100)
Subject: Prepare for 2020.2
X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=commitdiff_plain;h=132bd0207117563ef26affb9ad6073eecbd451e3;p=alexxy%2Fgromacs.git

Prepare for 2020.2

Reset DOI strings

Change-Id: I8a269a8537595d1070c50cfc31c610f2133618b2
---

diff --git a/cmake/gmxVersionInfo.cmake b/cmake/gmxVersionInfo.cmake
index 1d736dce21..a220aca1fe 100644
--- a/cmake/gmxVersionInfo.cmake
+++ b/cmake/gmxVersionInfo.cmake
@@ -196,7 +196,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 2020)
-set(GMX_VERSION_PATCH 1)
+set(GMX_VERSION_PATCH 2)
 # 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
@@ -283,8 +283,8 @@ if (GMX_VERSION_STRING_OF_FORK)
     set(GMX_MANUAL_DOI_INTERNAL "")
     set(GMX_SOURCE_DOI_INTERNAL "")
 else()
-    set(GMX_MANUAL_DOI_INTERNAL "10.5281/zenodo.3685920") # Set correct doi string here
-    set(GMX_SOURCE_DOI_INTERNAL "10.5281/zenodo.3685919") # Set correct doi string here
+    set(GMX_MANUAL_DOI_INTERNAL "") # Set correct doi string here
+    set(GMX_SOURCE_DOI_INTERNAL "") # Set correct doi string here
 endif()
 set(GMX_MANUAL_DOI ${GMX_MANUAL_DOI_INTERNAL} CACHE INTERNAL "reserved doi for GROMACS manual" FORCE)
 set(GMX_SOURCE_DOI ${GMX_SOURCE_DOI_INTERNAL} CACHE INTERNAL "reserved doi for GROMACS source code" FORCE)
diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
index 59b5078fc4..a671ea5dcd 100644
--- a/docs/CMakeLists.txt
+++ b/docs/CMakeLists.txt
@@ -362,6 +362,7 @@ if (SPHINX_FOUND)
         install-guide/index.rst
         release-notes/index.rst
         release-notes/2020/2020.1.rst
+        release-notes/2020/2020.2.rst
         release-notes/2020/major/highlights.rst
         release-notes/2020/major/features.rst
         release-notes/2020/major/performance.rst
diff --git a/docs/release-notes/2020/2020.2.rst b/docs/release-notes/2020/2020.2.rst
new file mode 100644
index 0000000000..c793676497
--- /dev/null
+++ b/docs/release-notes/2020/2020.2.rst
@@ -0,0 +1,27 @@
+GROMACS 2020.2 release notes
+----------------------------
+
+This version was released on TODO, 2020. These release notes
+document the changes that have taken place in GROMACS since the
+previous 2020.1 version, to fix known issues. It also incorporates all
+fixes made in version 2019.6 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 3c82fdeee5..6b9a15301c 100644
--- a/docs/release-notes/index.rst
+++ b/docs/release-notes/index.rst
@@ -30,6 +30,7 @@ Patch releases
    :maxdepth: 1
 
    2020/2020.1
+   2020/2020.2
 
 Major release
 ^^^^^^^^^^^^^