[Git][debian-gis-team/geos][upstream] New upstream version 3.10.0~beta2

[Bas Couwenberg (@sebastic)]

Bas Couwenberg pushed to branch upstream at Debian GIS Project / geos


Commits:
4bf58692 by Bas Couwenberg at 2021-10-02T07:30:45+02:00
New upstream version 3.10.0~beta2
- - - - -


5 changed files:

- CMakeLists.txt
- Version.txt
- capi/geos_c.h.in
- util/geosop/GeosOp.cpp
- util/geosop/README.md


Changes:

=====================================
CMakeLists.txt
=====================================
@@ -131,6 +131,7 @@ if(NOT "${_version_patch_word}" STREQUAL "")
   set(GEOS_VERSION "${GEOS_VERSION}${_version_patch_word}")
   set(GEOS_VERSION_PATCH "${_version_patch}${_version_patch_word}")
 endif()
+set(GEOS_VERSION_NOPATCH "${_version_major}.${_version_minor}.${_version_patch}")
 
 unset(_version_major)
 unset(_version_minor)
@@ -271,8 +272,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 ${GEOS_VERSION_NOPATCH})
+  set_target_properties(geos PROPERTIES SOVERSION ${GEOS_VERSION_NOPATCH})
 endif()
 
 #-----------------------------------------------------------------------------


=====================================
Version.txt
=====================================
@@ -5,7 +5,7 @@ GEOS_VERSION_MINOR=10
 GEOS_VERSION_PATCH=0
 
 # OPTIONS: "", "dev", "rc1" etc.
-GEOS_PATCH_WORD=beta1
+GEOS_PATCH_WORD=beta2
 
 # GEOS CAPI Versions
 #


=====================================
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


=====================================
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>( ))


=====================================
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)



View it on GitLab: https://salsa.debian.org/debian-gis-team/geos/-/commit/4bf586929e379cf82619bdfe0a4383aeb56acaf7

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/geos/-/commit/4bf586929e379cf82619bdfe0a4383aeb56acaf7
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20211002/8be8d9b4/attachment-0001.htm>