Merge pull request #454 from WardF/prep-v4.6.2-rc1.wif

Prep v4.6.2 rc1.wif
Unidata · Oct 21, 2024 · 176a0b2 · 176a0b2
2 parents 6302daa + 396e4fa
commit 176a0b2
Show file tree

Hide file tree

Showing 44 changed files with 195,538 additions and 10 deletions.
diff --git a/CMakeExtras/Makefile.in b/CMakeExtras/Makefile.in
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -25,7 +25,7 @@ SET(NC4F_VERSION_MAJOR 4)
 SET(NC4F_VERSION_MINOR 6)
 
 SET(NC4F_VERSION_PATCH 2)
-SET(NC4F_VERSION_NOTE "-development")
+SET(NC4F_VERSION_NOTE "-rc1")
 SET(NC4F_VERSION ${NC4F_VERSION_MAJOR}.${NC4F_VERSION_MINOR}.${NC4F_VERSION_PATCH}${NC4F_VERSION_NOTE})
 SET(VERSION ${NC4F_VERSION})
 SET(NC4F_LIB_VERSION 7.1.0)

diff --git a/Makefile.am b/Makefile.am
@@ -36,7 +36,7 @@ check_nc_config:
 # These files get added to the distribution.
 EXTRA_DIST = README.md RELEASE_NOTES.md netcdf-fortran.pc.in	\
 F03Interfaces_LICENSE CMakeLists.txt COPYRIGHT nf-config.in	\
-config.h.cmake.in CTestConfig.cmake.in nf-config.cmake.in \
+config.h.cmake.in CTestConfig.cmake.in \
 libnetcdff.settings.in netCDF-FortranConfig.cmake.in
 
 # Remove these generated files, for a distclean.