From a9b73f55f4017635504ad865ef0f154ae0db8b70 Mon Sep 17 00:00:00 2001 From: Paul Wessel Date: Wed, 27 Jun 2018 20:18:34 +0000 Subject: [PATCH 1/3] Reset version release string to normal setting --- cmake/ConfigDefault.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/ConfigDefault.cmake b/cmake/ConfigDefault.cmake index 92a7c508765..7c689b7b22c 100644 --- a/cmake/ConfigDefault.cmake +++ b/cmake/ConfigDefault.cmake @@ -48,8 +48,8 @@ set (GMT_PACKAGE_VERSION_PATCH 4) # This is manually set when making GMT *public* releases. # However, when making internal releases or just an ordinary developer build, leave it # empty; if it is empty, the revision number is automatically populated for you on build. -set (GMT_SOURCE_CODE_CONTROL_VERSION_STRING "20308") -#set (GMT_SOURCE_CODE_CONTROL_VERSION_STRING "") +#set (GMT_SOURCE_CODE_CONTROL_VERSION_STRING "20308") +set (GMT_SOURCE_CODE_CONTROL_VERSION_STRING "") # The GMT package version. set (GMT_PACKAGE_VERSION "${GMT_PACKAGE_VERSION_MAJOR}.${GMT_PACKAGE_VERSION_MINOR}.${GMT_PACKAGE_VERSION_PATCH}") From e4ebd5b059b9848c73880df85c9f862c594ce700 Mon Sep 17 00:00:00 2001 From: Paul Wessel Date: Thu, 28 Jun 2018 02:05:50 +0000 Subject: [PATCH 2/3] Fix missing size-declaration for track_path --- src/x2sys/x2sys_put.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/x2sys/x2sys_put.c b/src/x2sys/x2sys_put.c index f30338916cf..7a8a35f61a4 100644 --- a/src/x2sys/x2sys_put.c +++ b/src/x2sys/x2sys_put.c @@ -195,7 +195,7 @@ int GMT_x2sys_put (void *V_API, int mode, void *args) { char track[GMT_LEN64] = {""}, line[GMT_BUFSIZ] = {""}; char track_file[GMT_BUFSIZ] = {""}, index_file[GMT_BUFSIZ] = {""}, old_track_file[GMT_BUFSIZ] = {""}, old_index_file[GMT_BUFSIZ] = {""}; - char track_path[] = {""}, index_path[GMT_BUFSIZ] = {""}, old_track_path[GMT_BUFSIZ] = {""}, old_index_path[GMT_BUFSIZ] = {""}; + char track_path[GMT_BUFSIZ] = {""}, index_path[GMT_BUFSIZ] = {""}, old_track_path[GMT_BUFSIZ] = {""}, old_index_path[GMT_BUFSIZ] = {""}; int error = 0, k; bool found_it, skip; From e432f5de0a953cd06935be21e0726fd749fb67c3 Mon Sep 17 00:00:00 2001 From: Paul Wessel Date: Thu, 28 Jun 2018 02:11:28 +0000 Subject: [PATCH 3/3] UPdate ConfigDefaults for 5.4.4 release --- cmake/ConfigDefault.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/ConfigDefault.cmake b/cmake/ConfigDefault.cmake index 7c689b7b22c..c8a0de5e6af 100644 --- a/cmake/ConfigDefault.cmake +++ b/cmake/ConfigDefault.cmake @@ -48,8 +48,8 @@ set (GMT_PACKAGE_VERSION_PATCH 4) # This is manually set when making GMT *public* releases. # However, when making internal releases or just an ordinary developer build, leave it # empty; if it is empty, the revision number is automatically populated for you on build. -#set (GMT_SOURCE_CODE_CONTROL_VERSION_STRING "20308") -set (GMT_SOURCE_CODE_CONTROL_VERSION_STRING "") +set (GMT_SOURCE_CODE_CONTROL_VERSION_STRING "20314") +#set (GMT_SOURCE_CODE_CONTROL_VERSION_STRING "") # The GMT package version. set (GMT_PACKAGE_VERSION "${GMT_PACKAGE_VERSION_MAJOR}.${GMT_PACKAGE_VERSION_MINOR}.${GMT_PACKAGE_VERSION_PATCH}")