# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1649255700 14400
# Node ID 062e00e903a5add7e03e6717126ee8a9d586d4f2
# Parent  972959edc3ffe65b89f1d49bc1737d361947e764# Parent  e4e7942cb8b7c2535dcc3b6512d06e1a1c278a1a
maint: Merge stable to default.

diff -r 972959edc3ff -r 062e00e903a5 .hgtags
--- a/.hgtags	Tue Apr 05 15:12:34 2022 -0700
+++ b/.hgtags	Wed Apr 06 10:35:00 2022 -0400
@@ -130,3 +130,4 @@
 8d7671609955afabf79ceff678cc41eea61583f2 release-6-4-0
 347dbc9049d55b63435d710e1d9d826cbfe5e54c rc-7-0-90
 266610d855194b2a55e6b501ccc302e6c0d8f6d0 rc-7-0-92
+04120d65778a403e11ac4280bf53f330eded75e3 release-7-1-0
diff -r 972959edc3ff -r 062e00e903a5 CITATION
--- a/CITATION	Tue Apr 05 15:12:34 2022 -0700
+++ b/CITATION	Wed Apr 06 10:35:00 2022 -0400
@@ -1,6 +1,6 @@
 To cite GNU Octave in publications use:
 
-  John W. Eaton, David Bateman, Søren Hauberg, Rik Wehbring (2020).
+  John W. Eaton, David Bateman, Søren Hauberg, Rik Wehbring (2022).
   GNU Octave version 7.1.0 manual: a high-level interactive language for
   numerical computations.
   URL https://www.gnu.org/software/octave/doc/v7.1.0/
diff -r 972959edc3ff -r 062e00e903a5 configure.ac
--- a/configure.ac	Tue Apr 05 15:12:34 2022 -0700
+++ b/configure.ac	Wed Apr 06 10:35:00 2022 -0400
@@ -48,7 +48,7 @@
 
 OCTAVE_COPYRIGHT="Copyright (C) 1993-2022 The Octave Project Developers."
 
-OCTAVE_RELEASE_DATE="2022-03-18"
+OCTAVE_RELEASE_DATE="2022-04-06"
 
 ## The "API version" is used as a way of checking that interfaces in the
 ## liboctave and libinterp libraries haven't changed in a backwardly
diff -r 972959edc3ff -r 062e00e903a5 etc/CHECKLIST.md
--- a/etc/CHECKLIST.md	Tue Apr 05 15:12:34 2022 -0700
+++ b/etc/CHECKLIST.md	Wed Apr 06 10:35:00 2022 -0400
@@ -6,7 +6,8 @@
 
   * Update version number and release year in CITATION.
 
-  * Update the NEWS file.  Include release date in Summary header.
+  * Update the etc/NEWS.N.md file corresponding to the major release
+    number N.  Include release date in Summary header.
 
   * Update the NEWS-<VERSION>.html, index.in, news.in, and download.in
     files for the web site.
diff -r 972959edc3ff -r 062e00e903a5 etc/NEWS.7.md
--- a/etc/NEWS.7.md	Tue Apr 05 15:12:34 2022 -0700
+++ b/etc/NEWS.7.md	Wed Apr 06 10:35:00 2022 -0400
@@ -1,4 +1,4 @@
-Summary of important user-visible changes for version 7 (2022-03-18)
+Summary of important user-visible changes for version 7 (2022-04-06)
 --------------------------------------------------------------------
 
 ### General improvements
diff -r 972959edc3ff -r 062e00e903a5 etc/icons/org.octave.Octave.appdata.xml
--- a/etc/icons/org.octave.Octave.appdata.xml	Tue Apr 05 15:12:34 2022 -0700
+++ b/etc/icons/org.octave.Octave.appdata.xml	Wed Apr 06 10:35:00 2022 -0400
@@ -190,6 +190,7 @@
   <developer_name>John W. Eaton and others</developer_name>
   <content_rating type="oars-1.0"/>
   <releases>
+    <release date="2022-04-06" version="7.1.0"/>
     <release date="2021-10-30" version="6.4.0"/>
     <release date="2021-07-11" version="6.3.0"/>
     <release date="2021-02-19" version="6.2.0"/>