From dc4e66f4f8a02981a543651d52ded17c3b9ed791 Mon Sep 17 00:00:00 2001 From: Stefan Vigerske Date: Wed, 6 Nov 2024 18:25:58 +0100 Subject: [PATCH 1/2] increase version to 9.2.1 and add changelog section --- CHANGELOG | 25 +++++++++++++++++++++++++ CMakeLists.txt | 2 +- doc/xternal.c | 2 +- make/make.project | 2 +- scripts/makedist.sh | 2 +- 5 files changed, 29 insertions(+), 4 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index fee35db311..cf8e63b17a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,30 @@ @page RN9 Release notes for SCIP 9 +@section RN921 SCIP 9.2.1 +************************* + +Fixed bugs +---------- + +Unit tests +---------- + +Testing +------- + +Build system +------------ + +### Cmake + +### Makefile + +Miscellaneous +------------- + +Known bugs +---------- + @section RN920 SCIP 9.2.0 ************************* diff --git a/CMakeLists.txt b/CMakeLists.txt index c23a1a85c9..b714ca4c14 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,7 +12,7 @@ endif() set(SCIP_VERSION_MAJOR 9) set(SCIP_VERSION_MINOR 2) -set(SCIP_VERSION_PATCH 0) +set(SCIP_VERSION_PATCH 1) set(SCIP_VERSION_SUB 0) set(SCIP_VERSION_API 115) diff --git a/doc/xternal.c b/doc/xternal.c index c00294df7a..73526b25f2 100644 --- a/doc/xternal.c +++ b/doc/xternal.c @@ -104,7 +104,7 @@ * * \verbinclude output.log * - * @version 9.2.0 + * @version 9.2.1 * * \image html scippy.png */ diff --git a/make/make.project b/make/make.project index c107212d8d..370864f1b6 100644 --- a/make/make.project +++ b/make/make.project @@ -95,7 +95,7 @@ CLOCKTYPE = 1 # set SCIP version here for external projects SCIP_VERSION_MAJOR = 9 SCIP_VERSION_MINOR = 2 -SCIP_VERSION_PATCH = 0 +SCIP_VERSION_PATCH = 1 SCIP_VERSION_SUB = 0 SCIP_VERSION_API = 115 SCIP_VERSION = $(SCIP_VERSION_MAJOR).$(SCIP_VERSION_MINOR).$(SCIP_VERSION_PATCH).$(SCIP_VERSION_SUB) diff --git a/scripts/makedist.sh b/scripts/makedist.sh index 1cb3c38e17..c3cf3709b9 100755 --- a/scripts/makedist.sh +++ b/scripts/makedist.sh @@ -6,7 +6,7 @@ # For release versions, only use VERSION="x.x.x". # For development versions, use VERSION="x.x.x.x" with subversion number. -VERSION="9.2.0" +VERSION="9.2.1" NAME="scip-$VERSION" if test ! -e release then From 2ea45e06fda231d7d90c65ce1b2f99088b27d2cc Mon Sep 17 00:00:00 2001 From: Stefan Vigerske Date: Wed, 6 Nov 2024 18:34:57 +0100 Subject: [PATCH 2/2] update version to 9.3.0 --- CMakeLists.txt | 2 +- doc/xternal.c | 2 +- make/make.project | 2 +- scripts/makedist.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c23a1a85c9..127a8f60df 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,7 @@ if(POLICY CMP0091) endif() set(SCIP_VERSION_MAJOR 9) -set(SCIP_VERSION_MINOR 2) +set(SCIP_VERSION_MINOR 3) set(SCIP_VERSION_PATCH 0) set(SCIP_VERSION_SUB 0) set(SCIP_VERSION_API 115) diff --git a/doc/xternal.c b/doc/xternal.c index c00294df7a..a378cba346 100644 --- a/doc/xternal.c +++ b/doc/xternal.c @@ -104,7 +104,7 @@ * * \verbinclude output.log * - * @version 9.2.0 + * @version 9.3.0 * * \image html scippy.png */ diff --git a/make/make.project b/make/make.project index c107212d8d..4d1a84c605 100644 --- a/make/make.project +++ b/make/make.project @@ -94,7 +94,7 @@ CLOCKTYPE = 1 # set SCIP version here for external projects SCIP_VERSION_MAJOR = 9 -SCIP_VERSION_MINOR = 2 +SCIP_VERSION_MINOR = 3 SCIP_VERSION_PATCH = 0 SCIP_VERSION_SUB = 0 SCIP_VERSION_API = 115 diff --git a/scripts/makedist.sh b/scripts/makedist.sh index 1cb3c38e17..83705686d1 100755 --- a/scripts/makedist.sh +++ b/scripts/makedist.sh @@ -6,7 +6,7 @@ # For release versions, only use VERSION="x.x.x". # For development versions, use VERSION="x.x.x.x" with subversion number. -VERSION="9.2.0" +VERSION="9.3.0" NAME="scip-$VERSION" if test ! -e release then