Skip to content
This repository has been archived by the owner on Jan 30, 2023. It is now read-only.

Commit

Permalink
Merge branch develop
Browse files Browse the repository at this point in the history
  • Loading branch information
kwankyu committed Apr 22, 2022
2 parents 5420184 + ad69a5b commit ee57bfc
Show file tree
Hide file tree
Showing 10 changed files with 43 additions and 18 deletions.
8 changes: 4 additions & 4 deletions .zenodo.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"description": "Mirror of the Sage https://sagemath.org/ source tree",
"license": "other-open",
"title": "sagemath/sage: 9.6.rc0",
"version": "9.6.rc0",
"title": "sagemath/sage: 9.6.rc1",
"version": "9.6.rc1",
"upload_type": "software",
"publication_date": "2022-04-10",
"publication_date": "2022-04-19",
"creators": [
{
"affiliation": "SageMath.org",
Expand All @@ -15,7 +15,7 @@
"related_identifiers": [
{
"scheme": "url",
"identifier": "https://github.com/sagemath/sage/tree/9.6.rc0",
"identifier": "https://github.com/sagemath/sage/tree/9.6.rc1",
"relation": "isSupplementTo"
},
{
Expand Down
2 changes: 1 addition & 1 deletion VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
SageMath version 9.6.rc0, Release Date: 2022-04-10
SageMath version 9.6.rc1, Release Date: 2022-04-19
6 changes: 3 additions & 3 deletions build/pkgs/configure/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tarball=configure-VERSION.tar.gz
sha1=ffb658a0ff2c9baafe48b0986c8f4a752b8165e2
md5=ca16d1e5c783c44d765afc0673dad562
cksum=2868305934
sha1=1524f97042a658d1c6b797ccaf9281ed32474930
md5=b2db89f2ac4c76b3f6b30f57ee15171d
cksum=3697337668
2 changes: 1 addition & 1 deletion build/pkgs/configure/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
547ddc2096a611d3273bd5a1c93445dc7348014a
9da7c13c6970e13984373574ed04410134120370
2 changes: 1 addition & 1 deletion build/pkgs/giac/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.6.0.47p3
1.6.0.47p3.p0
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
From 5546fba822d4816eb27c94964b96caa69989b846 Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <[email protected]>
Date: Sun, 17 Apr 2022 12:20:55 -0700
Subject: [PATCH] src/global.cc: Do not send SIGINT to process 1

---
src/global.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/global.cc b/src/global.cc
index c343aea..87e4575 100755
--- a/src/global.cc
+++ b/src/global.cc
@@ -1978,7 +1978,7 @@ extern "C" void Sleep(unsigned int miliSecond);
void ctrl_c_signal_handler(int signum){
ctrl_c=true;
#if !defined KHICAS && !defined NSPIRE_NEWLIB && !defined WIN32 && !defined BESTA_OS && !defined NSPIRE && !defined FXCG && !defined POCKETCAS
- if (child_id)
+ if (child_id && child_id != 1)
kill(child_id,SIGINT);
#endif
#if defined HAVE_SIGNAL_H && !defined HAVE_NO_SIGNAL_H
--
2.35.1

2 changes: 1 addition & 1 deletion build/pkgs/sagelib/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9.6.rc0
9.6.rc1
2 changes: 1 addition & 1 deletion src/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9.6.rc0
9.6.rc1
6 changes: 3 additions & 3 deletions src/bin/sage-version.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Sage version information for shell scripts
# This file is auto-generated by the sage-update-version script, do not edit!
SAGE_VERSION='9.6.rc0'
SAGE_RELEASE_DATE='2022-04-10'
SAGE_VERSION_BANNER='SageMath version 9.6.rc0, Release Date: 2022-04-10'
SAGE_VERSION='9.6.rc1'
SAGE_RELEASE_DATE='2022-04-19'
SAGE_VERSION_BANNER='SageMath version 9.6.rc1, Release Date: 2022-04-19'
6 changes: 3 additions & 3 deletions src/sage/version.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Sage version information for Python scripts
# This file is auto-generated by the sage-update-version script, do not edit!
version = '9.6.rc0'
date = '2022-04-10'
banner = 'SageMath version 9.6.rc0, Release Date: 2022-04-10'
version = '9.6.rc1'
date = '2022-04-19'
banner = 'SageMath version 9.6.rc1, Release Date: 2022-04-19'

0 comments on commit ee57bfc

Please sign in to comment.