allow upgrade from 2.1.2dev, fix copyright notices (e.g. point to postgis.net)

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

diff --git a/extensions/postgis/sql_bits/remove_from_extension.sql.in b/extensions/postgis/sql_bits/remove_from_extension.sql.in
index 53c0d6217f7ad190fb53abedb216f9a2140859e5..3d01a5f449210c8887c9996220ea41070845708f 100644 (file)
--- a/extensions/postgis/sql_bits/remove_from_extension.sql.in
+++ b/extensions/postgis/sql_bits/remove_from_extension.sql.in
@@ -3,7 +3,7 @@
 -- $Id$
 ----
 -- PostGIS - Spatial Types for PostgreSQL
--- http://www.postgis.org
+-- http://postgis.net
 --
 -- Copyright (C) 2011 Regina Obe <lr@pcorp.us>
 --

diff --git a/extensions/postgis_extension_helper.sql b/extensions/postgis_extension_helper.sql
index 4f24a854e9fbdddf275262d908e2167aca578822..8b13b97a997186c82d5def913d90a0b8b8ce7a64 100644 (file)
--- a/extensions/postgis_extension_helper.sql
+++ b/extensions/postgis_extension_helper.sql
@@ -3,10 +3,9 @@
 -- $Id$
 ----
 -- PostGIS - Spatial Types for PostgreSQL
--- http://www.postgis.org
+-- http://postgis.net
 --
 -- Copyright (C) 2011 Regina Obe <lr@pcorp.us>
--- Copyright (C) 2005 Refractions Research Inc.
 --
 -- This is free software; you can redistribute and/or modify it under
 -- the terms of the GNU General Public Licence. See the COPYING file.

diff --git a/extensions/postgis_extension_helper_uninstall.sql b/extensions/postgis_extension_helper_uninstall.sql
index a2a5faecd1357b6ff0c604358987e08c0f70bccd..01ed97dabf79b029297fed838803b3fe787d7678 100644 (file)
--- a/extensions/postgis_extension_helper_uninstall.sql
+++ b/extensions/postgis_extension_helper_uninstall.sql
@@ -3,7 +3,7 @@
 -- $Id$
 ----
 -- PostGIS - Spatial Types for PostgreSQL
--- http://www.postgis.org
+-- http://postgis.net
 --
 -- Copyright (C) 2011 Regina Obe <lr@pcorp.us>
 --

diff --git a/extensions/upgradeable_versions.mk b/extensions/upgradeable_versions.mk
index d30bba7571e96a5c81880a2dd06f7c87af212018..ce5fc9b45e513c021e357cdaeb05928364de622b 100644 (file)
--- a/extensions/upgradeable_versions.mk
+++ b/extensions/upgradeable_versions.mk
@@ -5,4 +5,5 @@ UPGRADEABLE_VERSIONS = \
     2.0.3 \
     2.0.4 \
        2.1.0 \
-         2.1.1
+         2.1.1 \
+         2.1.2dev