Merge pull request #943 from pgRouting/release/2.5

Release 2.5.0
pgRouting · Sep 13, 2017 · 46a81a9 · 46a81a9
2 parents 672bc67 + f3ac774
commit 46a81a9
Show file tree

Hide file tree

Showing 18 changed files with 20 additions and 20 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -183,7 +183,7 @@ endif()
 set(PGROUTING_VERSION_MAJOR "2")
 set(PGROUTING_VERSION_MINOR "5")
 set(PGROUTING_VERSION_PATCH "0")
-set(PGROUTING_VERSION_DEV "-rc")
+set(PGROUTING_VERSION_DEV "")
 
 set(PGROUTING_SHORT_VERSION "${PGROUTING_VERSION_MAJOR}.${PGROUTING_VERSION_MINOR}")
 set(PGROUTING_VERSION "${PGROUTING_VERSION_MAJOR}.${PGROUTING_VERSION_MINOR}.${PGROUTING_VERSION_PATCH}")

diff --git a/README.md b/README.md
@@ -6,9 +6,9 @@
 
 ### Branches
 
-* The *master* branch has the pre-release  2.5.0-rc
-* The *release/2.5* branch has the next release 2.5.0 (Date of release Sept-13-2017)
-* The *develop* branch has the development of the next minor-release. 2.6.0-dev
+* The *master* branch has the release  2.5.0
+* The *release/2.5* branch has the next micro-release 2.5.1 (if needed)
+* The *develop* branch has the development of the next minor-release 2.6.0-dev
 
 For the complete list of releases go to:
 https://github.com/pgRouting/pgrouting/releases

diff --git a/doc/src/pgRouting-introduction.rst b/doc/src/pgRouting-introduction.rst
@@ -14,7 +14,7 @@ Introduction
 
 pgRouting is an extension of `PostGIS <http://postgis.net>`_ and `PostgreSQL <http://postgresql.org>`_ geospatial database and adds routing and other network analysis functionality. A predecessor of pgRouting – pgDijkstra, written by Sylvain Pasche from `Camptocamp <http://camptocamp.com>`_, was later extended by `Orkney <http://www.orkney.co.jp>`_ and renamed to pgRouting. The project is now supported and maintained by `Georepublic <http://georepublic.info>`_, `iMaptools <http://imaptools.com/>`__ and a broad user community.
 
-pgRouting is an `OSGeo Labs <http://wiki.osgeo.org/wiki/OSGeo_Labs>`_ project of the `OSGeo Foundation <http://osgeo.org>`_ and included on `OSGeo Live <http://live.osgeo.org/>`_.
+pgRouting is part of `OSGeo Community Projects <http://wiki.osgeo.org/wiki/OSGeo_Community_Projects>`_ from the `OSGeo Foundation <http://osgeo.org>`_ and included on `OSGeo Live <http://live.osgeo.org/>`_.
 
 
 .. _license:

diff --git a/tools/sql-update-scripts/pgrouting--2.0.0--2.5.0.sql b/tools/sql-update-scripts/pgrouting--2.0.0--2.5.0.sql
@@ -228,7 +228,7 @@ RETURNS TABLE(
     ) AS
 $BODY$
     SELECT '2.5.0'::varchar AS version,
-        'v2.5.0-rc'::varchar AS tag,
+        'v2.5.0'::varchar AS tag,
         ''::varchar AS hash,
         ''::varchar AS branch,
         '1.54.0'::varchar AS boost;

diff --git a/tools/sql-update-scripts/pgrouting--2.0.1--2.5.0.sql b/tools/sql-update-scripts/pgrouting--2.0.1--2.5.0.sql
@@ -228,7 +228,7 @@ RETURNS TABLE(
     ) AS
 $BODY$
     SELECT '2.5.0'::varchar AS version,
-        'v2.5.0-rc'::varchar AS tag,
+        'v2.5.0'::varchar AS tag,
         ''::varchar AS hash,
         ''::varchar AS branch,
         '1.54.0'::varchar AS boost;

diff --git a/tools/sql-update-scripts/pgrouting--2.1.0--2.5.0.sql b/tools/sql-update-scripts/pgrouting--2.1.0--2.5.0.sql
@@ -326,7 +326,7 @@ RETURNS TABLE(
     ) AS
 $BODY$
     SELECT '2.5.0'::varchar AS version,
-        'v2.5.0-rc'::varchar AS tag,
+        'v2.5.0'::varchar AS tag,
         ''::varchar AS hash,
         ''::varchar AS branch,
         '1.54.0'::varchar AS boost;

diff --git a/tools/sql-update-scripts/pgrouting--2.2.0--2.5.0.sql b/tools/sql-update-scripts/pgrouting--2.2.0--2.5.0.sql
@@ -180,7 +180,7 @@ RETURNS TABLE(
     ) AS
 $BODY$
     SELECT '2.5.0'::varchar AS version,
-        'v2.5.0-rc'::varchar AS tag,
+        'v2.5.0'::varchar AS tag,
         ''::varchar AS hash,
         ''::varchar AS branch,
         '1.54.0'::varchar AS boost;

diff --git a/tools/sql-update-scripts/pgrouting--2.2.1--2.5.0.sql b/tools/sql-update-scripts/pgrouting--2.2.1--2.5.0.sql
@@ -180,7 +180,7 @@ RETURNS TABLE(
     ) AS
 $BODY$
     SELECT '2.5.0'::varchar AS version,
-        'v2.5.0-rc'::varchar AS tag,
+        'v2.5.0'::varchar AS tag,
         ''::varchar AS hash,
         ''::varchar AS branch,
         '1.54.0'::varchar AS boost;

diff --git a/tools/sql-update-scripts/pgrouting--2.2.2--2.5.0.sql b/tools/sql-update-scripts/pgrouting--2.2.2--2.5.0.sql
@@ -180,7 +180,7 @@ RETURNS TABLE(
     ) AS
 $BODY$
     SELECT '2.5.0'::varchar AS version,
-        'v2.5.0-rc'::varchar AS tag,
+        'v2.5.0'::varchar AS tag,
         ''::varchar AS hash,
         ''::varchar AS branch,
         '1.54.0'::varchar AS boost;

diff --git a/tools/sql-update-scripts/pgrouting--2.2.3--2.5.0.sql b/tools/sql-update-scripts/pgrouting--2.2.3--2.5.0.sql
@@ -180,7 +180,7 @@ RETURNS TABLE(
     ) AS
 $BODY$
     SELECT '2.5.0'::varchar AS version,
-        'v2.5.0-rc'::varchar AS tag,
+        'v2.5.0'::varchar AS tag,
         ''::varchar AS hash,
         ''::varchar AS branch,
         '1.54.0'::varchar AS boost;

diff --git a/tools/sql-update-scripts/pgrouting--2.2.4--2.5.0.sql b/tools/sql-update-scripts/pgrouting--2.2.4--2.5.0.sql
@@ -180,7 +180,7 @@ RETURNS TABLE(
     ) AS
 $BODY$
     SELECT '2.5.0'::varchar AS version,
-        'v2.5.0-rc'::varchar AS tag,
+        'v2.5.0'::varchar AS tag,
         ''::varchar AS hash,
         ''::varchar AS branch,
         '1.54.0'::varchar AS boost;

diff --git a/tools/sql-update-scripts/pgrouting--2.3.0--2.5.0.sql b/tools/sql-update-scripts/pgrouting--2.3.0--2.5.0.sql
@@ -214,7 +214,7 @@ RETURNS TABLE(
     ) AS
 $BODY$
     SELECT '2.5.0'::varchar AS version,
-        'v2.5.0-rc'::varchar AS tag,
+        'v2.5.0'::varchar AS tag,
         ''::varchar AS hash,
         ''::varchar AS branch,
         '1.54.0'::varchar AS boost;

diff --git a/tools/sql-update-scripts/pgrouting--2.3.1--2.5.0.sql b/tools/sql-update-scripts/pgrouting--2.3.1--2.5.0.sql
@@ -214,7 +214,7 @@ RETURNS TABLE(
     ) AS
 $BODY$
     SELECT '2.5.0'::varchar AS version,
-        'v2.5.0-rc'::varchar AS tag,
+        'v2.5.0'::varchar AS tag,
         ''::varchar AS hash,
         ''::varchar AS branch,
         '1.54.0'::varchar AS boost;

diff --git a/tools/sql-update-scripts/pgrouting--2.3.2--2.5.0.sql b/tools/sql-update-scripts/pgrouting--2.3.2--2.5.0.sql
@@ -214,7 +214,7 @@ RETURNS TABLE(
     ) AS
 $BODY$
     SELECT '2.5.0'::varchar AS version,
-        'v2.5.0-rc'::varchar AS tag,
+        'v2.5.0'::varchar AS tag,
         ''::varchar AS hash,
         ''::varchar AS branch,
         '1.54.0'::varchar AS boost;

diff --git a/tools/sql-update-scripts/pgrouting--2.4.0--2.5.0.sql b/tools/sql-update-scripts/pgrouting--2.4.0--2.5.0.sql
@@ -175,7 +175,7 @@ RETURNS TABLE(
     ) AS
 $BODY$
     SELECT '2.5.0'::varchar AS version,
-        'v2.5.0-rc'::varchar AS tag,
+        'v2.5.0'::varchar AS tag,
         ''::varchar AS hash,
         ''::varchar AS branch,
         '1.54.0'::varchar AS boost;

diff --git a/tools/sql-update-scripts/pgrouting--2.4.1--2.5.0.sql b/tools/sql-update-scripts/pgrouting--2.4.1--2.5.0.sql
@@ -175,7 +175,7 @@ RETURNS TABLE(
     ) AS
 $BODY$
     SELECT '2.5.0'::varchar AS version,
-        'v2.5.0-rc'::varchar AS tag,
+        'v2.5.0'::varchar AS tag,
         ''::varchar AS hash,
         ''::varchar AS branch,
         '1.54.0'::varchar AS boost;

diff --git a/tools/sql-update-scripts/pgrouting--2.4.2--2.5.0.sql b/tools/sql-update-scripts/pgrouting--2.4.2--2.5.0.sql
@@ -175,7 +175,7 @@ RETURNS TABLE(
     ) AS
 $BODY$
     SELECT '2.5.0'::varchar AS version,
-        'v2.5.0-rc'::varchar AS tag,
+        'v2.5.0'::varchar AS tag,
         ''::varchar AS hash,
         ''::varchar AS branch,
         '1.54.0'::varchar AS boost;

diff --git a/tools/sql-update-scripts/pgrouting--2.5.0.sql b/tools/sql-update-scripts/pgrouting--2.5.0.sql
@@ -78,7 +78,7 @@ RETURNS TABLE(
     ) AS
 $BODY$
     SELECT '2.5.0'::varchar AS version,
-        'v2.5.0-rc'::varchar AS tag,
+        'v2.5.0'::varchar AS tag,
         ''::varchar AS hash,
         ''::varchar AS branch,
         '1.54.0'::varchar AS boost;