[postgis-tickets] [SCM] PostGIS branch master updated. 3.3.0rc2-299-g20d228931

[git at osgeo.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "PostGIS".

The branch, master has been updated
       via  20d228931b9b4a0a594669df27bdc25dbc30a146 (commit)
      from  6021ef4dfc496612cd0b9678cedcd8fc206c1f0b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 20d228931b9b4a0a594669df27bdc25dbc30a146
Author: Sandro Santilli <strk at kbt.io>
Date:   Sat Oct 29 16:21:46 2022 +0200

    Encode dependency of unpackaged script on install script

diff --git a/extensions/postgis/Makefile.in b/extensions/postgis/Makefile.in
index 7b425b060..1d5619bc4 100644
--- a/extensions/postgis/Makefile.in
+++ b/extensions/postgis/Makefile.in
@@ -56,16 +56,6 @@ EXTENSION_UPGRADE_SCRIPTS = \
 	sql/spatial_ref_sys_config_dump.sql \
 	../postgis_extension_helper_uninstall.sql
 
-# Scripts making up the extension upgrade-from-unpackaged file
-# NOTE: order matters
-# TODO: DROPME
-EXTENSION_UNPACKAGED_UPGRADE_SCRIPTS = \
-	../postgis_extension_helper.sql \
-	sql/raster_unpackage.sql \
-	sql/postgis_upgrade.sql \
-	../../doc/postgis_comments.sql \
-	../postgis_extension_helper_uninstall.sql
-
 RASTER_DROP_SCRIPTS = \
 	../../raster/rt_pg/rtpostgis_upgrade_cleanup.sql \
 	../../raster/rt_pg/rtpostgis_drop.sql \
@@ -104,10 +94,10 @@ sql/$(EXTENSION)--$(EXTVERSION).sql: $(EXTENSION_SCRIPTS) | sql
 	printf '\\echo Use "CREATE EXTENSION $(EXTENSION)" to load this file. \\quit\n' > $@
 	cat $^ >> $@
 
-sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql: sql/$(EXTENSION)--ANY--$(EXTVERSION).sql ../../utils/create_unpackaged.pl Makefile | sql
-	cat sql/$(EXTENSION)--$(EXTVERSION).sql | $(PERL) @top_srcdir@/utils/create_unpackaged.pl postgis > $@
+sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql: sql/$(EXTENSION)--$(EXTVERSION).sql sql/$(EXTENSION)--ANY--$(EXTVERSION).sql ../../utils/create_unpackaged.pl Makefile | sql
+	$(PERL) @top_srcdir@/utils/create_unpackaged.pl postgis < sql/$(EXTENSION)--$(EXTVERSION).sql > $@
 	# Upgrade after packaging
-	cat $< >> $@
+	cat sql/$(EXTENSION)--ANY--$(EXTVERSION).sql >> $@
 
 
 sql/$(EXTENSION)--unpackaged.sql: Makefile | sql

-----------------------------------------------------------------------

Summary of changes:
 extensions/postgis/Makefile.in | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
PostGIS