[postgis-tickets] [SCM] PostGIS branch master updated. 3.4.0rc1-563-gf9f2002cc

[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  f9f2002cc64e07bfec8070e4b5774ee07472a7ff (commit)
      from  1e71cf1c0abab47163c85f60d87c6826b2ac2525 (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 f9f2002cc64e07bfec8070e4b5774ee07472a7ff
Author: Sandro Santilli <strk at kbt.io>
Date:   Fri Sep 15 04:19:01 2023 +0200

    Do not override .pot file if no messages changed in XML files
    
    Closes #5455

diff --git a/doc/Makefile.in b/doc/Makefile.in
index aaf3e4e53..36519e36e 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -267,6 +267,7 @@ endif
 
 ifeq ($(MSGCOMM),)
 $(PO_FILES): requirements_not_met_msgcomm
+$(XML_UNIFIED_POT): requirements_not_met_msgcomm
 endif
 
 ifeq ($(MSGCAT),)
@@ -289,13 +290,9 @@ $(XML_SOURCE_POTS): %.xml.pot: %.xml
 update-pot: $(XML_UNIFIED_POT)
 
 $(XML_UNIFIED_POT): $(XML_SOURCE_POTS)
-	$(MSGCAT) --use-first --no-location -o $@.tmp $(XML_SOURCE_POTS)
+	@$(MSGCAT) --use-first --no-location -o $@.tmp $(XML_SOURCE_POTS)
 	@if test -f $@; then \
-    changed=`diff $@.tmp $@ \
-			| grep -v '^[<>] "POT-Creation-Date:' \
-			| grep -v '^[<>] "Report-Msgid-Bugs-To:' \
-			| wc -l`; \
-    if expr $${changed} \> 3 >/dev/null; then \
+    if test -n "$$($(MSGCOMM) --unique $@.tmp $@ | tail -1)"; then \
       echo "$@ updated"; \
     else \
       echo "$@ unchanged"; \

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

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


hooks/post-receive
-- 
PostGIS