[postgis-tickets] [SCM] PostGIS branch master updated. 3.4.0rc1-410-gfa22e6c48

[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  fa22e6c480c99aaeb930c9e74fbe0b857a920519 (commit)
      from  266985b5a4c32d3985beb498e73d532abebfe08d (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 fa22e6c480c99aaeb930c9e74fbe0b857a920519
Author: Sandro Santilli <strk at kbt.io>
Date:   Tue Sep 12 16:39:28 2023 +0200

    Revert "Drop line wrapping from pot and po files"
    
    This reverts commit 26b88d2f4ff2400b7dddaa3452274c0330703053.
    
    It was accidentally also removing the --no-obsolete flag

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 22c757676..b20e8f756 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -254,7 +254,6 @@ 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:' \
@@ -284,9 +283,10 @@ 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-wrap --no-fuzzy-matching --update $$po $$pot || exit 1; \
+        $(MSGMERGE) --no-fuzzy-matching --update $$po $$pot && \
+				$(MSGATTRIB) --no-obsolete -o $$po $$po || exit 1; \
       else \
-        $(MSGINIT) --no-wrap -i $$pot -o $$po -l $$lang --no-translator || exit 1; \
+        $(MSGINIT) -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