Rename drop files to be hopefully clearer, add copyright headers

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

diff --git a/postgis/Makefile.in b/postgis/Makefile.in
index bbda6193daeeba36c4dfb7569ce835a59601ae4f..5d47133f2fd268dcbc07047ba27e851cc3f42f90 100644 (file)
--- a/postgis/Makefile.in
+++ b/postgis/Makefile.in
@@ -123,7 +123,7 @@ $(PG_OBJS): ../liblwgeom/.libs/liblwgeom.a ../libpgcommon/libpgcommon.a ../postg
 %.sql: %.sql.in
        sed 's,MODULE_PATHNAME,$$libdir/postgis-@POSTGIS_MAJOR_VERSION@.@POSTGIS_MINOR_VERSION@,g' $< >$@
 
-postgis_upgrade_20_minor.sql.in: postgis_drop_before.sql.in.c postgis.sql postgis_drop.sql.in.c
+postgis_upgrade_20_minor.sql.in: postgis_drop_before.sql postgis.sql postgis_drop_after.sql
        cat $^ > $@
 postgis_upgrade_20_minor.sql: postgis_upgrade_20_minor.sql.in ../utils/postgis_proc_upgrade.pl 
        $(PERL) ../utils/postgis_proc_upgrade.pl $< 2.0 > $@
@@ -135,7 +135,7 @@ $(SQL_OBJS): %.in: %.in.c
 # SQL objects are also dependent on postgis_config.h for PostgreSQL version
 $(SQL_OBJS): ../postgis_config.h ../postgis_svn_revision.h
 
-postgis.sql.in: sqldefines.h long_xact.sql.in.c geography.sql.in.c postgis_drop.sql.in.c
+postgis.sql.in: sqldefines.h long_xact.sql.in.c geography.sql.in.c 
 
 #uninstall_postgis.sql.in: sqldefines.h uninstall_sqlmm.sql.in.c uninstall_long_xact.sql.in.c uninstall_geography.sql.in.c
 uninstall_postgis.sql: postgis.sql ../utils/create_undef.pl 

diff --git a/postgis/postgis_drop.sql.in.c b/postgis/postgis_drop_after.sql
similarity index 89%
rename from postgis/postgis_drop.sql.in.c
rename to postgis/postgis_drop_after.sql
index a720d34b882876e7817ce7e78c6eaadcb704a154..025bf6a2df6c30849f604019e45801c6ad9adc49 100644 (file)
--- a/postgis/postgis_drop.sql.in.c
+++ b/postgis/postgis_drop_after.sql
@@ -1,4 +1,25 @@
+-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+--
 -- $Id$
+--
+-- PostGIS - Spatial Types for PostgreSQL
+-- http://postgis.refractions.net
+--
+-- Copyright (C) 2011-2012 Sandro Santilli <strk@keybit.net>
+-- Copyright (C) 2010-2012 Regina Obe <lr@pcorp.us>
+-- Copyright (C) 2009      Paul Ramsey <pramsey@cleverelephant.ca>
+--
+-- This is free software; you can redistribute and/or modify it under
+-- the terms of the GNU General Public Licence. See the COPYING file.
+--
+-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+--
+-- This file contains drop commands for obsoleted items that need
+-- to be dropped _after_ upgrade of old functions.
+-- Changes to this file affect postgis_upgrade*.sql script.
+--
+-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
 -- First drop old aggregates
 DROP AGGREGATE IF EXISTS memgeomunion(geometry);
 DROP AGGREGATE IF EXISTS geomunion(geometry);

diff --git a/postgis/postgis_drop_before.sql b/postgis/postgis_drop_before.sql
new file mode 100644 (file)
index 0000000..8877355
--- /dev/null
+++ b/postgis/postgis_drop_before.sql
@@ -0,0 +1,28 @@
+-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+--
+-- $Id$
+--
+-- PostGIS - Spatial Types for PostgreSQL
+-- http://postgis.refractions.net
+--
+-- Copyright (C) 2011-2012 Sandro Santilli <strk@keybit.net>
+-- Copyright (C) 2010-2012 Regina Obe <lr@pcorp.us>
+-- Copyright (C) 2009      Paul Ramsey <pramsey@cleverelephant.ca>
+--
+-- This is free software; you can redistribute and/or modify it under
+-- the terms of the GNU General Public Licence. See the COPYING file.
+--
+-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+--
+-- This file contains drop commands for obsoleted items that need
+-- to be dropped _before_ upgrade of old functions.
+-- Changes to this file affect postgis_upgrade*.sql script.
+--
+-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+DROP FUNCTION IF EXISTS AddGeometryColumn(varchar,varchar,varchar,varchar,integer,varchar,integer,boolean);
+DROP FUNCTION IF EXISTS ST_MakeEnvelope(float8, float8, float8, float8);
+--changed name of prec arg to be consistent with ST_AsGML/KML
+DROP FUNCTION IF EXISTS ST_AsX3D(geometry, integer, integer); 
+--changed name of arg: http://trac.osgeo.org/postgis/ticket/1606
+DROP FUNCTION IF EXISTS UpdateGeometrySRID(varchar,varchar,varchar,varchar,integer);

diff --git a/postgis/postgis_drop_before.sql.in.c b/postgis/postgis_drop_before.sql.in.c
deleted file mode 100644 (file)
index 2f4c071..0000000
--- a/postgis/postgis_drop_before.sql.in.c
+++ /dev/null
@@ -1,9 +0,0 @@
--- $Id$
--- These are functions where the argument names may have changed  --
--- so have to be dropped before upgrade can happen --
-DROP FUNCTION IF EXISTS AddGeometryColumn(varchar,varchar,varchar,varchar,integer,varchar,integer,boolean);
-DROP FUNCTION IF EXISTS ST_MakeEnvelope(float8, float8, float8, float8);
---changed name of prec arg to be consistent with ST_AsGML/KML
-DROP FUNCTION IF EXISTS ST_AsX3D(geometry, integer, integer); 
---changed name of arg: http://trac.osgeo.org/postgis/ticket/1606
-DROP FUNCTION IF EXISTS UpdateGeometrySRID(varchar,varchar,varchar,varchar,integer);