# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1649256283 14400
# Node ID 911c098e5930139b79ca363e34169a17d7359675
# Parent  ee80081eeca3dc13d493a9d4fa25e9a47a5544ab# Parent  ccb904fafc30eeb49050ade3eada4932882a8a5f
maint: merge release to default.

diff -r ee80081eeca3 -r 911c098e5930 .hgtags
--- a/.hgtags	Mon Apr 04 14:06:01 2022 -0400
+++ b/.hgtags	Wed Apr 06 10:44:43 2022 -0400
@@ -18,3 +18,4 @@
 03cc20300858ef78f26598db683967666f4b41b7 octave-release-6.4.0
 99125d7343bfe3a07bc8fba1ab03fb0f5b54254f octave-rc-7.0.90
 e20531a051cae4604c7b73655fcf1056e7fa97a5 octave-rc-7.0.92
+2e6af23c6cb7d4c406bba675037fda1730ee16e9 octave-release-7.1.0
diff -r ee80081eeca3 -r 911c098e5930 dist-files.mk
diff -r ee80081eeca3 -r 911c098e5930 src/release-octave.mk
--- a/src/release-octave.mk	Mon Apr 04 14:06:01 2022 -0400
+++ b/src/release-octave.mk	Wed Apr 06 10:44:43 2022 -0400
@@ -34,11 +34,11 @@
 
 PKG             := release-octave
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 7.0.92
-$(PKG)_CHECKSUM := bbb26a73c57b8b4a2a69603eee050d97f1545656
+$(PKG)_VERSION  := 7.1.0
+$(PKG)_CHECKSUM := 1a24f88ce3b79c679a3fa8d9f8f44db058db630e
 $(PKG)_SUBDIR   := octave-$($(PKG)_VERSION)
 $(PKG)_FILE     := octave-$($(PKG)_VERSION).tar.lz
-$(PKG)_URL      := ftp://alpha.gnu.org/gnu/octave/$($(PKG)_FILE)
+$(PKG)_URL      := ftp://ftp.gnu.org/gnu/octave/$($(PKG)_FILE)
 ifeq ($(USE_SYSTEM_FONTCONFIG),no)
   $(PKG)_FONTCONFIG := fontconfig
 endif
diff -r ee80081eeca3 -r 911c098e5930 src/stable-octave.mk
--- a/src/stable-octave.mk	Mon Apr 04 14:06:01 2022 -0400
+++ b/src/stable-octave.mk	Wed Apr 06 10:44:43 2022 -0400
@@ -13,7 +13,7 @@
 
 PKG             := stable-octave
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 7.0.93
+$(PKG)_VERSION  := 7.1.1
 $(PKG)_CHECKSUM := ## No checksum
 $(PKG)_SUBDIR   := octave-$($(PKG)_VERSION)
 $(PKG)_FILE     := octave-$($(PKG)_VERSION).tar.lz