[postgis-tickets] [SCM] PostGIS branch master updated. 3.4.0rc1-596-g17a2f0cb5

[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  17a2f0cb5d21819a3950073917dc29eca0fc0d5f (commit)
       via  fb537b4455d9a588ed067879b006e4d785fb8cb0 (commit)
      from  6cda85465cd1c87907666435f228cc55c31c39b2 (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 17a2f0cb5d21819a3950073917dc29eca0fc0d5f
Author: Sandro Santilli <strk at kbt.io>
Date:   Tue Sep 19 18:06:43 2023 +0200

    Fix first of postgis-manual.pot

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 64c5a3441..fbce30ef0 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -328,16 +328,15 @@ $(XML_UNIFIED_POT): $(XML_SOURCE_POTS)
 	@$(MSGCAT) --use-first --no-location -o $@.tmp $(XML_SOURCE_POTS)
 	@if test -f $@; then \
     if test -n "$$($(MSGCOMM) --unique $@.tmp $@ | tail -1)"; then \
+      $(MSGMERGE) -U $@.tmp $@ || exit 1; \
       echo "$@ updated"; \
     else \
       echo "$@ unchanged"; \
-      rm -f $@.tmp; \
     fi; \
+    rm -f $@.tmp; \
+  else \
+		mv $@.tmp $@; \
   fi;
-	@if test -e $@.tmp; then \
-		$(MSGMERGE) -U $@.tmp $@ || exit 1; \
-		rm $@.tmp; \
-	fi
 
 # Creates or updates translation files
 update-po: $(PO_FILES)

commit fb537b4455d9a588ed067879b006e4d785fb8cb0
Author: Sandro Santilli <strk at kbt.io>
Date:   Tue Sep 19 17:55:00 2023 +0200

    Encode dependency of .pot updated to msgmerge

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 93acd59cf..64c5a3441 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -286,6 +286,7 @@ endif
 
 ifeq ($(MSGMERGE),)
 $(PO_FILES): requirements_not_met_msgmerge
+$(XML_UNIFIED_POT): requirements_not_met_msgmerge
 endif
 
 ifeq ($(MSGATTRIB),)

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

Summary of changes:
 doc/Makefile.in | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
PostGIS