[Git][debian-gis-team/geos][experimental] 5 commits: New upstream version 3.10.0~beta2
Bas Couwenberg (@sebastic)
gitlab at salsa.debian.org
Sat Oct 2 07:02:32 BST 2021
Bas Couwenberg pushed to branch experimental 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
- - - - -
4e52014b by Bas Couwenberg at 2021-10-02T07:30:54+02:00
Update upstream source from tag 'upstream/3.10.0_beta2'
Update to upstream version '3.10.0~beta2'
with Debian dir b67b0d370ae6acd61d8df8600cb5a1b44fc29781
- - - - -
5e229906 by Bas Couwenberg at 2021-10-02T07:31:07+02:00
New upstream beta release.
- - - - -
578fbf7f by Bas Couwenberg at 2021-10-02T07:36:22+02:00
Drop patches, applied/included upstream.
- - - - -
9ab28a03 by Bas Couwenberg at 2021-10-02T07:37:20+02:00
Set distribution to experimental.
- - - - -
10 changed files:
- CMakeLists.txt
- Version.txt
- capi/geos_c.h.in
- debian/changelog
- − debian/patches/series
- − debian/patches/soname.patch
- − debian/patches/spelling-errors.patch
- − debian/patches/test_docs.patch
- 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
=====================================
debian/changelog
=====================================
@@ -1,8 +1,9 @@
-geos (3.10.0~beta1-1~exp2) UNRELEASED; urgency=medium
+geos (3.10.0~beta2-1) experimental; urgency=medium
- * Update test_docs.patch to fix failure instead of disabling test.
+ * New upstream beta release.
+ * Drop patches, applied/included upstream.
- -- Bas Couwenberg <sebastic at debian.org> Fri, 01 Oct 2021 18:46:24 +0200
+ -- Bas Couwenberg <sebastic at debian.org> Sat, 02 Oct 2021 07:37:08 +0200
geos (3.10.0~beta1-1~exp1) experimental; urgency=medium
=====================================
debian/patches/series deleted
=====================================
@@ -1,3 +0,0 @@
-soname.patch
-test_docs.patch
-spelling-errors.patch
=====================================
debian/patches/soname.patch deleted
=====================================
@@ -1,18 +0,0 @@
-Description: Don't include pre-release in SONAME.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://lists.osgeo.org/pipermail/geos-devel/2021-October/010361.html
-Applied-Upstream: https://git.osgeo.org/gitea/geos/geos/commit/75cb982535b845a613e4050eda1f970662510554
-
---- 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()
-
- #-----------------------------------------------------------------------------
=====================================
debian/patches/spelling-errors.patch deleted
=====================================
@@ -1,28 +0,0 @@
-Description: Fix spelling errors.
- * nunber -> number
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://lists.osgeo.org/pipermail/geos-devel/2021-October/010362.html
-Applied-Upstream: https://git.osgeo.org/gitea/geos/geos/commit/75cb982535b845a613e4050eda1f970662510554
-
---- 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>( ))
---- 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)
=====================================
debian/patches/test_docs.patch deleted
=====================================
@@ -1,16 +0,0 @@
-Description: Fix test_docs failure.
-Author: Paul Ramsey <pramsey at cleverlephant.ca>
-Origin: https://git.osgeo.org/gitea/geos/geos/commit/75cb982535b845a613e4050eda1f970662510554
-Bug: https://lists.osgeo.org/pipermail/geos-devel/2021-September/010360.html
-
---- a/capi/geos_c.h.in
-+++ b/capi/geos_c.h.in
-@@ -259,7 +259,7 @@ typedef void (*GEOSQueryCallback)(void *
- *
- * \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/-/compare/3be1355839f453ec92498cf604226ffbf13c19b8...9ab28a03d615ffb808335e0e68777bce3deb1aed
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/geos/-/compare/3be1355839f453ec92498cf604226ffbf13c19b8...9ab28a03d615ffb808335e0e68777bce3deb1aed
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/2f6a8c37/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list