#1897 relabel currently mislabeled postgis_upgrade_20_minor.sql to postgis_upgrade_20...

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

diff --git a/extensions/postgis/Makefile.in b/extensions/postgis/Makefile.in
index 05194bac83eca9f001323095f2c692cd7493e431..72dececc4eb3bdfe8cf951affed4718c67c6eea5 100644 (file)
--- a/extensions/postgis/Makefile.in
+++ b/extensions/postgis/Makefile.in
@@ -83,7 +83,7 @@ sql_bits/rtpostgis_upgrade_20_minor.sql: ../../raster/rt_pg/rtpostgis_upgrade_20
 #               $< > $@
 #don't drop casts just yet since we don't have provision to remove from extension yet
 #need to also drop temeporary functions from extenions since it gets auto-added
-sql_bits/postgis_upgrade_minor.sql: ../../postgis/postgis_upgrade_20_minor.sql 
+sql_bits/postgis_upgrade_20_21.sql: ../../postgis/postgis_upgrade_20_21.sql 
                 sed -e 's/BEGIN;//g' -e 's/COMMIT;//g' \
                 -e '/^\(DROP\|CREATE\) \(CAST\).*;/d' \
                 -e '/^\(DROP\|CREATE\) \(CAST\)/,/\;/d' \
@@ -100,7 +100,7 @@ sql_bits/raster_comments.sql: ../../doc/raster_comments.sql
 #postgis_raster_upgrade_minor.sql is the one that contains both postgis AND raster
 #TODO: come up with a better name
 #TODO: what about postgis_drop_after.sql ? where does it fit ??
-sql_bits/postgis_raster_upgrade_minor.sql: ../postgis_extension_helper.sql sql_bits/remove_from_extension.sql.in ../../postgis/postgis_drop_before.sql sql_bits/postgis_upgrade_minor.sql sql_bits/rtpostgis_upgrade_20_minor.sql sql_bits/mark_editable_objects.sql.in ../../doc/raster_comments.sql ../../doc/postgis_comments.sql ../postgis_extension_helper_uninstall.sql
+sql_bits/postgis_raster_upgrade_minor.sql: ../postgis_extension_helper.sql sql_bits/remove_from_extension.sql.in ../../postgis/postgis_drop_before.sql sql_bits/postgis_upgrade_20_21.sql sql_bits/rtpostgis_upgrade_20_minor.sql sql_bits/mark_editable_objects.sql.in ../../doc/raster_comments.sql ../../doc/postgis_comments.sql ../postgis_extension_helper_uninstall.sql
        cat $^ > $@
 
 # sql_bits/rtpostgis--unpackaged.sql:  ../../raster/rt_pg/rtpostgis.sql         

diff --git a/postgis/Makefile.in b/postgis/Makefile.in
index 43554e076e7155b3b8e079ebd892c122073cb7e8..3464d00c694a0a7daffed350edf7116574debe0e 100644 (file)
--- a/postgis/Makefile.in
+++ b/postgis/Makefile.in
@@ -15,7 +15,7 @@ MODULE_big=postgis-@POSTGIS_MAJOR_VERSION@.@POSTGIS_MINOR_VERSION@
 MODULEDIR=contrib/$(MODULE_big)
 
 # Files to be copied to the contrib/ directory
-DATA_built=postgis.sql uninstall_postgis.sql postgis_upgrade_20_minor.sql legacy.sql uninstall_legacy.sql legacy_minimal.sql
+DATA_built=postgis.sql uninstall_postgis.sql postgis_upgrade_20_21.sql legacy.sql uninstall_legacy.sql legacy_minimal.sql
 DATA=../spatial_ref_sys.sql
 
 # SQL preprocessor
@@ -132,9 +132,9 @@ $(PG_OBJS): ../liblwgeom/.libs/liblwgeom.a ../libpgcommon/libpgcommon.a ../postg
 %.sql: %.sql.in
        $(PERL) -lpe "s'MODULE_PATHNAME'\$$libdir/postgis-@POSTGIS_MAJOR_VERSION@.@POSTGIS_MINOR_VERSION@'g" $< > $@
 
-postgis_upgrade_20_minor.sql.in: postgis_drop_before.sql postgis.sql postgis_drop_after.sql
+postgis_upgrade_20_21.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 
+postgis_upgrade_20_21.sql: postgis_upgrade_20_21.sql.in ../utils/postgis_proc_upgrade.pl 
        $(PERL) ../utils/postgis_proc_upgrade.pl $< 2.0 > $@
 
 # Generate any .sql.in files from .sql.in.c files by running them through the SQL pre-processor