[postgis-tickets] [SCM] PostGIS branch stable-2.5 updated. 2.5.7-15-g316794da4

[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-2.5 has been updated
       via  316794da4b8e2e07369685f1903c12d4fdb88877 (commit)
       via  bf768e46ee9c022a10a29a4ede6084407bff2e3e (commit)
      from  6a98366c0904e6ae271d3a8b8f3ed64a32bde6c4 (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 316794da4b8e2e07369685f1903c12d4fdb88877
Author: Sandro Santilli <strk at kbt.io>
Date:   Fri Aug 12 16:29:52 2022 +0200

    Simplify creation of output directories

diff --git a/extensions/postgis/Makefile.in b/extensions/postgis/Makefile.in
index bbceea145..1b1788010 100644
--- a/extensions/postgis/Makefile.in
+++ b/extensions/postgis/Makefile.in
@@ -113,7 +113,6 @@ sql_bits/postgis_comments.sql: ../../doc/postgis_comments.sql | sql_bits
 
 #strip BEGIN/COMMIT since these are not allowed in extensions
 sql_bits/rtpostgis.sql: ../../raster/rt_pg/rtpostgis_for_extension.sql | sql_bits
-	mkdir -p sql
 	$(PERL) -pe 's/BEGIN\;//g ; s/COMMIT\;//g' $< > $@
 
 sql_bits/spatial_ref_sys_config_dump.sql: ../../spatial_ref_sys.sql ../../utils/create_spatial_ref_sys_config_dump.pl | sql_bits
diff --git a/extensions/postgis_topology/Makefile.in b/extensions/postgis_topology/Makefile.in
index 6b8161f9a..9ea82a315 100644
--- a/extensions/postgis_topology/Makefile.in
+++ b/extensions/postgis_topology/Makefile.in
@@ -49,12 +49,13 @@ $(EXTENSION).control: $(EXTENSION).control.in Makefile
 		| sed -e 's|@EXTVERSION@|$(EXTVERSION)|g' \
 		> $@
 
-sql/$(EXTENSION)--$(EXTVERSION).sql: sql/$(EXTENSION).sql
-	mkdir -p sql
+sql:
+	mkdir -p $@
+
+sql/$(EXTENSION)--$(EXTVERSION).sql: sql/$(EXTENSION).sql | sql
 	cp $< $@
 
-sql/$(EXTENSION).sql: extlock.sql sql_bits/topology.sql  sql_bits/mark_editable_objects.sql.in sql_bits/topology_comments.sql
-	mkdir -p sql
+sql/$(EXTENSION).sql: extlock.sql sql_bits/topology.sql sql_bits/mark_editable_objects.sql.in sql_bits/topology_comments.sql | sql
 	cat $^ > $@
 
 #strip BEGIN/COMMIT since these are not allowed in extensions
@@ -69,8 +70,7 @@ sql_bits/topology.sql: ../../topology/topology.sql
 sql_bits/topology_comments.sql: ../../doc/topology_comments.sql
 	cp $< $@
 
-sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql: ../../topology/topology.sql ../../utils/create_unpackaged.pl sql/$(EXTENSION)--ANY--$(EXTVERSION).sql Makefile
-	mkdir -p sql
+sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql: ../../topology/topology.sql ../../utils/create_unpackaged.pl sql/$(EXTENSION)--ANY--$(EXTVERSION).sql Makefile | sql
 	# Ugprade before packaging
 	cat sql/$(EXTENSION)--ANY--$(EXTVERSION).sql > $@
 	cat $< | $(PERL) ../../utils/create_unpackaged.pl postgis_topology >> $@
@@ -83,8 +83,7 @@ sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql: ../../topology/topology.sql ../
 #aggregates are special
 #they can be dropped but we need to remove
 #them from the extension first
-sql/topology_upgrade.sql:  ../../topology/topology_upgrade.sql
-	mkdir -p sql
+sql/topology_upgrade.sql:  ../../topology/topology_upgrade.sql | sql
 	sed -e 's/BEGIN;//g' -e 's/COMMIT;//g' -e '/^CREATE SCHEMA/d;'  $< > $@
 
 sql/$(EXTENSION)--ANY--$(EXTVERSION).sql: $(EXTENSION_UPGRADE_SCRIPTS)

commit bf768e46ee9c022a10a29a4ede6084407bff2e3e
Author: Sandro Santilli <strk at kbt.io>
Date:   Fri Aug 12 16:43:05 2022 +0200

    Fix cleanup of custom SRID in test

diff --git a/regress/regress_proj.sql b/regress/regress_proj.sql
index fb125350f..928834bcc 100644
--- a/regress/regress_proj.sql
+++ b/regress/regress_proj.sql
@@ -56,5 +56,5 @@ SELECT 12, ST_AsEWKT(ST_Transform(
            ST_GeomFromEWKT('SRID=100002;POINT(16 48)'),
            'invalid projection'));
 
-DELETE FROM spatial_ref_sys WHERE srid >= 100000;
+DELETE FROM spatial_ref_sys WHERE srid in (100001, 100002);
 

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

Summary of changes:
 extensions/postgis/Makefile.in          |  1 -
 extensions/postgis_topology/Makefile.in | 15 +++++++--------
 regress/regress_proj.sql                |  2 +-
 3 files changed, 8 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
PostGIS