[postgis-tickets] [SCM] PostGIS branch stable-3.0 updated. 3.0.7-15-g77d4a70b2

[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, stable-3.0 has been updated
       via  77d4a70b21ea75e65f8352d56ebd588ae57c0533 (commit)
      from  cf39d4745754995212bb0df1cd4d50ea5bf870c5 (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 77d4a70b21ea75e65f8352d56ebd588ae57c0533
Author: Sandro Santilli <strk at kbt.io>
Date:   Sat Oct 29 16:02:23 2022 +0200

    Encode dependency of unpackaged script on install script

diff --git a/extensions/postgis/Makefile.in b/extensions/postgis/Makefile.in
index bf1019d8a..543ac1867 100644
--- a/extensions/postgis/Makefile.in
+++ b/extensions/postgis/Makefile.in
@@ -53,12 +53,6 @@ EXTENSION_UPGRADE_SCRIPTS = \
 	../../doc/postgis_comments.sql \
 	../postgis_extension_helper_uninstall.sql
 
-# Scripts making up the extension upgrade-from-unpackaged file
-# NOTE: order matters
-# TODO: DROPME
-EXTENSION_UNPACKAGED_UPGRADE_SCRIPTS = \
-	sql/postgis.sql
-
 RASTER_DROP_SCRIPTS = \
 	../../raster/rt_pg/rtpostgis_upgrade_cleanup.sql \
 	../../raster/rt_pg/rtpostgis_drop.sql \
@@ -100,10 +94,10 @@ sql/raster_unpackage.sql: $(RASTER_DROP_SCRIPTS) | sql
 sql/$(EXTENSION)--$(EXTVERSION).sql: sql/$(EXTENSION).sql | sql
 	cp $< $@
 
-sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql: sql/$(EXTENSION)--ANY--$(EXTVERSION).sql ../../utils/create_unpackaged.pl Makefile | sql
+sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql: sql/$(EXTENSION)--ANY--$(EXTVERSION).sql sql/$(EXTENSION)--$(EXTVERSION).sql ../../utils/create_unpackaged.pl Makefile | sql
 	cat sql/$(EXTENSION)--$(EXTVERSION).sql | $(PERL) @top_srcdir@/utils/create_unpackaged.pl postgis > $@
 	# Upgrade after packaging
-	cat $< >> $@
+	cat sql/$(EXTENSION)--ANY--$(EXTVERSION).sql  >> $@
 
 sql/$(EXTENSION)--unpackaged.sql: Makefile | sql
 	echo "-- Nothing to do here" > $@

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

Summary of changes:
 extensions/postgis/Makefile.in | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
PostGIS