From 32fe60952ca05dd3320e92e428a9da38752e6d50 Mon Sep 17 00:00:00 2001 From: tbeu Date: Sun, 12 Nov 2023 13:32:40 +0100 Subject: [PATCH] Bump date and NEWS for v1.5.26 --- .appveyor.yml | 2 +- .ci/travis_after_success.sh | 2 +- CMakeLists.txt | 2 +- NEWS | 3 +++ configure.ac | 10 +++++----- documentation/matio_user_guide.texi | 2 +- visual_studio/matio.rc | 8 ++++---- visual_studio/matioConfig.h | 6 +++--- visual_studio/matio_pubconf.h | 6 +++--- 9 files changed, 22 insertions(+), 19 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 2c19a169..45792b6f 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -4,7 +4,7 @@ branches: except: - coverity_scan -version: 1.5.25+build.{build} +version: 1.5.26+build.{build} cache: - C:\cygwin-setup-cache diff --git a/.ci/travis_after_success.sh b/.ci/travis_after_success.sh index 5e08faee..4a456d86 100755 --- a/.ci/travis_after_success.sh +++ b/.ci/travis_after_success.sh @@ -19,4 +19,4 @@ if [[ "$TRAVIS_PULL_REQUEST" != "false" ]] || [[ "$TRAVIS_BRANCH" != "master" ]] exit 0 fi -curl -X POST -H "Authorization: Bearer $BBTOKEN" https://api.bitbucket.org/2.0/repositories/tbeu/downloads/downloads -F files=@./documentation/matio_user_guide.html -F files=@./documentation/matio_user_guide.pdf -F files=@./matio-1.5.25.tar.gz +curl -X POST -H "Authorization: Bearer $BBTOKEN" https://api.bitbucket.org/2.0/repositories/tbeu/downloads/downloads -F files=@./documentation/matio_user_guide.html -F files=@./documentation/matio_user_guide.pdf -F files=@./matio-1.5.26.tar.gz diff --git a/CMakeLists.txt b/CMakeLists.txt index 1d1a4c54..745f549e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,7 @@ if(POLICY CMP0074) endif() project(matio - VERSION 1.5.25 + VERSION 1.5.26 LANGUAGES C CXX ) diff --git a/NEWS b/NEWS index 477a0414..12a9e04e 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,6 @@ +Changes in 1.5.26 (12 November 2023) +* Fixed testsuite (regression of v1.5.25) + Changes in 1.5.25 (10 November 2023) * Fixed reading struct array with null padded class name from HDF5 MAT file * Fixed memory leak in Mat_VarFree for function class diff --git a/configure.ac b/configure.ac index 0efc5e24..ea703cb1 100644 --- a/configure.ac +++ b/configure.ac @@ -27,7 +27,7 @@ dnl CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY dnl OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE dnl OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -AC_INIT([MATIO],[1.5.25],[t-beu@users.sourceforge.net],[],[https://sourceforge.net/projects/matio]) +AC_INIT([MATIO],[1.5.26],[t-beu@users.sourceforge.net],[],[https://sourceforge.net/projects/matio]) AC_CONFIG_SRCDIR([src/matio.h]) AC_CONFIG_AUX_DIR([config]) AC_CONFIG_MACRO_DIR([config]) @@ -39,10 +39,10 @@ AC_CANONICAL_HOST AC_DEFINE_UNQUOTED([MATIO_PLATFORM],"${host}",[Platform]) AC_DEFINE_UNQUOTED([MATIO_MAJOR_VERSION],1,[Matio major version number]) AC_DEFINE_UNQUOTED([MATIO_MINOR_VERSION],5,[Matio minor version number]) -AC_DEFINE_UNQUOTED([MATIO_RELEASE_LEVEL],25,[Matio release level number]) -AC_DEFINE_UNQUOTED([MATIO_VERSION],1525,[Matio version number]) -PACKAGE_RELEASE_DATE="10 November 2023" -AC_DEFINE_UNQUOTED([MATIO_VERSION_STR],"1.5.25",[Matio version number]) +AC_DEFINE_UNQUOTED([MATIO_RELEASE_LEVEL],26,[Matio release level number]) +AC_DEFINE_UNQUOTED([MATIO_VERSION],1526,[Matio version number]) +PACKAGE_RELEASE_DATE="12 November 2023" +AC_DEFINE_UNQUOTED([MATIO_VERSION_STR],"1.5.26",[Matio version number]) AC_SUBST(PACKAGE_RELEASE_DATE) AC_ARG_VAR([FCLDFLAGS],[Fortran compiler-specific flags at link time]) diff --git a/documentation/matio_user_guide.texi b/documentation/matio_user_guide.texi index 641da646..68bece48 100644 --- a/documentation/matio_user_guide.texi +++ b/documentation/matio_user_guide.texi @@ -37,7 +37,7 @@ @sp 0 @title @subtitle User Manual -@subtitle for version 1.5.25 +@subtitle for version 1.5.26 @subtitle November 2023 @author Christopher C. Hulbert @page diff --git a/visual_studio/matio.rc b/visual_studio/matio.rc index dda85c56..6bca7b5a 100644 --- a/visual_studio/matio.rc +++ b/visual_studio/matio.rc @@ -1,8 +1,8 @@ #include VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,5,25,0 - PRODUCTVERSION 1,5,25,0 + FILEVERSION 1,5,26,0 + PRODUCTVERSION 1,5,26,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS 1 @@ -19,12 +19,12 @@ BEGIN //language ID = U.S. English, char set = Windows, Multilingual BEGIN VALUE "FileDescription", "MATLAB MAT file I/O library\0" - VALUE "FileVersion", "1.5.25\0" + VALUE "FileVersion", "1.5.26\0" VALUE "InternalName", "libmatio.dll\0" VALUE "LegalCopyright", "(C) 2005-2023, Christopher C. Hulbert and the matio contributors\0" VALUE "OriginalFilename", "libmatio.dll\0" VALUE "ProductName", "libmatio\0" - VALUE "ProductVersion", "1.5.25\0" + VALUE "ProductVersion", "1.5.26\0" VALUE "Comments", "\0" END END diff --git a/visual_studio/matioConfig.h b/visual_studio/matioConfig.h index 0fe87875..b1dab3b0 100644 --- a/visual_studio/matioConfig.h +++ b/visual_studio/matioConfig.h @@ -271,7 +271,7 @@ #define PACKAGE_NAME "MATIO" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "MATIO 1.5.25" +#define PACKAGE_STRING "MATIO 1.5.26" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "matio" @@ -280,7 +280,7 @@ #define PACKAGE_URL "https://sourceforge.net/projects/matio" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.5.25" +#define PACKAGE_VERSION "1.5.26" /* The size of `char', as computed by sizeof. */ #define SIZEOF_CHAR 1 @@ -319,7 +319,7 @@ #undef STDC_HEADERS /* Version number of package */ -#define VERSION "1.5.25" +#define VERSION "1.5.26" /* Z prefix */ #undef Z_PREFIX diff --git a/visual_studio/matio_pubconf.h b/visual_studio/matio_pubconf.h index 62fb75c4..f054c5b8 100644 --- a/visual_studio/matio_pubconf.h +++ b/visual_studio/matio_pubconf.h @@ -35,13 +35,13 @@ #define MATIO_MINOR_VERSION 5 /* Matio release level number */ -#define MATIO_RELEASE_LEVEL 25 +#define MATIO_RELEASE_LEVEL 26 /* Matio version number */ -#define MATIO_VERSION 1525 +#define MATIO_VERSION 1526 /* Matio version string */ -#define MATIO_VERSION_STR "1.5.25" +#define MATIO_VERSION_STR "1.5.26" /* Default file format */ #define MAT_FT_DEFAULT MAT_FT_MAT5