Flip to 3.0.0, update other docs, update how to release to reflect change from apache...

git-svn-id: http://svn.osgeo.org/postgis/branches/3.0@17981 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/HOWTO_RELEASE b/HOWTO_RELEASE
index 25d5d27bdef9fc10b7cb8790618a583f18327b5e..bab5bb8c4f521b87e456acf430e2f3528124a052 100644 (file)
--- a/HOWTO_RELEASE
+++ b/HOWTO_RELEASE
@@ -1,6 +1,6 @@
 How to release
 ~~~~~~~~~~~~~~
-Date: 2015-10-08
+Date: 2019-10-19
 
 Versioning Scheme
 -----------------
@@ -97,7 +97,7 @@ Release procedure
 - Documentation should also have been built and should be in postgis.net/stuff
   (this sometimes takes sometime so wait 15 minutes)
 - Test generated tarball (including extension upgrade)
-- Copy tarball, pdf, doc-html.. to http://download.osgeo.org/postgis/ web site and edit postgis.net/source page
+- Copy tarball, pdf, doc-html.. to https://download.osgeo.org/postgis/ web site and edit postgis.net/source page and config.yaml 
 - Announce on e-mail
     - postgis-users
     - postgis-devel
@@ -111,7 +111,7 @@ Release procedure
        b) Update links on https://git.osgeo.org/gitea/postgis/postgis.net/src/master/_content/pages/source.html
        c) commit and wait 5 minutes to see changes on website
     - PostGIS doc release versioned doc - http://postgis.net/documentation/
-    - On postgis.net server, change /etc/apache2/postgis.net-common.conf (Versionless URL line )
+    - On postgis.net server, change /etc/nginx/sites-enabled/postgis.net.conf (Versionless URL lines #current docs, #dev docs )
      Verify the documentation is up to date (might need to change the apach config)
     - Wikipedia
     - Twitter

diff --git a/NEWS b/NEWS
index a33251b113a5374d4f05c3dc74b2140549320985..e89de84ea6911890ab9238ea5cc419e5f28a38d4 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,5 @@
 PostGIS 3.0.0
-2019/xx/xx
+2019/10/20
 This version requires PostgreSQL 9.5+-12 and GEOS >= 3.6+
 Additional features enabled if you are running Proj6+ and PostgreSQL 12
 

diff --git a/README.md b/README.md
index 90b1adfce308d56f58d0efc9ef0ea8bbfe110170..f515ced3a4f811f2f259bb8aa1c5a1f52556ecfd 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,16 +1,16 @@
 Debbie:
-   [![Build Status](https://debbie.postgis.net/buildStatus/icon?job=PostGIS_trunk)](https://debbie.postgis.net/view/PostGIS/job/PostGIS_trunk/)
+   [![Build Status](https://debbie.postgis.net/buildStatus/icon?job=PostGIS_3.0)](https://debbie.postgis.net/view/PostGIS/job/PostGIS_3.0/)
 Winnie:
- [![Build Status](https://winnie.postgis.net:444/buildStatus/icon?job=PostGIS_trunk)](https://winnie.postgis.net:444/view/PostGIS/job/PostGIS_trunk/)
+ [![Build Status](https://winnie.postgis.net:444/buildStatus/icon?job=PostGIS_3.0)](https://winnie.postgis.net:444/view/PostGIS/job/PostGIS_3.0/)
 Dronie:
- [![Build Status](https://dronie.osgeo.org/api/badges/postgis/postgis/status.svg?branch=svn-trunk)](https://dronie.osgeo.org/postgis/postgis?branch=svn-trunk)
+ [![Build Status](https://dronie.osgeo.org/api/badges/postgis/postgis/status.svg?branch=svn-3.0)](https://dronie.osgeo.org/postgis/postgis?branch=svn-3.0)
  
 Travis:
- [![Build Status](https://api.travis-ci.org/postgis/postgis.svg?branch=svn-trunk,svn-2.5,svn-2.4,svn-2.3)](http://travis-ci.org/postgis/postgis)
+ [![Build Status](https://api.travis-ci.org/postgis/postgis.svg?branch=svn-3.0,svn-3.0,svn-2.5,svn-2.4,svn-2.3)](http://travis-ci.org/postgis/postgis)
 GitLab-CI:
- [![Gitlab-CI](https://gitlab.com/postgis/postgis/badges/svn-trunk/build.svg)](https://gitlab.com/postgis/postgis/commits/svn-trunk)
+ [![Gitlab-CI](https://gitlab.com/postgis/postgis/badges/svn-3.0/build.svg)](https://gitlab.com/postgis/postgis/commits/svn-3.0)
 Drone.io:
- [![Build Status](https://cloud.drone.io/api/badges/postgis/postgis/status.svg?branch=svn-trunk)](https://cloud.drone.io/postgis/postgis?branch=svn-trunk)
+ [![Build Status](https://cloud.drone.io/api/badges/postgis/postgis/status.svg?branch=svn-3.0)](https://cloud.drone.io/postgis/postgis?branch=svn-3.0)
 
 
 Bessie:

diff --git a/README.postgis b/README.postgis
index 41b939ae8794e66e8f312ed9c6c4f3f0e8a62b38..7e1b8572aff4655de3dd74f99dd8cf36eb1d14be 100644 (file)
--- a/README.postgis
+++ b/README.postgis
@@ -1,8 +1,8 @@
 PostGIS - Geographic Information Systems Extensions to PostgreSQL
 =================================================================
 
-:Version: 3.0.0rc2
-:Date: 2019-10-13
+:Version: 3.0.0
+:Date: 2019-10-20
 :Website: https://postgis.net
 
 This distribution contains a module which implements GIS simple features, ties

diff --git a/Version.config b/Version.config
index 9f2eeed0f075f5366d76f82248a054b145549790..d1f7853dc09279de85b64fb6f3b01cd31184c3b4 100644 (file)
--- a/Version.config
+++ b/Version.config
@@ -5,7 +5,7 @@
 
 POSTGIS_MAJOR_VERSION=3
 POSTGIS_MINOR_VERSION=0
-POSTGIS_MICRO_VERSION=0rc2
+POSTGIS_MICRO_VERSION=0
 
 # Liblwgeom interface versioning, reset to 0:0:0 (cur:age:rev)
 # when changing POSTGIS_MINOR_VERSION

diff --git a/extensions/upgradeable_versions.mk b/extensions/upgradeable_versions.mk
index d552e141cd75c0f6b706d5e6c4aae98e16787e3a..3fee97cfede36bd79fcabb57c7446d4cfe7e8a6a 100644 (file)
--- a/extensions/upgradeable_versions.mk
+++ b/extensions/upgradeable_versions.mk
@@ -53,10 +53,7 @@ UPGRADEABLE_VERSIONS = \
        2.5.2 \
        2.5.3 \
        2.5.4 \
-       3.0.0alpha1 \
-       3.0.0alpha2 \
-       3.0.0alpha3 \
        3.0.0alpha4 \
        3.0.0beta1 \
        3.0.0rc1 \
-       3.0.0rc2dev
+       3.0.0rc2