From 82f97f55c96d76ddd15342868d59a87941e8eafd Mon Sep 17 00:00:00 2001
From: Regina Obe <lr@pcorp.us>
Date: Fri, 25 Nov 2011 11:54:34 +0000
Subject: [PATCH] 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
---
 doc/reference_raster.xml                             | 8 +-------
 extensions/postgis/Makefile                          | 8 ++++----
 extensions/postgis/postgis.control                   | 2 +-
 extensions/postgis_topology/Makefile                 | 7 ++-----
 extensions/postgis_topology/postgis_topology.control | 2 +-
 5 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/doc/reference_raster.xml b/doc/reference_raster.xml
index 374cb439e..576043daf 100644
--- 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 0f50d1e1f..3ee7f5578 100644
--- 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 e2f713a90..154c6beb1 100644
--- 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 69b3fe7c7..e85542a39 100644
--- 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 ff993d96f..6d70e0bc8 100644
--- 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
-- 
2.40.0