# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1710502102 14400
# Node ID 104ee99cbd7091335fd1ed6a22b84d76dfe22dee
# Parent  49aef0daf62e9afb33e37ee462222b2edeeb8c53# Parent  32f2b787a1d91b694463a1f5df2d519294c7cd0d
maint: merge release to default

diff -r 49aef0daf62e -r 104ee99cbd70 .hgtags
--- a/.hgtags	Mon Mar 11 10:22:38 2024 -0400
+++ b/.hgtags	Fri Mar 15 07:28:22 2024 -0400
@@ -28,3 +28,4 @@
 70b5d98fbf375ab0f62f9e0d9d6c3e1d77923a67 octave-release-8.3.0
 8e5ec983eb0913809ee08b695a3d035814f387f5 octave-release-8.4.0
 a7346760a4bb0209d4fc8011f1080c091c34fb96 octave-rc-9-0-90
+acd608ccc24d3f3dea16227f9f8b38d92c613e9e octave-release-9.1.0
diff -r 49aef0daf62e -r 104ee99cbd70 binary-dist-rules.mk
--- a/binary-dist-rules.mk	Mon Mar 11 10:22:38 2024 -0400
+++ b/binary-dist-rules.mk	Fri Mar 15 07:28:22 2024 -0400
@@ -80,8 +80,13 @@
   echo "  octave and dependencies..."
   cd $(HOST_PREFIX) \
     && tar -c $(TAR_H_OPTION) -f - . | ( cd $(OCTAVE_DIST_DIR)$(OCTAVE_ADD_PATH) ; tar xpf - )
-  echo "  octaverc file..."
-  cp $(TOP_DIR)/octaverc $(OCTAVE_DIST_DIR)$(OCTAVE_ADD_PATH)/share/octave/site/m/startup/octaverc
+  if [ -f "$(OCTAVE_DIST_DIR)$(OCTAVE_ADD_PATH)/share/octave/site/m/startup/octaverc" ]; then \
+    echo "  octaverc file (appending to existing file)..."; \
+    cat $(TOP_DIR)/octaverc >> $(OCTAVE_DIST_DIR)$(OCTAVE_ADD_PATH)/share/octave/site/m/startup/octaverc; \
+  else \
+    echo "  octaverc file..."; \
+    cp $(TOP_DIR)/octaverc $(OCTAVE_DIST_DIR)$(OCTAVE_ADD_PATH)/share/octave/site/m/startup/octaverc; \
+  fi
   if [ $(ENABLE_BINARY_PACKAGES) = no ]; then \
     echo "  build_packages.m..."; \
     cp $(TOP_DIR)/build_packages.m $(OCTAVE_DIST_DIR)/src; \
@@ -115,7 +120,7 @@
 	$(MXE_CC) $< -o $@ installer-files/octave-launch.res -Wl,--subsystem,windows -lshlwapi -municode -DUNICODE -D_UNICODE -DFIRST_TIME -DQTVERSION=$(ENABLE_QT) $(OCTAVE_LAUNCH_NO_SHORT_CPPFLAGS)
 
 installer-files/octave-logo.ico: $(TOP_DIR)/installer-files/octave-logo.ico | installer-files/.dirstamp
-	cp -a $< $@
+	cp $< $@
 
 installer-files/octave-launch.rc: $(TOP_DIR)/installer-files/octave-launch.rc.in | installer-files/octave-logo.ico installer-files/.dirstamp
 	$(SED) $< -e 's/@PRODUCT_VERSION@/$($(OCTAVE_TARGET)_VERSION)/' -e "s/@PRODUCT_VERSION_COMMA@/$(shell echo $($(OCTAVE_TARGET)_VERSION).0 | $(SED) 's|\.|,|g')/" > $@
diff -r 49aef0daf62e -r 104ee99cbd70 octaverc
--- a/octaverc	Mon Mar 11 10:22:38 2024 -0400
+++ b/octaverc	Fri Mar 15 07:28:22 2024 -0400
@@ -1,7 +1,11 @@
-## System-wide startup file for Octave.
+
+## Begin MXE Octave additions to system-wide startup file for Octave.
 ##
 ## This file should contain any commands that should be executed each
 ## time Octave starts for every user at this site.
+
 EXEC_PATH (cstrcat (fullfile (OCTAVE_HOME, 'notepad++'), pathsep, EXEC_PATH));
 EXEC_PATH (cstrcat (fullfile (OCTAVE_HOME, 'bin'), pathsep, EXEC_PATH));
 EDITOR (fullfile (OCTAVE_HOME, 'notepad++', 'notepad++.exe'));
+
+## End MXE Octave additions to system-wide startup file for Octave.
diff -r 49aef0daf62e -r 104ee99cbd70 src/release-octave.mk
--- a/src/release-octave.mk	Mon Mar 11 10:22:38 2024 -0400
+++ b/src/release-octave.mk	Fri Mar 15 07:28:22 2024 -0400
@@ -34,11 +34,11 @@
 
 PKG             := release-octave
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 9.0.90
-$(PKG)_CHECKSUM := 2fc9ccadd45156b150c14242f5bd596c0b6aae44
+$(PKG)_VERSION  := 9.1.0
+$(PKG)_CHECKSUM := 3c736bc227d83fdb6af9891fc53f908c27d45f4f
 $(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 49aef0daf62e -r 104ee99cbd70 src/stable-octave.mk
--- a/src/stable-octave.mk	Mon Mar 11 10:22:38 2024 -0400
+++ b/src/stable-octave.mk	Fri Mar 15 07:28:22 2024 -0400
@@ -13,7 +13,7 @@
 
 PKG             := stable-octave
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 9.0.91
+$(PKG)_VERSION  := 9.1.1
 $(PKG)_CHECKSUM := ## No checksum
 $(PKG)_SUBDIR   := octave-$($(PKG)_VERSION)
 $(PKG)_FILE     := octave-$($(PKG)_VERSION).tar.lz