[geos-commits] [SCM] GEOS branch main updated. 7f40256c66273f2dfaaf57cc56e6ad1347b17d6e

[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  7f40256c66273f2dfaaf57cc56e6ad1347b17d6e (commit)
       via  d0f8b75b42065a866cd58c913812c28873422637 (commit)
      from  3972990a4746966a2b33932c71b9087b8b87c9dc (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 7f40256c66273f2dfaaf57cc56e6ad1347b17d6e
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Thu Sep 30 15:47:15 2021 -0700

    Hold dev tag until release

diff --git a/Version.txt b/Version.txt
index 8601ce3..d0a7ea8 100644
--- a/Version.txt
+++ b/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=dev
 
 # GEOS CAPI Versions
 #

commit d0f8b75b42065a866cd58c913812c28873422637
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Thu Sep 30 15:46:22 2021 -0700

    Bumps for pre-release

diff --git a/HOWTO_RELEASE b/HOWTO_RELEASE
index efd1d74..3393559 100644
--- a/HOWTO_RELEASE
+++ b/HOWTO_RELEASE
@@ -1,5 +1,5 @@
 1. Verify that the versions currently set in Version.txt
-   make sense for this release.
+   make sense for this release. See file for instructions.
 
     - GEOS_VERSION_PATCH
     - GEOS_VERSION_MINOR
@@ -9,38 +9,46 @@
     - CAPI_INTERFACE_REVISION
     - CAPI_INTERFACE_AGE
 
-2. Run 'make distcheck', fix any problem with it.
+2. Prepare the build directory.
 
-3. Update the NEWS file (extract most important things from the
+   $ mkdir _build && cd _build && cmake ..
+
+3. Run the distcheck target, fix any problem with it.
+
+   $ cmake --build . --target distcheck
+
+4. Update the NEWS file (extract most important things from the
    repository log). Make sure to update the release date.
 
-4. Commit the changes in the NEWS file.
+5. Commit the changes in the NEWS file.
 
-5. Run 'make dist-bzip2'.
+6. Build the distribution package.
 
-   $ mkdir build && cd build && cmake .. && cmake --build . --target dist
+   $ cmake --build . --target dist
 
-6. Verify that you can un-pack and build the tarball.
+7. Verify that you can un-pack and build the tarball.
 
-   - mkdir build && cd build && cmake .. && make && make check
+   $ tar xvfz geos-VERSION.tar.bz2
+   $ cd geos-VERSION
+   $ mkdir _build && cd _build && cmake .. && make && make check
 
-7. Copy the tarball to upload.osgeo.org:/osgeo/download/geos
+8. Copy the tarball to upload.osgeo.org:/osgeo/download/geos
 
-8. Tag the release:
+9. Tag the release:
 
    $ git tag MAJOR.MINOR.PATCH
    $ git push origin MAJOR.MINOR.PATCH
 
-9. Create and push a release branch if this was a PATCH=0 release,
-   update the versions for next release in Version.txt (both in
-   main and release branch if this was a PATCH=0 release).
+10. Create and push a release branch if this was a PATCH=0 release,
+    update the versions for next release in Version.txt (both in
+    main and release branch if this was a PATCH=0 release).
 
-10. Update wiki page https://trac.osgeo.org/geos/ at Download section
+11. Update wiki page https://trac.osgeo.org/geos/ at Download section
 
     - Add latest release
     - Remove previous patch level release (if any)
 
-11. Close current trac milestone and add new one for next release,
+12. Close current trac milestone and add new one for next release,
     add new trac version for this release.
 
 12. Announce on geos-devel
diff --git a/Version.txt b/Version.txt
index b257748..8601ce3 100644
--- a/Version.txt
+++ b/Version.txt
@@ -5,7 +5,7 @@ GEOS_VERSION_MINOR=10
 GEOS_VERSION_PATCH=0
 
 # OPTIONS: "", "dev", "rc1" etc.
-GEOS_PATCH_WORD=dev
+GEOS_PATCH_WORD=beta1
 
 # GEOS CAPI Versions
 #
@@ -15,9 +15,9 @@ GEOS_PATCH_WORD=dev
 # - Deleting interfaces / compatibility issues - bump CURRENT, others to zero
 #   ( THIS MUST BE CAREFULLY AVOIDED )
 #
-CAPI_INTERFACE_CURRENT=16
+CAPI_INTERFACE_CURRENT=17
 CAPI_INTERFACE_REVISION=0
-CAPI_INTERFACE_AGE=15
+CAPI_INTERFACE_AGE=16
 
 # JTS Port
-JTS_PORT=1.17.0
+JTS_PORT=1.18.0

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

Summary of changes:
 HOWTO_RELEASE | 38 +++++++++++++++++++++++---------------
 Version.txt   |  6 +++---
 2 files changed, 26 insertions(+), 18 deletions(-)


hooks/post-receive
-- 
GEOS