changeset 5682:28adba8a60eb

maint: merge release to default.
author John W. Eaton <jwe@octave.org>
date Sun, 21 Feb 2021 02:55:16 -0500
parents 20586ad4c89f (current diff) 73d5bbce5e81 (diff)
children d662e5f18584
files
diffstat 3 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Feb 18 16:39:16 2021 +0100
+++ b/.hgtags	Sun Feb 21 02:55:16 2021 -0500
@@ -12,3 +12,4 @@
 60c8f985d8f59effea0fddb7ccf4b7a7c63c71fd octave-rc-6-0-92
 a1004ea5643dc65ef0f156fc1f5fce561feb1e57 octave-release-6.1.0
 f062783e4ace3bb551cf51d7592920255770f583 octave-rc-6.1.90
+def3081543dacba8baee298da28e3397bd8f4d2a octave-release-6.2.0
--- a/src/release-octave.mk	Thu Feb 18 16:39:16 2021 +0100
+++ b/src/release-octave.mk	Sun Feb 21 02:55:16 2021 -0500
@@ -34,11 +34,11 @@
 
 PKG             := release-octave
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 6.1.90
-$(PKG)_CHECKSUM := f42ec07cbe4c1c1d9d7f60929eb910e5c54a0bd6
+$(PKG)_VERSION  := 6.2.0
+$(PKG)_CHECKSUM := 0b6d8d583ce67d09aeb6cc1d4aed7155f3845cfd
 $(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
--- a/src/stable-octave.mk	Thu Feb 18 16:39:16 2021 +0100
+++ b/src/stable-octave.mk	Sun Feb 21 02:55:16 2021 -0500
@@ -13,7 +13,7 @@
 
 PKG             := stable-octave
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 6.1.91
+$(PKG)_VERSION  := 6.2.1
 $(PKG)_CHECKSUM := ## No checksum
 $(PKG)_SUBDIR   := octave-$($(PKG)_VERSION)
 $(PKG)_FILE     := octave-$($(PKG)_VERSION).tar.lz