[postgis-tickets] [SCM] PostGIS branch stable-3.1 updated. 3.1.4-15-ge813b8262

[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, stable-3.1 has been updated
       via  e813b8262481dbf58651750502a25bb44fdd3f0e (commit)
       via  bbc82305dc4f443d347014983a77c84d284ae6f3 (commit)
      from  8acb5e033cad2502bac5a0a8bf8a107cfbeabedb (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 e813b8262481dbf58651750502a25bb44fdd3f0e
Author: Regina Obe <lr at pcorp.us>
Date:   Fri Nov 19 19:10:54 2021 -0500

    Change berrie to test pg13 instead of 12

diff --git a/ci/berrie/postgis_regress.sh b/ci/berrie/postgis_regress.sh
index 6cd74363f..3f28dbd86 100644
--- a/ci/berrie/postgis_regress.sh
+++ b/ci/berrie/postgis_regress.sh
@@ -9,7 +9,7 @@ export WORKSPACE=/home/jenkins/workspace
 
 cd ${WORKSPACE}/PostGIS_Worker_Run/label/${label}/$BRANCH
 export OS_BUILD=32
-export PG_VER=12
+export PG_VER=13
 export PGPATH=${WORKSPACE}/pg/label/${label}/rel/pg${PG_VER}w${OS_BUILD}
 
 export PATH=${PGPATH}/bin:${PGPATH}/lib:${PATH}

commit bbc82305dc4f443d347014983a77c84d284ae6f3
Author: Regina Obe <lr at pcorp.us>
Date:   Fri Nov 19 19:10:29 2021 -0500

    Prevent duplicate links in Aggregate section.  Closes #5021 for PostGIS 3.1

diff --git a/doc/xsl/postgis_aggs_mm.xml.xsl b/doc/xsl/postgis_aggs_mm.xml.xsl
index 150dbc921..11e2c90d2 100644
--- a/doc/xsl/postgis_aggs_mm.xml.xsl
+++ b/doc/xsl/postgis_aggs_mm.xml.xsl
@@ -34,14 +34,11 @@
 				</xsl:variable>
 
 			<!-- For each function prototype if it takes a geometry set then catalog it as an aggregate function  -->
-				<xsl:for-each select="refsynopsisdiv/funcsynopsis/funcprototype">
-					<xsl:choose>
-						<xsl:when test="contains(paramdef/type,' set') or contains(paramdef/type,'geography set') or contains(paramdef/type,'raster set')">
+						<xsl:if test=".//paramdef[contains(type,' set')] or .//paramdef[contains(type,'geography set')] or
+						.//paramdef[contains(type,'raster set')]">
 							 <listitem><simpara><link linkend="{$refid}"><xsl:value-of select="$refname" /></link> - <xsl:value-of select="$comment" /></simpara></listitem>
-						</xsl:when>
-					</xsl:choose>
+						</xsl:if>
 				</xsl:for-each>
-			</xsl:for-each>
 			</itemizedlist>
 		</sect1>
 
@@ -583,7 +580,7 @@
 				</itemizedlist>
 				</xsl:if>
 			</sect2>
-						
+
 			<sect2 id="NewFunctions_3_0">
 				<title>PostGIS Functions new or enhanced in 3.0</title>
 				<para>The functions given below are PostGIS functions that were added or enhanced.</para>

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

Summary of changes:
 ci/berrie/postgis_regress.sh    |  2 +-
 doc/xsl/postgis_aggs_mm.xml.xsl | 11 ++++-------
 2 files changed, 5 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
PostGIS