Replace reference to MIT/X or X/MIT to MIT (fixes OSGeo#5154)

594806937 · Jan 24, 2022 · 9aa0732 · 9aa0732
1 parent d55e92c
commit 9aa0732
Show file tree

Hide file tree

Showing 62 changed files with 87 additions and 87 deletions.
diff --git a/.zenodo.json b/.zenodo.json
@@ -61,7 +61,7 @@
             "orcid": "0000-0001-9812-7584"
         }
     ],
-    "description": "GDAL is a translator library for raster and vector geospatial data formats that is released under an X/MIT style Open Source License by the Open Source Geospatial Foundation. As a library, it presents a single raster abstract data model and single vector abstract data model to the calling application for all supported formats. It also comes with a variety of useful command line utilities for data translation and processing.",
+    "description": "GDAL is a translator library for raster and vector geospatial data formats that is released under an MIT style Open Source License by the Open Source Geospatial Foundation. As a library, it presents a single raster abstract data model and single vector abstract data model to the calling application for all supported formats. It also comes with a variety of useful command line utilities for data translation and processing.",
     "keywords": [
         "GDAL",
         "geospatial",

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-# CMake4GDAL project is distributed under X/MIT license. See accompanying file LICENSE.txt.
+# CMake4GDAL project is distributed under MIT license. See accompanying file LICENSE.txt.
 cmake_minimum_required(VERSION 3.10)
 
 # cmake version 3.12 or later

diff --git a/LICENSE.TXT b/LICENSE.TXT
@@ -12,7 +12,7 @@ switch.
 GDAL/OGR General
 ----------------
 
-In general GDAL/OGR is licensed under an MIT/X style license with the 
+In general GDAL/OGR is licensed under an MIT style license with the 
 following terms:
 
 Permission is hereby granted, free of charge, to any person obtaining a

diff --git a/PROVENANCE.TXT b/PROVENANCE.TXT
@@ -109,12 +109,12 @@ Note: all the following are build options, not required.
 === gdal/alg ===
 
 * contour.cpp: Joint copyright between FrankW and ACT.
-* gdal_crs.c: derived from old GRASS/UMichigan code also under MIT/X license, properly noted in headers.
+* gdal_crs.c: derived from old GRASS/UMichigan code also under MIT license, properly noted in headers.
 * gdalmediancut.cpp: derived from libtiff tiffmedian.c utility under a GDAL compatible license.  Properly noted in headers.
-* gdalrasterize.cpp: Derived from OpenEV code.  Relicensed from LGPL to MIT/X by explicit grant from copyright holder (Frank Warmerdam).
+* gdalrasterize.cpp: Derived from OpenEV code.  Relicensed from LGPL to MIT by explicit grant from copyright holder (Frank Warmerdam).
 * gvgcpfit.c: Believed to be derived from Numerical Recipes in C.  It has not been used for some time, but was still in the CVS repository.  I have now removed it.
-* llrasterize.c: Derived from GD which has compatible MIT/X license.  Properly noted in header.
-* thinplatespline.cpp: Contributed by VIZRT Inc.,  Relicensed to MIT/X with their explicit permission as noted in the header.
+* llrasterize.c: Derived from GD which has compatible MIT license.  Properly noted in header.
+* thinplatespline.cpp: Contributed by VIZRT Inc.,  Relicensed to MIT with their explicit permission as noted in the header.
 
 === gdal/data ===
 
@@ -144,11 +144,11 @@ Note: all the following are build options, not required.
 
 === gdal/ogr/ogrsf_frmts/generic ===
 
-* Some files here (and elsewhere in OGR) copyright Softmap Inc (but MIT/X).
+* Some files here (and elsewhere in OGR) copyright Softmap Inc (but MIT).
 
 === gdal/ogr/ogrsf_frmts/avc ===
 
-* Some copyright Daniel Morissette, MIT/X.
+* Some copyright Daniel Morissette, MIT.
 * Included copy of dbfopen.h from Shapelib.  We really ought to reference the one in ../shape.
 
 === gdal/ogr/ogrsf_frmts/csv ===
@@ -157,7 +157,7 @@ Note: all the following are build options, not required.
 
 === gdal/ogr/ogrsf_frmts/dgn ===
 
-* Copyright Avenza Systems (MIT/X).
+* Copyright Avenza Systems (MIT).
 * dgn_pge.cpp, dgn_pge.h, pge_test.cpp, vbe_pge.cpp: copyright Pacific Gas and Electric, all rights reserved!  (this has all been removed from trunk)
 * web/* docs lack any copyright message.  The isff.txt originally came from Intergraph and dgn.html is a reformatted version of that.  Perhaps these ought to move out of GDAL CVS tree - action: this has been removed from svn. (#1813)
 
@@ -167,7 +167,7 @@ Note: all the following are build options, not required.
 
 === gdal/ogr/ogrsf_frmts/fme ===
 
-* All code is Copyright Safe Software, "All Rights Reserved"! - License changed to MIT/X with explicit permission from Dale Lutz.  Copyright still held by Safe.
+* All code is Copyright Safe Software, "All Rights Reserved"! - License changed to MIT with explicit permission from Dale Lutz.  Copyright still held by Safe.
 
 === gdal/ogr/ogrsf_frmts/gml ===
 
@@ -176,11 +176,11 @@ Note: all the following are build options, not required.
 
 === gdal/ogr/ogrsf_frmts/grass ===
 
-* copyright Radim Blazek, MIT/X.
+* copyright Radim Blazek, MIT.
 
 === gdal/ogr/ogrsf_frmts/ili ===
 
-* ili level code copyright Pirmin Kalberer (Sourcepole), MIT/X.
+* ili level code copyright Pirmin Kalberer (Sourcepole), MIT.
 * iom/ili2c.jar is ambiguous.  (#1812) (removed - ok)
 * iom source code is all LGPL (per iom/README.src.txt) but none of the source files have a copyright or license header.  Action: this file has been removed. (#1812)
 
@@ -190,7 +190,7 @@ Note: all the following are build options, not required.
 
 === gdal/ogr/ogrsf_frmts/mitab ===
 
-* Copyright Daniel Morissette, Stepane Villeneuve, Frank Warmerdam (MIT/X).
+* Copyright Daniel Morissette, Stepane Villeneuve, Frank Warmerdam (MIT).
 * Some code derived from MapServer with credit in headers, no problem foreseen.
 * All clean.
 
@@ -213,7 +213,7 @@ Note: all the following are build options, not required.
 
 === gdal/ogr/ogrsf_frmts/ogdi ===
 
-* Copyright Daniel Morrissette, MIT/X.
+* Copyright Daniel Morrissette, MIT.
 
 === gdal/ogr/ogrsf_frmts/pg ===
 
@@ -242,9 +242,9 @@ Note: all the following are build options, not required.
 
 === gdal/ogr/ogrsf_frmts/shape ===
 
-* inline copy of Shapelib which is dual licensed MIT/X and LGPL.
+* inline copy of Shapelib which is dual licensed MIT and LGPL.
 * Note, Shapelib code was written while I was at PCI, but permission was given to release it as open source.
-* Some (OGR) code is Copyright Softmap Inc, MIT/X.
+* Some (OGR) code is Copyright Softmap Inc, MIT.
 
 === gdal/ogr/ogrsf_frmts/sqlite ===
 
@@ -260,14 +260,14 @@ Note: all the following are build options, not required.
 
 === gdal/ogr/ogrsf_frmts ===
 
-* Some copyright softmap Inc, all MIT/X.
+* Some copyright softmap Inc, all MIT.
 
 === gdal/ogr ===
 
 * SpatialReferenceIdl.idl, GeometryIdl.idl, CoverageIdl.idl: From OGC spec package I believe.  (removed)
 * ogr_capi_test.c: no copyright message, written by Daniel Morissette. Added copyright.
 * oledbgis.h: No copyright message, mostly OGC spec constants.
-* ogr_swq.h, swq.c: Has alternate form of MIT/X license.  On review this license is functionally equivalent to the general GDAL license.
+* ogr_swq.h, swq.c: Has alternate form of MIT license.  On review this license is functionally equivalent to the general GDAL license.
 * Copyright holders include Frank Warmerdam, Daniel Morissette, Softmap Inc., Stephane Villeneuve., Andrey Kiselev, Information Interoperability Institute
 
 === gdal/frmts/aaigrid ===
@@ -276,7 +276,7 @@ Note: all the following are build options, not required.
 
 === gdal/frmts/aigrid ===
 
-* aigccitt.c: Derived from libtiff - MIT/X.
+* aigccitt.c: Derived from libtiff - MIT.
 * FrankW, clean.
 
 === gdal/frmts/airsar ===
@@ -337,7 +337,7 @@ See [http://home.gdal.org/projects/bsb/ipi.html]
 === gdal/frmts/gif ===
 
 * FrankW, clean.
-* libungif is under the MIT/X license as established in ticket #1818.
+* libungif is under the MIT license as established in ticket #1818.
 
 === gdal/frmts/grass ===
 
@@ -346,10 +346,10 @@ See [http://home.gdal.org/projects/bsb/ipi.html]
 
 === gdal/frmts/gtiff ===
 
-* tif_float.c: Industrial Light and Magic - MIT/X style, but with a credit requirement. Added license notice in gdal/LICENSE.TXT, setup ticket #1819 to streamline it's use.
-* tif_memio.c: FrankW, Mike Johnson and MancTec AB - MIT/X.
+* tif_float.c: Industrial Light and Magic - MIT style, but with a credit requirement. Added license notice in gdal/LICENSE.TXT, setup ticket #1819 to streamline it's use.
+* tif_memio.c: FrankW, Mike Johnson and MancTec AB - MIT.
 * Contains copy of libtiff, license terms explicit in source files.
-* Contains copy of libgeotiff, license terms not made clear.  A review of libgeotiff's LICENSE file makes it clear code is public domain unless otherwise noted (which would be FrankW's MIT/X code)
+* Contains copy of libgeotiff, license terms not made clear.  A review of libgeotiff's LICENSE file makes it clear code is public domain unless otherwise noted (which would be FrankW's MIT code)
 
 === gdal/frmts/gxf ===
 

diff --git a/README.md b/README.md
@@ -22,7 +22,7 @@ GDAL - Geospatial Data Abstraction Library
 [![Powered by NumFOCUS](https://img.shields.io/badge/powered%20by-NumFOCUS-orange.svg?style=flat&colorA=E1523D&colorB=007D8A )](http://numfocus.org)
 
 
-GDAL is an open source X/MIT licensed translator library for raster and vector geospatial data formats.
+GDAL is an open source MIT licensed translator library for raster and vector geospatial data formats.
 
 * Main site: https://gdal.org - Developer and user docs, links to other resources
 * GIT repository: https://github.com/OSGeo/gdal

diff --git a/alg/CMakeLists.txt b/alg/CMakeLists.txt
@@ -1,4 +1,4 @@
-# CMake4GDAL project is distributed under X/MIT license. See accompanying file LICENSE.txt.
+# CMake4GDAL project is distributed under MIT license. See accompanying file LICENSE.txt.
 
 add_library(
   alg OBJECT

diff --git a/alg/llrasterize.cpp b/alg/llrasterize.cpp
@@ -70,7 +70,7 @@ CPL_CVSID("$Id$")
  * http://www.boutell.com/gd/
  *
  * It was later adapted for direct inclusion in GDAL and relicensed under
- * the GDAL MIT/X license (pulled from the OpenEV distribution).
+ * the GDAL MIT license (pulled from the OpenEV distribution).
  */
 
 void GDALdllImageFilledPolygon(int nRasterXSize, int nRasterYSize,

diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt
@@ -1,4 +1,4 @@
-# CMake4GDAL project is distributed under X/MIT license. See accompanying file LICENSE.txt.
+# CMake4GDAL project is distributed under MIT license. See accompanying file LICENSE.txt.
 
 include(GdalStandardIncludes)
 add_library(

diff --git a/autotest/CMakeLists.txt b/autotest/CMakeLists.txt
@@ -1,4 +1,4 @@
-# CMake4GDAL project is distributed under X/MIT license. See accompanying file LICENSE.txt.
+# CMake4GDAL project is distributed under MIT license. See accompanying file LICENSE.txt.
 
 #[[
 option(AUTOTEST_DOWNLOAD_TEST_DATA "Autotest to download test data" OFF)

diff --git a/autotest/cpp/CMakeLists.txt b/autotest/cpp/CMakeLists.txt
@@ -1,4 +1,4 @@
-# CMake4GDAL project is distributed under X/MIT license. See accompanying file LICENSE.txt.
+# CMake4GDAL project is distributed under MIT license. See accompanying file LICENSE.txt.
 
 set(GDAL_ROOT_TEST_DIR "${PROJECT_SOURCE_DIR}/autotest")
 

diff --git a/autotest/gcore/CMakeLists.txt b/autotest/gcore/CMakeLists.txt
@@ -1,4 +1,4 @@
-# CMake4GDAL project is distributed under X/MIT license. See accompanying file LICENSE.txt.
+# CMake4GDAL project is distributed under MIT license. See accompanying file LICENSE.txt.
 
 foreach (
   test_target IN

diff --git a/autotest/gcore/basic_test.py b/autotest/gcore/basic_test.py
@@ -173,7 +173,7 @@ def test_basic_test_8():
 
     license_text = gdal.VersionInfo('LICENSE')
     assert (
-        license_text.startswith('GDAL/OGR is released under the MIT/X license')
+        license_text.startswith('GDAL/OGR is released under the MIT license')
         or 'GDAL/OGR Licensing' in license_text
     )
 

diff --git a/autotest/gdrivers/data/vrt/n43_hillshade.vrt b/autotest/gdrivers/data/vrt/n43_hillshade.vrt
@@ -15,7 +15,7 @@
     <PixelFunctionArguments scale="111120" z_factor="30" />
     <PixelFunctionCode>
       <![CDATA[
-# Licence: X/MIT
+# Licence: MIT
 # Copyright 2016, Even Rouault
 import math
 

diff --git a/autotest/ogr/data/gpx/test.gpx b/autotest/ogr/data/gpx/test.gpx
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- GPX sample. X/MIT licence -->
+<!-- GPX sample. MIT licence -->
 <gpx creator="E. Rouault" version="1.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.topografix.com/GPX/1/1" xsi:schemaLocation="http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd">
 <wpt lat="0" lon="1">
   <ele>2</ele> 

diff --git a/cmake/helpers/CheckDependentLibraries.cmake b/cmake/helpers/CheckDependentLibraries.cmake
@@ -1,4 +1,4 @@
-# Distributed under the GDAL/OGR MIT/X style License.  See accompanying file LICENSE.TXT.
+# Distributed under the GDAL/OGR MIT style License.  See accompanying file LICENSE.TXT.
 
 #[=======================================================================[.rst:
 CheckDependentLibraries.cmake

diff --git a/cmake/helpers/GdalDriverHelper.cmake b/cmake/helpers/GdalDriverHelper.cmake
@@ -1,4 +1,4 @@
-# Distributed under the GDAL/OGR MIT/X style License.  See accompanying
+# Distributed under the GDAL/OGR MIT style License.  See accompanying
 # file LICENSE.TXT.
 
 #[=======================================================================[.rst:

diff --git a/cmake/helpers/GdalStandardIncludes.cmake b/cmake/helpers/GdalStandardIncludes.cmake
@@ -1,4 +1,4 @@
-# Distributed under the GDAL/OGR MIT/X style License.  See accompanying
+# Distributed under the GDAL/OGR MIT style License.  See accompanying
 # file LICENSE.TXT.
 
 #[=======================================================================[.rst:

diff --git a/cmake/helpers/GdalSwigBindings.cmake b/cmake/helpers/GdalSwigBindings.cmake
@@ -1,4 +1,4 @@
-# Distributed under the GDAL/OGR MIT/X style License.  See accompanying
+# Distributed under the GDAL/OGR MIT style License.  See accompanying
 # file LICENSE.TXT.
 
 #[=======================================================================[.rst:

diff --git a/cmake/helpers/GdalVersion.cmake b/cmake/helpers/GdalVersion.cmake
@@ -1,4 +1,4 @@
-# Distributed under the GDAL/OGR MIT/X style License.  See accompanying
+# Distributed under the GDAL/OGR MIT style License.  See accompanying
 # file LICENSE.TXT.
 
 #[=======================================================================[.rst:

diff --git a/cmake/helpers/TargetPublicHeader.cmake b/cmake/helpers/TargetPublicHeader.cmake
@@ -1,4 +1,4 @@
-# Distributed under the GDAL/OGR MIT/X style License.  See accompanying
+# Distributed under the GDAL/OGR MIT style License.  See accompanying
 # file LICENSE.TXT.
 
 #[=======================================================================[.rst:

diff --git a/cmake/helpers/configure.cmake b/cmake/helpers/configure.cmake
@@ -1,4 +1,4 @@
-# Distributed under the GDAL/OGR MIT/X style License.  See accompanying file LICENSE.TXT.
+# Distributed under the GDAL/OGR MIT style License.  See accompanying file LICENSE.TXT.
 
 #[=======================================================================[.rst:
 configure

diff --git a/cmake/modules/packages/FindMRSID.cmake b/cmake/modules/packages/FindMRSID.cmake
@@ -1,4 +1,4 @@
-# Distributed under the GDAL/OGR MIT/X style License.  See accompanying
+# Distributed under the GDAL/OGR MIT style License.  See accompanying
 # file LICENSE.TXT.
 
 #[=======================================================================[.rst:

diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
@@ -1,4 +1,4 @@
-# CMake4GDAL project is distributed under X/MIT license. See accompanying file LICENSE.txt.
+# CMake4GDAL project is distributed under MIT license. See accompanying file LICENSE.txt.
 
 # Documentation rules
 find_package(Doxygen)

diff --git a/doc/source/about_no_title.rst b/doc/source/about_no_title.rst
@@ -1,6 +1,6 @@
 .. include:: ./substitutions.rst
 
-GDAL is a translator library for raster and vector geospatial data formats that is released under an X/MIT style Open Source :ref:`license` by the `Open Source Geospatial Foundation`_. As a library, it presents a single raster abstract data model and single vector abstract data model to the calling application for all supported formats. It also comes with a variety of useful command line utilities for data translation and processing. The `NEWS`_ page describes the December 2021 GDAL/OGR 3.4.1 release.
+GDAL is a translator library for raster and vector geospatial data formats that is released under an MIT style Open Source :ref:`license` by the `Open Source Geospatial Foundation`_. As a library, it presents a single raster abstract data model and single vector abstract data model to the calling application for all supported formats. It also comes with a variety of useful command line utilities for data translation and processing. The `NEWS`_ page describes the December 2021 GDAL/OGR 3.4.1 release.
 
 .. image:: ../images/OSGeo_project.png
    :alt:   OSGeo project

diff --git a/doc/source/development/rfc/rfc34_license_policy.rst b/doc/source/development/rfc/rfc34_license_policy.rst
@@ -27,7 +27,7 @@ executable and distributed beyond the creator to also be offered under
 open source terms.
 
 Non-Reciprocal FOSS License: A open source software license, such as
-MIT/X, BSD or LGPL, that does not place any requirements on other linked
+MIT, BSD or LGPL, that does not place any requirements on other linked
 components in the same executable at distribution time.
 
 Proprietary License: Software provided under terms that do not adhere to
@@ -40,7 +40,7 @@ distributor or end user.
 Rationale
 ---------
 
-GDAL/OGR is distributed under the Non-Reciprocal MIT/X open source
+GDAL/OGR is distributed under the Non-Reciprocal MIT open source
 license which facilitates it's use by proprietary and open source
 applications, and facilitates the inclusion of proprietary format
 drivers along side the open source format drivers. However, it is still
@@ -76,7 +76,7 @@ the driver:
    such as the GPL, and should not be mixed with proprietary drivers or
    applications.
 -  "NONRECIPROCAL": the driver is available under a non-reciprocal FOSS
-   license such as MIT/X, or LGPL. This is the default if no licensing
+   license such as MIT, or LGPL. This is the default if no licensing
    policy is declared and is the natural policy of drivers provided as
    part of GDAL without outside dependencies.
 -  "PROPRIETARY": the driver, usually due to use of proprietary

diff --git a/doc/source/development/rfc/rfc3_commiters.rst b/doc/source/development/rfc/rfc3_commiters.rst
@@ -155,7 +155,7 @@ the project without it being clearly licensed under the project license.
 
 Generally speaking the key issues are that those providing code to be
 included in the repository understand that the code will be released
-under the MIT/X license, and that the person providing the code has the
+under the MIT license, and that the person providing the code has the
 right to contribute the code. For the committer themselves understanding
 about the license is hopefully clear. For other contributors, the
 committer should verify the understanding unless the committer is very
@@ -165,7 +165,7 @@ frequent contributors).
 If the contribution was developed on behalf of an employer (on work
 time, as part of a work project, etc) then it is important that an
 appropriate representative of the employer understand that the code will
-be contributed under the MIT/X license. The arrangement should be
+be contributed under the MIT license. The arrangement should be
 cleared with an authorized supervisor/manager, etc.
 
 The code should be developed by the contributor, or the code should be

diff --git a/doc/source/drivers/raster/vrt.rst b/doc/source/drivers/raster/vrt.rst
@@ -1119,7 +1119,7 @@ with hillshading.py:
 
 .. code-block:: python
 
-    # Licence: X/MIT
+    # Licence: MIT
     # Copyright 2016, Even Rouault
     import math
 

diff --git a/doc/source/license.rst b/doc/source/license.rst
@@ -9,7 +9,7 @@ License
 License
 --------------------------------------------------------------------------------
 
-In general GDAL/OGR is licensed under an MIT/X style license with the 
+In general GDAL/OGR is licensed under an MIT style license with the 
 following terms:
 
 Permission is hereby granted, free of charge, to any person obtaining a

diff --git a/docker/README.md b/docker/README.md
@@ -18,7 +18,7 @@ best of our knowledge and not guaranteed. Users should check by themselves.
 * External libraries enabled: ultrasmall + libexpat, libpq, libssl
 * No GDAL Python
 * Base PROJ grid package (http://download.osgeo.org/proj/proj-datumgrid-1.8.zip)
-* Overall licensing terms of the GDAL build: permissive (X/MIT, BSD style, Apache, etc..)
+* Overall licensing terms of the GDAL build: permissive (MIT, BSD style, Apache, etc..)
 
 See [alpine-small/Dockerfile](alpine-small/Dockerfile)
 
@@ -48,7 +48,7 @@ See [alpine-normal/Dockerfile](alpine-normal/Dockerfile)
   libzstd, libexpat, libxerces-c, libpq, libssl, libgeos
 * GDAL Python (Python 3.8)
 * Base PROJ grid package (http://download.osgeo.org/proj/proj-datumgrid-1.8.zip)
-* Overall licensing terms of the GDAL build: LGPL + permissive (X/MIT, BSD style, Apache, etc..)
+* Overall licensing terms of the GDAL build: LGPL + permissive (MIT, BSD style, Apache, etc..)
 
 See [ubuntu-small/Dockerfile](ubuntu-small/Dockerfile)
 

diff --git a/docker/alpine-normal/Dockerfile b/docker/alpine-normal/Dockerfile
@@ -3,7 +3,7 @@
 
 # This file is available at the option of the licensee under:
 # Public domain
-# or licensed under X/MIT (LICENSE.TXT) Copyright 2019 Even Rouault <[email protected]>
+# or licensed under MIT (LICENSE.TXT) Copyright 2019 Even Rouault <[email protected]>
 
 ARG ALPINE_VERSION=3.15
 FROM alpine:${ALPINE_VERSION} as builder

diff --git a/docker/alpine-normal/build.sh b/docker/alpine-normal/build.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # This file is available at the option of the licensee under:
 # Public domain
-# or licensed under X/MIT (LICENSE.TXT) Copyright 2019 Even Rouault <[email protected]>
+# or licensed under MIT (LICENSE.TXT) Copyright 2019 Even Rouault <[email protected]>
 
 set -eu