[postgis-tickets] [SCM] PostGIS branch master updated. 3.4.0beta1-15-g1a5258193
git at osgeo.org
git at osgeo.org
Sat Jul 15 20:04:05 PDT 2023
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 1a525819301c7b715a74cd1549142dede3e34e49 (commit)
from 888c036361b95d90edd84be2f04fe1686f09275b (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 1a525819301c7b715a74cd1549142dede3e34e49
Author: Regina Obe <lr at pcorp.us>
Date: Sat Jul 15 23:03:30 2023 -0400
Clarify licensing of XSL style sheets
References #5449 for PostGIS 3.4.0
diff --git a/LICENSE.TXT b/LICENSE.TXT
index 177061d55..4bb00a674 100644
--- a/LICENSE.TXT
+++ b/LICENSE.TXT
@@ -33,7 +33,7 @@ shapefil.h, shpopen.c (copyrighted by Frank Warmerdam and Even Rouault).
-- loader/getopt.* are under AT&T public domain (Copyright (c) 1984, 1985 AT&T).
-- Doc/xsl files
-These are under a BSD Style license
+These are under a BSD-3-Clause license - refer to doc/xsl/LICENSE file
-- liblwgeom/lookup3.c is released under Public Domain by Bob Jenkins, May 2006.
diff --git a/doc/xsl/LICENSE b/doc/xsl/LICENSE
new file mode 100644
index 000000000..7fb7a3cc0
--- /dev/null
+++ b/doc/xsl/LICENSE
@@ -0,0 +1,14 @@
+BSD-3-Clause
+
+Copyright 2010-2023, Regina Obe
+Copyright 2023, Sandro Santilli
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/doc/xsl/list_3d_functions.xml.xsl b/doc/xsl/list_3d_functions.xml.xsl
index 754b6b90c..7bea66851 100644
--- a/doc/xsl/list_3d_functions.xml.xsl
+++ b/doc/xsl/list_3d_functions.xml.xsl
@@ -2,7 +2,7 @@
<!-- ********************************************************************
********************************************************************
Copyright 2010-2022, Regina Obe
- License: BSD
+ License: BSD-3-Clause
Purpose: This is an xsl transform that generates file list_3d_functions.xml.xsl which
includes index listing of functions supporting Z
It uses xml reference sections from reference.xml to then be processed by docbook
diff --git a/doc/xsl/list_aggregates.xml.xsl b/doc/xsl/list_aggregates.xml.xsl
index 16c08a622..760ee94f4 100644
--- a/doc/xsl/list_aggregates.xml.xsl
+++ b/doc/xsl/list_aggregates.xml.xsl
@@ -2,7 +2,7 @@
<!-- ********************************************************************
********************************************************************
Copyright 2010-2022, Regina Obe
- License: BSD
+ License: BSD-3-Clause
Purpose: This is an xsl transform that generates file list_aggregates.xml.xsl which
includes index listing of aggregate functions.
It uses xml reference sections from reference.xml to then be processed by docbook
diff --git a/doc/xsl/list_box_functions.xml.xsl b/doc/xsl/list_box_functions.xml.xsl
index f156d6432..0f41193b4 100644
--- a/doc/xsl/list_box_functions.xml.xsl
+++ b/doc/xsl/list_box_functions.xml.xsl
@@ -2,7 +2,7 @@
<!-- ********************************************************************
********************************************************************
Copyright 2010-2022, Regina Obe
- License: BSD
+ License: BSD-3-Clause
Purpose: This is an xsl transform that generates file list_box_functions.xml.xsl which
includes index listing of functions taking or returning a BOX.
It uses xml reference sections from reference.xml to then be processed by docbook
diff --git a/doc/xsl/list_curved_geometry_functions.xml.xsl b/doc/xsl/list_curved_geometry_functions.xml.xsl
index b87abfbbd..aab2b6673 100644
--- a/doc/xsl/list_curved_geometry_functions.xml.xsl
+++ b/doc/xsl/list_curved_geometry_functions.xml.xsl
@@ -2,7 +2,7 @@
<!-- ********************************************************************
********************************************************************
Copyright 2010-2022, Regina Obe
- License: BSD
+ License: BSD-3-Clause
Purpose: This is an xsl transform that generates file list_curved_geometry_functions.xml.xsl which
includes index listing of functions supporting curved geometries.
It uses xml reference sections from reference.xml to then be processed by docbook
diff --git a/doc/xsl/list_dump_functions.xml.xsl b/doc/xsl/list_dump_functions.xml.xsl
index 33a5e24bd..8bd49b3de 100644
--- a/doc/xsl/list_dump_functions.xml.xsl
+++ b/doc/xsl/list_dump_functions.xml.xsl
@@ -2,7 +2,7 @@
<!-- ********************************************************************
********************************************************************
Copyright 2010-2022, Regina Obe
- License: BSD
+ License: BSD-3-Clause
Purpose: This is an xsl transform that generates file list_dump_functions.xml.xsl which
includes index listing of functions returning geometry dumps.
It uses xml reference sections from reference.xml to then be processed by docbook
diff --git a/doc/xsl/list_geography_functions.xml.xsl b/doc/xsl/list_geography_functions.xml.xsl
index 81fb7858e..910fb68c3 100644
--- a/doc/xsl/list_geography_functions.xml.xsl
+++ b/doc/xsl/list_geography_functions.xml.xsl
@@ -2,7 +2,7 @@
<!-- ********************************************************************
********************************************************************
Copyright 2010-2022, Regina Obe
- License: BSD
+ License: BSD-3-Clause
Purpose: This is an xsl transform that generates file list_geography_functions.xml.xsl which
includes index listing of functions accepting or returning geography.
It uses xml reference sections from reference.xml to then be processed by docbook
diff --git a/doc/xsl/list_new_functions.xml.xsl b/doc/xsl/list_new_functions.xml.xsl
index a85d27287..5b62c1f6d 100644
--- a/doc/xsl/list_new_functions.xml.xsl
+++ b/doc/xsl/list_new_functions.xml.xsl
@@ -2,7 +2,7 @@
<!-- ********************************************************************
********************************************************************
Copyright 2010-2022, Regina Obe
- License: BSD
+ License: BSD-3-Clause
Purpose: This is an xsl transform that generates file list_new_functions.xml which
includes what is new in each release
It uses xml reference sections from reference.xml to then be processed by docbook
diff --git a/doc/xsl/list_raster_functions.xml.xsl b/doc/xsl/list_raster_functions.xml.xsl
index f02961e6d..5ef32c84c 100644
--- a/doc/xsl/list_raster_functions.xml.xsl
+++ b/doc/xsl/list_raster_functions.xml.xsl
@@ -2,7 +2,7 @@
<!-- ********************************************************************
********************************************************************
Copyright 2010-2022, Regina Obe
- License: BSD
+ License: BSD-3-Clause
Purpose: This is an xsl transform that generates file list_raster_functions.xml.xsl which
includes index listing of functions accepting or returning raster.
It uses xml reference sections from reference.xml to then be processed by docbook
diff --git a/doc/xsl/list_sqlmm_functions.xml.xsl b/doc/xsl/list_sqlmm_functions.xml.xsl
index 7010808ae..93b893e84 100644
--- a/doc/xsl/list_sqlmm_functions.xml.xsl
+++ b/doc/xsl/list_sqlmm_functions.xml.xsl
@@ -2,7 +2,7 @@
<!-- ********************************************************************
********************************************************************
Copyright 2010-2022, Regina Obe
- License: BSD
+ License: BSD-3-Clause
Purpose: This is an xsl transform that generates file list_sqlmm_functions.xml.xsl which
includes index listing of functions implementing SQL/MM standard.
It uses xml reference sections from reference.xml to then be processed by docbook
diff --git a/doc/xsl/list_window_functions.xml.xsl b/doc/xsl/list_window_functions.xml.xsl
index 1f9422ab2..fc66af96d 100644
--- a/doc/xsl/list_window_functions.xml.xsl
+++ b/doc/xsl/list_window_functions.xml.xsl
@@ -2,7 +2,7 @@
<!-- ********************************************************************
********************************************************************
Copyright 2010-2022, Regina Obe
- License: BSD
+ License: BSD-3-Clause
Purpose: This is an xsl transform that generates file list_window_functions.xml.xsl which
includes index listing of window functions.
It uses xml reference sections from reference.xml to then be processed by docbook
diff --git a/doc/xsl/post_gis_day_cards.html.xsl b/doc/xsl/post_gis_day_cards.html.xsl
index 6d369e65d..a8b569a7a 100644
--- a/doc/xsl/post_gis_day_cards.html.xsl
+++ b/doc/xsl/post_gis_day_cards.html.xsl
@@ -3,7 +3,7 @@
<!-- ********************************************************************
********************************************************************
Copyright 2011, Regina Obe
- License: BSD
+ License: BSD-3-Clause
Purpose: This is an xsl transform that generates PostGIS flash cards
******************************************************************** -->
<xsl:include href="common_utils.xsl" />
diff --git a/doc/xsl/postgis_cheatsheet.html.xsl b/doc/xsl/postgis_cheatsheet.html.xsl
index decd0fa31..4455ac67e 100644
--- a/doc/xsl/postgis_cheatsheet.html.xsl
+++ b/doc/xsl/postgis_cheatsheet.html.xsl
@@ -6,7 +6,7 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<!-- ********************************************************************
********************************************************************
Copyright 2011, Regina Obe
- License: BSD
+ License: BSD-3-Clause
Purpose: This is an xsl transform that generates PostgreSQL COMMENT ON FUNCTION ddl
statements from postgis xml doc reference
******************************************************************** -->
diff --git a/doc/xsl/postgis_comments.sql.xsl b/doc/xsl/postgis_comments.sql.xsl
index a07319475..0d7015a99 100644
--- a/doc/xsl/postgis_comments.sql.xsl
+++ b/doc/xsl/postgis_comments.sql.xsl
@@ -3,7 +3,7 @@
<!-- ********************************************************************
********************************************************************
Copyright 2008, Regina Obe
- License: BSD
+ License: BSD-3-Clause
Purpose: This is an xsl transform that generates PostgreSQL COMMENT ON FUNCTION ddl
statements from postgis xml doc reference
******************************************************************** -->
diff --git a/doc/xsl/postgis_gardentest.sql.xsl b/doc/xsl/postgis_gardentest.sql.xsl
index 070a2b845..e4cb4fe7d 100644
--- a/doc/xsl/postgis_gardentest.sql.xsl
+++ b/doc/xsl/postgis_gardentest.sql.xsl
@@ -3,7 +3,7 @@
<!-- ********************************************************************
********************************************************************
Copyright 2008-2010, Regina Obe
- License: BSD
+ License: BSD-3-Clause
Purpose: This is an xsl transform that generates an sql test script from xml docs to test all the functions we have documented
using a garden variety of geometries. Its intent is to flag major crashes.
******************************************************************** -->
diff --git a/doc/xsl/postgis_reference.xml.xsl b/doc/xsl/postgis_reference.xml.xsl
index 50d5b2e0a..35ea2a7b6 100644
--- a/doc/xsl/postgis_reference.xml.xsl
+++ b/doc/xsl/postgis_reference.xml.xsl
@@ -2,10 +2,10 @@
<!-- ********************************************************************
********************************************************************
Copyright 2010, Regina Obe
- License: BSD
- Purpose: This is an xsl transform that concatenates
+ License: BSD-3-Clause
+ Purpose: This is an xsl transform that concatenates
all the sections defined in postgis.xml and strips all tags
- for suitable import by expert bot
+ for suitable import by expert bot
To use: xsltproc -o postgis_full.xml postgis_reference.xml.xsl postgis.xml
******************************************************************** -->
<xsl:output method="xml" indent="yes" encoding="utf-8" />
@@ -15,28 +15,28 @@
<xsl:apply-templates/>
</xsl:copy>
</xsl:template>
-
+
<!-- just grab link and title -->
<xsl:template match="ulink">
<xsl:value-of select="@url" /><xsl:text> </xsl:text><xsl:value-of select="." />
</xsl:template>
- <!--just grab name of file -->
+ <!--just grab name of file -->
<xsl:template match="filename">
<xsl:value-of select="." />
</xsl:template>
-
- <!--strip varname tag and leave just the name -->
+
+ <!--strip varname tag and leave just the name -->
<xsl:template match="varname">
<xsl:value-of select="." />
</xsl:template>
-
- <!--strip xref tag and just leave reference section -->
+
+ <!--strip xref tag and just leave reference section -->
<xsl:template match="xref">
<xsl:value-of select="@linkend" />
</xsl:template>
-
- <!--strip comman tag and just leave inner body -->
+
+ <!--strip comman tag and just leave inner body -->
<xsl:template match="command">
command: <xsl:value-of select="." />
</xsl:template>
diff --git a/doc/xsl/raster_cheatsheet.html.xsl b/doc/xsl/raster_cheatsheet.html.xsl
index 6759bd06e..6754b6012 100644
--- a/doc/xsl/raster_cheatsheet.html.xsl
+++ b/doc/xsl/raster_cheatsheet.html.xsl
@@ -6,7 +6,7 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<!-- ********************************************************************
********************************************************************
Copyright 2011, Regina Obe
- License: BSD
+ License: BSD-3-Clause
Purpose: This is an xsl transform that generates PostgreSQL COMMENT ON FUNCTION ddl
statements from postgis xml doc reference
******************************************************************** -->
diff --git a/doc/xsl/raster_comments.sql.xsl b/doc/xsl/raster_comments.sql.xsl
index 9980cb88c..e2accb545 100644
--- a/doc/xsl/raster_comments.sql.xsl
+++ b/doc/xsl/raster_comments.sql.xsl
@@ -3,7 +3,7 @@
<!-- ********************************************************************
********************************************************************
Copyright 2008, Regina Obe
- License: BSD
+ License: BSD-3-Clause
Purpose: This is an xsl transform that generates PostgreSQL COMMENT ON FUNCTION ddl
statements from postgis xml doc reference for WKT Raster section
******************************************************************** -->
diff --git a/doc/xsl/raster_gardentest.sql.xsl b/doc/xsl/raster_gardentest.sql.xsl
index 6f7ff25cf..7f3db6d25 100644
--- a/doc/xsl/raster_gardentest.sql.xsl
+++ b/doc/xsl/raster_gardentest.sql.xsl
@@ -3,7 +3,7 @@
<!-- ********************************************************************
********************************************************************
Copyright 2010, Regina Obe
- License: BSD
+ License: BSD-3-Clause
Purpose: This is an xsl transform that generates an sql test script from xml docs to test all the raster related functions we have documented
using a garden variety of rasters. Its intent is to flag major crashes.
******************************************************************** -->
diff --git a/doc/xsl/sfcgal_cheatsheet.html.xsl b/doc/xsl/sfcgal_cheatsheet.html.xsl
index 3a3fc6303..f809fbd7d 100644
--- a/doc/xsl/sfcgal_cheatsheet.html.xsl
+++ b/doc/xsl/sfcgal_cheatsheet.html.xsl
@@ -6,7 +6,7 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<!-- ********************************************************************
********************************************************************
Copyright 2011, Regina Obe
- License: BSD
+ License: BSD-3-Clause
Purpose: This is an xsl transform that generates PostgreSQL COMMENT ON FUNCTION ddl
statements from postgis xml doc reference
******************************************************************** -->
diff --git a/doc/xsl/sfcgal_comments.sql.xsl b/doc/xsl/sfcgal_comments.sql.xsl
index db0046a47..695ac591c 100644
--- a/doc/xsl/sfcgal_comments.sql.xsl
+++ b/doc/xsl/sfcgal_comments.sql.xsl
@@ -3,7 +3,7 @@
<!-- ********************************************************************
********************************************************************
Copyright 2008, Regina Obe
- License: BSD
+ License: BSD-3-Clause
Purpose: This is an xsl transform that generates PostgreSQL COMMENT ON FUNCTION ddl
statements from postgis xml doc reference
******************************************************************** -->
diff --git a/doc/xsl/tiger_geocoder_cheatsheet.html.xsl b/doc/xsl/tiger_geocoder_cheatsheet.html.xsl
index 44ef45031..2a11e2503 100644
--- a/doc/xsl/tiger_geocoder_cheatsheet.html.xsl
+++ b/doc/xsl/tiger_geocoder_cheatsheet.html.xsl
@@ -6,7 +6,7 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<!-- ********************************************************************
********************************************************************
Copyright 2011, Regina Obe
- License: BSD
+ License: BSD-3-Clause
Purpose: This is an xsl transform that generates PostgreSQL COMMENT ON FUNCTION ddl
statements from postgis xml doc reference
******************************************************************** -->
diff --git a/doc/xsl/tiger_geocoder_comments.sql.xsl b/doc/xsl/tiger_geocoder_comments.sql.xsl
index 39468a0af..81b805a42 100644
--- a/doc/xsl/tiger_geocoder_comments.sql.xsl
+++ b/doc/xsl/tiger_geocoder_comments.sql.xsl
@@ -3,7 +3,7 @@
<!-- ********************************************************************
********************************************************************
Copyright 2008, Regina Obe
- License: BSD
+ License: BSD-3-Clause
Purpose: This is an xsl transform that generates PostgreSQL COMMENT ON FUNCTION ddl
statements from postgis xml doc reference
******************************************************************** -->
diff --git a/doc/xsl/topology_cheatsheet.html.xsl b/doc/xsl/topology_cheatsheet.html.xsl
index 9783c3a07..ff4089fd5 100644
--- a/doc/xsl/topology_cheatsheet.html.xsl
+++ b/doc/xsl/topology_cheatsheet.html.xsl
@@ -6,7 +6,7 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<!-- ********************************************************************
********************************************************************
Copyright 2011, Regina Obe
- License: BSD
+ License: BSD-3-Clause
Purpose: This is an xsl transform that generates PostgreSQL COMMENT ON FUNCTION ddl
statements from postgis xml doc reference
******************************************************************** -->
diff --git a/doc/xsl/topology_comments.sql.xsl b/doc/xsl/topology_comments.sql.xsl
index 4c3092fb6..59a7339a9 100644
--- a/doc/xsl/topology_comments.sql.xsl
+++ b/doc/xsl/topology_comments.sql.xsl
@@ -3,7 +3,7 @@
<!-- ********************************************************************
********************************************************************
Copyright 2008, Regina Obe
- License: BSD
+ License: BSD-3-Clause
Purpose: This is an xsl transform that generates PostgreSQL COMMENT ON FUNCTION ddl
statements from postgis xml doc reference
******************************************************************** -->
-----------------------------------------------------------------------
Summary of changes:
LICENSE.TXT | 2 +-
doc/xsl/LICENSE | 14 ++++++++++++++
doc/xsl/list_3d_functions.xml.xsl | 2 +-
doc/xsl/list_aggregates.xml.xsl | 2 +-
doc/xsl/list_box_functions.xml.xsl | 2 +-
doc/xsl/list_curved_geometry_functions.xml.xsl | 2 +-
doc/xsl/list_dump_functions.xml.xsl | 2 +-
doc/xsl/list_geography_functions.xml.xsl | 2 +-
doc/xsl/list_new_functions.xml.xsl | 2 +-
doc/xsl/list_raster_functions.xml.xsl | 2 +-
doc/xsl/list_sqlmm_functions.xml.xsl | 2 +-
doc/xsl/list_window_functions.xml.xsl | 2 +-
doc/xsl/post_gis_day_cards.html.xsl | 2 +-
doc/xsl/postgis_cheatsheet.html.xsl | 2 +-
doc/xsl/postgis_comments.sql.xsl | 2 +-
doc/xsl/postgis_gardentest.sql.xsl | 2 +-
doc/xsl/postgis_reference.xml.xsl | 22 +++++++++++-----------
doc/xsl/raster_cheatsheet.html.xsl | 2 +-
doc/xsl/raster_comments.sql.xsl | 2 +-
doc/xsl/raster_gardentest.sql.xsl | 2 +-
doc/xsl/sfcgal_cheatsheet.html.xsl | 2 +-
doc/xsl/sfcgal_comments.sql.xsl | 2 +-
doc/xsl/tiger_geocoder_cheatsheet.html.xsl | 2 +-
doc/xsl/tiger_geocoder_comments.sql.xsl | 2 +-
doc/xsl/topology_cheatsheet.html.xsl | 2 +-
doc/xsl/topology_comments.sql.xsl | 2 +-
26 files changed, 49 insertions(+), 35 deletions(-)
create mode 100644 doc/xsl/LICENSE
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list