# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1626367048 14400
# Node ID 03d277ae2605bc3da4c7f50e752a5c7bd506090e
# Parent  32ff94d6cc03fee87ad63a69b89207d89f361cc8# Parent  dc8aa1892127733d77f16e349fcf700d30dccd23
maint: merge release to default.

diff -r 32ff94d6cc03 -r 03d277ae2605 .hgtags
--- a/.hgtags	Mon Jul 05 07:25:54 2021 -0400
+++ b/.hgtags	Thu Jul 15 12:37:28 2021 -0400
@@ -13,3 +13,4 @@
 a1004ea5643dc65ef0f156fc1f5fce561feb1e57 octave-release-6.1.0
 f062783e4ace3bb551cf51d7592920255770f583 octave-rc-6.1.90
 def3081543dacba8baee298da28e3397bd8f4d2a octave-release-6.2.0
+85939dd76f7826c763a0a21f5e841a6fbf829e9e octave-release-6.3.0
diff -r 32ff94d6cc03 -r 03d277ae2605 src/release-octave.mk
--- a/src/release-octave.mk	Mon Jul 05 07:25:54 2021 -0400
+++ b/src/release-octave.mk	Thu Jul 15 12:37:28 2021 -0400
@@ -34,11 +34,11 @@
 
 PKG             := release-octave
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 6.2.92
-$(PKG)_CHECKSUM := c237a709f3497557056cd67ad7efed0af0a08508
+$(PKG)_VERSION  := 6.3.0
+$(PKG)_CHECKSUM := 11b94acbb20db8a1d9902202e4d98123229ce327
 $(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 32ff94d6cc03 -r 03d277ae2605 src/stable-octave.mk
--- a/src/stable-octave.mk	Mon Jul 05 07:25:54 2021 -0400
+++ b/src/stable-octave.mk	Thu Jul 15 12:37:28 2021 -0400
@@ -13,7 +13,7 @@
 
 PKG             := stable-octave
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 6.2.93
+$(PKG)_VERSION  := 6.3.1
 $(PKG)_CHECKSUM := ## No checksum
 $(PKG)_SUBDIR   := octave-$($(PKG)_VERSION)
 $(PKG)_FILE     := octave-$($(PKG)_VERSION).tar.lz