From: Paul Bauer <paul.bauer.q@gmail.com>
Date: Fri, 3 Jul 2020 11:36:50 +0000 (+0200)
Subject: Prepare for GROMACS 2020.4
X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=commitdiff_plain;h=a9fb8e50659948aca341fdb38521da039d90e6e6;p=alexxy%2Fgromacs.git

Prepare for GROMACS 2020.4

Reset DOI strings.
Added new release note documents.

Change-Id: I28e1f297f2ba75d7b60cb8161135ef94546f1d7f
---

diff --git a/cmake/gmxVersionInfo.cmake b/cmake/gmxVersionInfo.cmake
index c3f8a5bb29..5b35bcc87a 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 3)
+set(GMX_VERSION_PATCH 4)
 # 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.3923644") # Set correct doi string here
-    set(GMX_SOURCE_DOI_INTERNAL "10.5281/zenodo.3923645") # 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 ca252f6648..41dad01660 100644
--- a/docs/CMakeLists.txt
+++ b/docs/CMakeLists.txt
@@ -364,6 +364,7 @@ if (SPHINX_FOUND)
         release-notes/2020/2020.1.rst
         release-notes/2020/2020.2.rst
         release-notes/2020/2020.3.rst
+        release-notes/2020/2020.4.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.4.rst b/docs/release-notes/2020/2020.4.rst
new file mode 100644
index 0000000000..18ce777b86
--- /dev/null
+++ b/docs/release-notes/2020/2020.4.rst
@@ -0,0 +1,27 @@
+GROMACS 2020.4 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.3 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 63a2f90cb7..9042dae7f2 100644
--- a/docs/release-notes/index.rst
+++ b/docs/release-notes/index.rst
@@ -29,6 +29,7 @@ Patch releases
 .. toctree::
    :maxdepth: 1
 
+   2020/2020.4
    2020/2020.3
    2020/2020.2
    2020/2020.1