[postgis-tickets] [SCM] PostGIS branch master updated. 3.4.0rc1-606-gcb91c5193

[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  cb91c5193eccff425f7a0a56d0b35bc5fb7d0dd4 (commit)
       via  64d0633229af59c2fac0123f08f6dee4b4444efc (commit)
      from  d06a349651886cb4789f1480389857a636f58504 (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 cb91c5193eccff425f7a0a56d0b35bc5fb7d0dd4
Author: Sandro Santilli <strk at kbt.io>
Date:   Wed Sep 20 10:07:48 2023 +0200

    Rewrite caption of ST_PointOnSurface examples

diff --git a/doc/po/templates/postgis-manual.pot b/doc/po/templates/postgis-manual.pot
index 39cb649ea..4b37f02c2 100644
--- a/doc/po/templates/postgis-manual.pot
+++ b/doc/po/templates/postgis-manual.pot
@@ -21869,22 +21869,22 @@ msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "PointOnSurface of a <varname>MULTIPOINT</varname>"
+msgid "Point on surface of a <varname>MULTIPOINT</varname>"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "PointOnSurface of a <varname>LINESTRING</varname>"
+msgid "Point on surface of a <varname>LINESTRING</varname>"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "PointOnSurface of a <varname>POLYGON</varname>"
+msgid "Point on surface of a <varname>POLYGON</varname>"
 msgstr ""
 
 #. Tag: para
 #, no-c-format
-msgid "PointOnSurface of a <varname>GEOMETRYCOLLECTION</varname>"
+msgid "Point on surface of a <varname>GEOMETRYCOLLECTION</varname>"
 msgstr ""
 
 #. Tag: para
diff --git a/doc/reference_processing.xml b/doc/reference_processing.xml
index 5a0a6b385..4254b3aae 100644
--- a/doc/reference_processing.xml
+++ b/doc/reference_processing.xml
@@ -2213,7 +2213,7 @@ MULTILINESTRING((164 1,11.7867965644036 1,1 11.7867965644036,1 195),
                       <imagedata fileref="images/st_pointonsurface01.png"/>
                     </imageobject>
 
-                    <caption><para>PointOnSurface of a
+                    <caption><para>Point on surface of a
                     <varname>MULTIPOINT</varname></para></caption>
                   </mediaobject>
                 </informalfigure></para></entry>
@@ -2224,7 +2224,7 @@ MULTILINESTRING((164 1,11.7867965644036 1,1 11.7867965644036,1 195),
                       <imagedata fileref="images/st_pointonsurface02.png"/>
                     </imageobject>
 
-                    <caption><para>PointOnSurface of a
+                    <caption><para>Point on surface of a
                     <varname>LINESTRING</varname></para></caption>
                   </mediaobject>
                 </informalfigure></para></entry>
@@ -2237,7 +2237,7 @@ MULTILINESTRING((164 1,11.7867965644036 1,1 11.7867965644036,1 195),
                       <imagedata fileref="images/st_pointonsurface03.png"/>
                     </imageobject>
 
-                    <caption><para>PointOnSurface of a
+                    <caption><para>Point on surface of a
                     <varname>POLYGON</varname></para></caption>
                   </mediaobject>
                 </informalfigure></para></entry>
@@ -2248,7 +2248,7 @@ MULTILINESTRING((164 1,11.7867965644036 1,1 11.7867965644036,1 195),
                       <imagedata fileref="images/st_pointonsurface04.png"/>
                     </imageobject>
 
-                    <caption><para>PointOnSurface of a
+                    <caption><para>Point on surface of a
                     <varname>GEOMETRYCOLLECTION</varname></para></caption>
                   </mediaobject>
                 </informalfigure></para></entry>

commit 64d0633229af59c2fac0123f08f6dee4b4444efc
Author: Sandro Santilli <strk at kbt.io>
Date:   Wed Sep 20 10:18:34 2023 +0200

    Revert the msgmerge hack aimed at avoiding linewrap war on .pot file
    
    The hack was not functions.
    References #5544

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 7c5496c3f..cfaf68f55 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -286,7 +286,6 @@ endif
 
 ifeq ($(MSGMERGE),)
 $(PO_FILES): requirements_not_met_msgmerge
-$(XML_UNIFIED_POT): requirements_not_met_msgmerge
 endif
 
 ifeq ($(MSGATTRIB),)
@@ -328,14 +327,14 @@ $(XML_UNIFIED_POT): $(XML_SOURCE_POTS)
 	@$(MSGCAT) --sort-by-file --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 -f $@.tmp; then \
+    mv $@.tmp $@; \
   fi;
 
 # Creates or updates translation files

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

Summary of changes:
 doc/Makefile.in                     | 9 ++++-----
 doc/po/templates/postgis-manual.pot | 8 ++++----
 doc/reference_processing.xml        | 8 ++++----
 3 files changed, 12 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
PostGIS