remove more obsolete protos in docs and up extension alpha version numbers

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

diff --git a/doc/reference_raster.xml b/doc/reference_raster.xml
index 374cb439e91eaf6f6c3108407b47daae0d43e302..576043dafdcde4a8c2998b64e67c8702a69c64e7 100644 (file)
--- a/doc/reference_raster.xml
+++ b/doc/reference_raster.xml
@@ -2895,13 +2895,7 @@ WHERE rid=2;
                                        <paramdef><type>raster </type> <parameter>rast</parameter></paramdef>
                                        <paramdef><type>integer </type> <parameter>columnx</parameter></paramdef>
                                        <paramdef><type>integer </type> <parameter>rowy</parameter></paramdef>
-                                 </funcprototype>
-                                 <funcprototype>
-                                       <funcdef>double precision <function>ST_Value</function></funcdef>
-                                       <paramdef><type>raster </type> <parameter>rast</parameter></paramdef>
-                                       <paramdef><type>integer </type> <parameter>columnx</parameter></paramdef>
-                                       <paramdef><type>integer </type> <parameter>rowy</parameter></paramdef>
-                                       <paramdef><type>boolean </type> <parameter>exclude_nodata_value</parameter></paramdef>
+                                       <paramdef choice='opt'><type>boolean </type> <parameter>exclude_nodata_value=true</parameter></paramdef>
                                  </funcprototype>
                                  <funcprototype>
                                        <funcdef>double precision <function>ST_Value</function></funcdef>

diff --git a/extensions/postgis/Makefile b/extensions/postgis/Makefile
index 0f50d1e1f64993f95ef9ee8ec29abeaeebb4a42a..3ee7f55783fe48d512fb0f119071df3b6214dc3e 100644 (file)
--- a/extensions/postgis/Makefile
+++ b/extensions/postgis/Makefile
@@ -15,7 +15,7 @@ EXTRA_CLEAN += sql/$(EXTENSION).sql ${SQL_BITS}
 ifeq ($(PG91),yes)
 sql/$(EXTENSION).sql: sql_bits/postgis.sql sql_bits/postgis_comments.sql sql_bits/rtpostgis.sql sql_bits/raster_comments.sql sql_bits/spatial_ref_sys.sql
        cat $^ > $@
-all: sql/$(EXTENSION)--$(EXTVERSION).sql sql/$(EXTENSION)--2.0.0a3--$(EXTVERSION).sql sql/$(EXTENSION)--2.0.0a4--$(EXTVERSION).sql sql/$(EXTENSION)--2.0.0a6--$(EXTVERSION).sql sql/$(EXTENSION)--2.0.0a7--$(EXTVERSION).sql
+all: sql/$(EXTENSION)--$(EXTVERSION).sql sql/$(EXTENSION)--2.0.0a3--$(EXTVERSION).sql sql/$(EXTENSION)--2.0.0a6--$(EXTVERSION).sql sql/$(EXTENSION)--2.0.0a7--$(EXTVERSION).sql sql/$(EXTENSION)--2.0.0a8--$(EXTVERSION).sql
 
 sql/$(EXTENSION)--$(EXTVERSION).sql: sql/$(EXTENSION).sql
        cp $< $@
@@ -55,15 +55,15 @@ sql_bits/postgis_raster_upgrade_minor.sql: ../postgis_extension_helper.sql sql_b
 sql/$(EXTENSION)--2.0.0a3--$(EXTVERSION).sql: sql_bits/postgis_raster_upgrade_minor.sql
        cp $< $@
        
-sql/$(EXTENSION)--2.0.0a4--$(EXTVERSION).sql: sql_bits/postgis_raster_upgrade_minor.sql
-       cp $< $@
-       
 sql/$(EXTENSION)--2.0.0a6--$(EXTVERSION).sql: sql_bits/postgis_raster_upgrade_minor.sql
        cp $< $@
        
 sql/$(EXTENSION)--2.0.0a7--$(EXTVERSION).sql: sql_bits/postgis_raster_upgrade_minor.sql
        cp $< $@
        
+sql/$(EXTENSION)--2.0.0a8--$(EXTVERSION).sql: sql_bits/postgis_raster_upgrade_minor.sql
+       cp $< $@
+       
 # sql_bits/rtpostgis--unpackaged.sql:  ../../raster/rt_pg/rtpostgis.sql         
 #      sed -e 's/^[\t]*//' \
 #              -e :a -e '$!N; s/,\n/,/; ta' \

diff --git a/extensions/postgis/postgis.control b/extensions/postgis/postgis.control
index e2f713a90f69877c69bf2265389542c78d0b725a..154c6beb1d26f4a62407d89e2123be517e325027 100644 (file)
--- a/extensions/postgis/postgis.control
+++ b/extensions/postgis/postgis.control
@@ -1,5 +1,5 @@
 # postgis extension
 comment = 'postgis geometry,geography, and raster spatial types and functions'
-default_version = '2.0.0a8'
+default_version = '2.0.0a9'
 module_pathname = '$libdir/postgis-2.0'
 relocatable = true

diff --git a/extensions/postgis_topology/Makefile b/extensions/postgis_topology/Makefile
index 69b3fe7c7c22adab34b68f8ef5b2ef29030acdd9..e85542a390eb6b456a2e9c14b92a025990067cc1 100644 (file)
--- a/extensions/postgis_topology/Makefile
+++ b/extensions/postgis_topology/Makefile
@@ -11,7 +11,7 @@ EXTRA_CLEAN += sql/*.sql ${SQL_BITS}
 
 
 ifeq ($(PG91),yes)
-all: sql/$(EXTENSION)--$(EXTVERSION).sql sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql sql/$(EXTENSION)--2.0.0a1--$(EXTVERSION).sql sql/$(EXTENSION)--2.0.0a6--$(EXTVERSION).sql
+all: sql/$(EXTENSION)--$(EXTVERSION).sql sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql sql/$(EXTENSION)--2.0.0a1--$(EXTVERSION).sql sql/$(EXTENSION)--2.0.0a7--$(EXTVERSION).sql
 
 sql/$(EXTENSION)--$(EXTVERSION).sql: sql/$(EXTENSION).sql
        cp $< $@
@@ -61,10 +61,7 @@ sql/$(EXTENSION)--2.0.0a1--$(EXTVERSION).sql: ../postgis_extension_helper.sql sq
 sql/$(EXTENSION)--2.0.0a2--$(EXTVERSION).sql: sql/$(EXTENSION)--2.0.0a1--$(EXTVERSION).sql
        cp $< $@
        
-sql/$(EXTENSION)--2.0.0a3--$(EXTVERSION).sql: sql/$(EXTENSION)--2.0.0a1--$(EXTVERSION).sql
-       cp $< $@
-       
-sql/$(EXTENSION)--2.0.0a6--$(EXTVERSION).sql: sql/$(EXTENSION)--2.0.0a1--$(EXTVERSION).sql
+sql/$(EXTENSION)--2.0.0a7--$(EXTVERSION).sql: sql/$(EXTENSION)--2.0.0a1--$(EXTVERSION).sql
        cp $< $@
        
 DATA = $(wildcard sql/*--*.sql) sql/$(EXTENSION)--$(EXTVERSION).sql

diff --git a/extensions/postgis_topology/postgis_topology.control b/extensions/postgis_topology/postgis_topology.control
index ff993d96f2fffaee0cfed42bd0e8283c98858d9d..6d70e0bc877f7823337f40c39ebfe78e518d6e45 100644 (file)
--- a/extensions/postgis_topology/postgis_topology.control
+++ b/extensions/postgis_topology/postgis_topology.control
@@ -1,6 +1,6 @@
 # postgis topology extension
 comment = 'postgis topology spatial types and functions'
-default_version = '2.0.0a7'
+default_version = '2.0.0a8'
 relocatable = false
 schema = topology
 requires = postgis