#2544: clarify how to release docs, update the extensions/upgradeable_versions.mk...

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

diff --git a/HOWTO_RELEASE b/HOWTO_RELEASE
index e23693b9fe2821f55ed38c95a119971f7ef8aae6..fbd34e9534f23fe7a53b43c4754f95ed7115606e 100644 (file)
--- a/HOWTO_RELEASE
+++ b/HOWTO_RELEASE
@@ -1,6 +1,6 @@
 How to release
 ~~~~~~~~~~~~~~
-  Date: 2009-07-01
+  Date: 2013-11-16
 
 Versioning Scheme
 -----------------
@@ -9,6 +9,7 @@ Release version is composed by POSTGIS_MAJOR_VERSION, POSTGIS_MINOR_VERSION
 and POSTGIS_MICRO_VERSION components.
 
 By default only [POSTGIS_MICRO_VERSION] increments between releases.
+Starting at PostGIS 2.1 in development  POSTGIS_MICRO_VERSION should have a dev at the end
 
 [POSTGIS_MINOR_VERSION] is incremented (and MICRO set to 0) when minor
 additions have been introduced (one or two functions can be considered
@@ -28,30 +29,34 @@ documentation -- that means having the required software:
   - PostgreSQL 
   - GEOS
   - Proj4
+  - GDAL (for raster)
+  - json-c (for GeoJSON load support)
 * For the docs:
   - xsltproc
   - DocBook XSL scripts
-  - ImageMagick
+  - ImageMagic
+  - DbLatex (for PDF)
 
 Release procedure
 -----------------
 
-1) Re-generate the ChangeLog using svn2cl.
+1) Re-generate the ChangeLog using svn2cl and truncate old legacy junk
 2) Edit NEWS: set release date and check all notable changes have
    been reported (extract from ChangeLog).
 3) Edit README.postgis and set release date and version.
 4) Add release notes in doc/release_notes.xml
 5) Commit all your changes
-  a) make sure to run the extensions/make_unpackaged.sql and copy contents to  
+  a) make sure to run the extensions/make_unpackaged.sql on 
+    about to release version  and copy contents to  
     (TODO: we need to automate this) 
       postgis/sql_bits/postgis--unpackages.sql.in
       postgis_topology/sql_bits/topology_unpackaged.sql.in
       postgis_tiger_geocoder/sql_bits/tiger_geocoder--unpackaged.sql.in
-6) Tag trunk:  
-   svn copy http://svn.osgeo.org/postgis/trunk http://svn.osgeo.org/postgis/tags/x.x.x
+6) Tag branch:  
+   svn copy http://svn.osgeo.org/postgis/branch/x.x http://svn.osgeo.org/postgis/tags/x.x.x
 7) Checkout tag:
    svn checkout http://svn.osgeo.org/postgis/tags/x.x.x
-8) Update Version.config as specified in Versioning Scheme above.
+8) Update Version.config as specified in Versioning Scheme above. See also 17
 9) Update doc/postgis.xml to download.osgeo.org link 
   (note: unreleased are on postgis.net, and released download.osgeo.org )
    Also make sure the correct minimum and lastest geos etc are noted.
@@ -64,7 +69,7 @@ Release procedure
     - pgsql-announce
     - osgeo-discuss
 14) Update web sites
-   - PostGIS News
+    - PostGIS News
     - https://svn.osgeo.org/postgis/web/_content/posts
        a) create a new Post for current year making sure the page name starts with mm-dd
        b) Update links on https://svn.osgeo.org/postgis/web/_content/pages/source.html
@@ -72,22 +77,18 @@ Release procedure
     - PostGIS doc release versioned doc - http://postgis.net/documentation/
      (For building pdf, debbie has tagged jobs 
        -- http://debbie.postgis.net:8080 (log in)
-       (if new branch) Create new job copy last tag e.g. PostGIS_2.0_tagged_docs to PostGIS_2.1_tagged_docs
+       Create new job copy last tag e.g. PostGIS_2.0_tagged_docs to PostGIS_2.1_tagged_docs
        and make appropriate edits and then just run.
-       Or just be lazy and bug Regina Obe to do this.
-    - if creating a new branch
-       edit apache config (currently on debbie) in /etc/apache2/sites-available/postgis.net 
-       and flip the docs alias to new branch docs
+       Or just be lazy and bug Regina Obe do this.
     - Freshmeat
     - Wikipedia
     - Twitter (we all love twitter don't we)
-    - PlanetPostGIS and other planets
-      (this now automatically happens if you do the post
-      since postgis.net blog is carried by PlanetPostGIS, PlanetGeospatial, and PlanetOSGeo
-       hopefully soon PlanetPostgreSQL)
+    - PlanetPostGIS
 15) Update Trac and make old Milestone as completed
 
-16) Push the revision number in trunk forward if necessary
-17) Ensure all the previous released minor versions are listed in extension/upgradeable_versions.mk
+16) Push the revision number forward.  All POSTGIS_MICRO_VERSION that are in branch or trunk should end in
+dev.  So for example if you just release 2.1.1, then the 2.1 branch should have POSTGIS_MICRO_VERSION set to 2dev 
+so that the full version is 2.1.2dev.
+17) Ensure all the previous released minor versions are listed in extension/upgradeable_versions.mk including the one you just released
 
 

diff --git a/extensions/upgradeable_versions.mk b/extensions/upgradeable_versions.mk
index c4d43d991d1d19ec148d451bcb28c304666754e4..d30bba7571e96a5c81880a2dd06f7c87af212018 100644 (file)
--- a/extensions/upgradeable_versions.mk
+++ b/extensions/upgradeable_versions.mk
@@ -3,6 +3,6 @@ UPGRADEABLE_VERSIONS = \
     2.0.1 \
     2.0.2 \
     2.0.3 \
-       2.0.4 \
-    2.1.0beta3 \
-       2.1.0rc1
+    2.0.4 \
+       2.1.0 \
+         2.1.1