[geos-commits] [SCM] GEOS branch main updated. 75cb982535b845a613e4050eda1f970662510554

[git at osgeo.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GEOS".

The branch, main has been updated
       via  75cb982535b845a613e4050eda1f970662510554 (commit)
      from  7f40256c66273f2dfaaf57cc56e6ad1347b17d6e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 75cb982535b845a613e4050eda1f970662510554
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Fri Oct 1 09:36:47 2021 -0700

    Fixes from Bas Couwenberg <sebastic at debian.org> pre-release

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b87c32a..d2e9c26 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -271,8 +271,8 @@ if(BUILD_SHARED_LIBS)
   target_compile_definitions(geos
     PRIVATE $<IF:$<CXX_COMPILER_ID:MSVC>,GEOS_DLL_EXPORT,DLL_EXPORT>)
 
-  set_target_properties(geos PROPERTIES VERSION ${GEOS_VERSION})
-  set_target_properties(geos PROPERTIES SOVERSION ${GEOS_VERSION})
+  set_target_properties(geos PROPERTIES VERSION ${CMAKE_PROJECT_VERSION})
+  set_target_properties(geos PROPERTIES SOVERSION ${CMAKE_PROJECT_VERSION})
 endif()
 
 #-----------------------------------------------------------------------------
diff --git a/HOWTO_RELEASE b/HOWTO_RELEASE
index 3393559..97e90a4 100644
--- a/HOWTO_RELEASE
+++ b/HOWTO_RELEASE
@@ -11,11 +11,12 @@
 
 2. Prepare the build directory.
 
-   $ mkdir _build && cd _build && cmake ..
+   $ mkdir _build && cd _build && cmake -DBUILD_DOCUMENTATION=YES ..
 
-3. Run the distcheck target, fix any problem with it.
+3. Run the distcheck target and docs targets, fix any problem with them.
 
    $ cmake --build . --target distcheck
+   # cmake --build . --target docs
 
 4. Update the NEWS file (extract most important things from the
    repository log). Make sure to update the release date.
diff --git a/capi/geos_c.h.in b/capi/geos_c.h.in
index 50a19bb..2f5c519 100644
--- a/capi/geos_c.h.in
+++ b/capi/geos_c.h.in
@@ -259,7 +259,7 @@ typedef void (*GEOSQueryCallback)(void *item, void *userdata);
 *
 * \param item1 first of the pair of items to calculate distance between
 * \param item2 second of the pair of items to calculate distance between
-* \param return distance the distance between the items here
+* \param distance the distance between the items here
 * \param userdata extra data for the calculation
 *
 * \return zero if distance calculation succeeded, non-zero otherwise
diff --git a/util/geosop/GeosOp.cpp b/util/geosop/GeosOp.cpp
index a74bcac..483b3a3 100644
--- a/util/geosop/GeosOp.cpp
+++ b/util/geosop/GeosOp.cpp
@@ -61,7 +61,7 @@ int main(int argc, char** argv) {
     options.add_options()
         ("a", "source for A geometries (WKT, WKB, file, stdin, stdin.wkb)", cxxopts::value<std::string>( cmdArgs.srcA ))
         ("b", "source for B geometries (WKT, WKB, file, stdin, stdin.wkb)", cxxopts::value<std::string>( cmdArgs.srcB ))
-        ("alimit", "Limit nunber of A geometries read", cxxopts::value<int>( cmdArgs.limitA ))
+        ("alimit", "Limit number of A geometries read", cxxopts::value<int>( cmdArgs.limitA ))
         ("c,collect", "Collect input into single geometry", cxxopts::value<bool>( cmdArgs.isCollect ))
         ("e,explode", "Explode results into conponent geometris", cxxopts::value<bool>( cmdArgs.isExplode))
         ("f,format", "Output format (wkt, wkb or txt)", cxxopts::value<std::string>( ))
diff --git a/util/geosop/README.md b/util/geosop/README.md
index 284e368..1d15f8c 100644
--- a/util/geosop/README.md
+++ b/util/geosop/README.md
@@ -30,7 +30,7 @@ It can be used to:
 
   -a arg               source for A geometries (WKT, WKB, file, stdin, stdin.wkb)
   -b arg               source for B geometries (WKT, WKB, file, stdin, stdin.wkb)
-      --alimit arg     Limit nunber of A geometries read
+      --alimit arg     Limit number of A geometries read
   -c, --collect        Collect input into single geometry
   -e, --explode        Explode results into conponent geometris
   -f, --format arg     Output format (wkt, wkb or txt)

-----------------------------------------------------------------------

Summary of changes:
 CMakeLists.txt         | 4 ++--
 HOWTO_RELEASE          | 5 +++--
 capi/geos_c.h.in       | 2 +-
 util/geosop/GeosOp.cpp | 2 +-
 util/geosop/README.md  | 2 +-
 5 files changed, 8 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
GEOS