Merge #928

928: Use SPDX license expression r=gerritsangel a=gerritsangel - [x] I agree to follow the project's [code of conduct](https://github.com/georust/geo/blob/main/CODE_OF_CONDUCT.md). - [x] I added an entry to `CHANGES.md` if knowledge of this change could be valuable to users. --- Co-authored-by: Gerrit Sangel <[email protected]> Co-authored-by: Gerrit Sangel <[email protected]>
georust · Nov 5, 2022 · 14e306d · 14e306d
2 parents 18a9208 + 29c3de5
commit 14e306d
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 3 deletions.
diff --git a/geo-postgis/CHANGES.md b/geo-postgis/CHANGES.md
@@ -1,5 +1,10 @@
 # Changes
 
+## Unreleased
+
+* Changed license field to [SPDX 2.1 license expression](https://spdx.dev/spdx-specification-21-web-version/#h.jxpfx0ykyb60)
+  * <https://github.com/georust/geo/pull/928>
+
 ## 0.2.2
 
 * Update `postgis` to allow 0.9.0

diff --git a/geo-postgis/Cargo.toml b/geo-postgis/Cargo.toml
@@ -2,7 +2,7 @@
 name = "geo-postgis"
 version = "0.2.2"
 authors = ["Corey Farwell <[email protected]>"]
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
 repository = "https://github.com/georust/geo"
 documentation = "https://docs.rs/geo-postgis/"
 readme = "../README.md"

diff --git a/geo-types/CHANGES.md b/geo-types/CHANGES.md
@@ -4,6 +4,8 @@
 
 * Pin `arbitrary` version to 1.1.3 until our MSRV catches up with its latest release 
 * Add `point.x_mut()` and `point.y_mut()` methods on `Points`
+* Changed license field to [SPDX 2.1 license expression](https://spdx.dev/spdx-specification-21-web-version/#h.jxpfx0ykyb60)
+  * <https://github.com/georust/geo/pull/928>
 
 ## 0.7.7
 

diff --git a/geo-types/Cargo.toml b/geo-types/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "geo-types"
 version = "0.7.7"
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
 repository = "https://github.com/georust/geo"
 documentation = "https://docs.rs/geo-types/"
 readme = "../README.md"

diff --git a/geo/CHANGES.md b/geo/CHANGES.md
@@ -7,6 +7,9 @@
   * <https://github.com/georust/geo/pull/907>
 * Added outlier detection algorithm using [LOF](https://en.wikipedia.org/wiki/Local_outlier_factor)
   * <https://github.com/georust/geo/pull/904>
+* Changed license field to [SPDX 2.1 license expression](https://spdx.dev/spdx-specification-21-web-version/#h.jxpfx0ykyb60)
+  * <https://github.com/georust/geo/pull/928>
+
 
 ## 0.23.0
 

diff --git a/geo/Cargo.toml b/geo/Cargo.toml
@@ -2,7 +2,7 @@
 name = "geo"
 description = "Geospatial primitives and algorithms"
 version = "0.23.0"
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
 repository = "https://github.com/georust/geo"
 documentation = "https://docs.rs/geo/"
 readme = "../README.md"