# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1598505683 14400
# Node ID 6dc23a4126b9b87041c1d301da0499dcbbaf87c0
# Parent  ddcc33be4fd98ce74396804f3c78a032b7ab59c9# Parent  b12fd6ee728fbe0f56d2a9ea4729bcd3be10a14f
maint: merge stable to default.

diff -r ddcc33be4fd9 -r 6dc23a4126b9 .hgtags
--- a/.hgtags	Wed Aug 26 13:30:29 2020 -0400
+++ b/.hgtags	Thu Aug 27 01:21:23 2020 -0400
@@ -119,3 +119,4 @@
 d05d6eebde105895c0972d8bb8bc7f090295cb86 release-5-1-0
 ec0690a6955c8d5236b29b975c09a1f2a5a1559c rc-5-1-90
 eb46a9f471647626d3a199e40d0c235d54e2b256 release-5-2-0
+844b3b9bab7a137c08cbec7cb0ae3bca2ae0b70d rc-6-0-90
diff -r ddcc33be4fd9 -r 6dc23a4126b9 CITATION
--- a/CITATION	Wed Aug 26 13:30:29 2020 -0400
+++ b/CITATION	Thu Aug 27 01:21:23 2020 -0400
@@ -1,17 +1,17 @@
 To cite GNU Octave in publications use:
 
-  John W. Eaton, David Bateman, Søren Hauberg, Rik Wehbring (2019).
-  GNU Octave version 5.2.0 manual: a high-level interactive language for
+  John W. Eaton, David Bateman, Søren Hauberg, Rik Wehbring (2020).
+  GNU Octave version 6.1.0 manual: a high-level interactive language for
   numerical computations.
-  URL https://www.gnu.org/software/octave/doc/v5.2.0/
+  URL https://www.gnu.org/software/octave/doc/v6.1.0/
 
 A BibTeX entry for LaTeX users is:
 
   @manual{,
-    title     = {{GNU Octave} version 5.2.0 manual: a high-level interactive language for numerical computations},
+    title     = {{GNU Octave} version 6.1.0 manual: a high-level interactive language for numerical computations},
     author    = {John W. Eaton and David Bateman and S{\o}ren Hauberg and Rik Wehbring},
     year      = {2020},
-    url       = {https://www.gnu.org/software/octave/doc/v5.2.0/},
+    url       = {https://www.gnu.org/software/octave/doc/v6.1.0/},
   }
 
 We have invested a lot of time and effort in creating GNU Octave, please
diff -r ddcc33be4fd9 -r 6dc23a4126b9 NEWS
diff -r ddcc33be4fd9 -r 6dc23a4126b9 configure.ac
--- a/configure.ac	Wed Aug 26 13:30:29 2020 -0400
+++ b/configure.ac	Thu Aug 27 01:21:23 2020 -0400
@@ -48,7 +48,7 @@
 
 OCTAVE_COPYRIGHT="Copyright (C) 2020 The Octave Project Developers."
 
-OCTAVE_RELEASE_DATE="2020-02-17"
+OCTAVE_RELEASE_DATE="2020-08-26"
 
 ## The "API version" is used as a way of checking that interfaces in the
 ## liboctave and libinterp libraries haven't changed in a backwardly
@@ -63,7 +63,7 @@
 dnl FIXME: Since we also set libtool versions for liboctave and libinterp,
 dnl perhaps we should be computing the "api version" from those versions numbers
 dnl in some way instead of setting it independently here.
-OCTAVE_API_VERSION="api-v54+"
+OCTAVE_API_VERSION="api-v55+"
 
 AC_SUBST(OCTAVE_MAJOR_VERSION)
 AC_SUBST(OCTAVE_MINOR_VERSION)
diff -r ddcc33be4fd9 -r 6dc23a4126b9 etc/NEWS.6
--- a/etc/NEWS.6	Wed Aug 26 13:30:29 2020 -0400
+++ b/etc/NEWS.6	Thu Aug 27 01:21:23 2020 -0400
@@ -1,5 +1,5 @@
-Summary of important user-visible changes for version 6 (yyyy-mm-dd):
-----------------------------------------------------------------------
+Summary of important user-visible changes for version 6.1.0 (2020-08-26):
+------------------------------------------------------------------------
 
 ### General improvements