[postgis-tickets] [SCM] PostGIS branch master updated. 3.4.0rc1-397-g26b88d2f4

[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  26b88d2f4ff2400b7dddaa3452274c0330703053 (commit)
      from  87d824fdfd771bc7dd9b7728b8e0ddfea7b6ae45 (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 26b88d2f4ff2400b7dddaa3452274c0330703053
Author: Sandro Santilli <strk at kbt.io>
Date:   Thu Jul 20 10:53:13 2023 +0200

    Drop line wrapping from pot and po files
    
    This is aimed at reducing style war between developers and bots.
    References #5455

diff --git a/doc/Makefile.in b/doc/Makefile.in
index e9bc4a6c0..6ea419b9f 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -254,6 +254,7 @@ else
 $(XML_INPUTS_POT): $(srcdir)/po/templates/%.xml.pot: %.xml
 	@$(XML2POT) $< > $@.tmp;
 	@$(abs_srcdir)/po/strip_untranslatable.sh $@.tmp;
+	$(MSGATTRIB) --no-wrap -o $@.tmp $@.tmp;
 	@if test -f $@; then \
     changed=`diff $@.tmp $@ \
 			| grep -v '^[<>] "POT-Creation-Date:' \
@@ -283,10 +284,9 @@ update-po: $(XML_INPUTS_POT)
       mkdir -p $(srcdir)/po/$$lang; \
       po=$(srcdir)/po/$$lang/`basename $$pot .pot`.po; \
       if test -f $$po; then \
-        $(MSGMERGE) --no-fuzzy-matching --update $$po $$pot && \
-				$(MSGATTRIB) --no-obsolete -o $$po $$po || exit 1; \
+        $(MSGMERGE) --no-wrap --no-fuzzy-matching --update $$po $$pot || exit 1; \
       else \
-        $(MSGINIT) -i $$pot -o $$po -l $$lang --no-translator || exit 1; \
+        $(MSGINIT) --no-wrap -i $$pot -o $$po -l $$lang --no-translator || exit 1; \
       fi; \
     done; \
   done

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

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


hooks/post-receive
-- 
PostGIS