diff options
author | Sebastian Dröge <sebastian@centricular.com> | 2022-03-14 11:22:53 +0300 |
---|---|---|
committer | Sebastian Dröge <sebastian@centricular.com> | 2022-03-14 11:23:16 +0300 |
commit | 6cf7d28481ddccf5c8eb84f639a7608c50314786 (patch) | |
tree | ce7193e9cd8d006e08e2e5f5c130d524d8ed49fc /tutorial | |
parent | aac7e52d87a37bf8bbe8d1e6e9a0e6fa55eeae77 (diff) |
Use SPDX license format in Cargo.toml
Diffstat (limited to 'tutorial')
-rw-r--r-- | tutorial/Cargo.toml | 2 | ||||
-rw-r--r-- | tutorial/src/identity/imp.rs | 2 | ||||
-rw-r--r-- | tutorial/src/identity/mod.rs | 2 | ||||
-rw-r--r-- | tutorial/src/lib.rs | 2 | ||||
-rw-r--r-- | tutorial/src/progressbin/imp.rs | 2 | ||||
-rw-r--r-- | tutorial/src/progressbin/mod.rs | 2 | ||||
-rw-r--r-- | tutorial/src/rgb2gray/imp.rs | 2 | ||||
-rw-r--r-- | tutorial/src/rgb2gray/mod.rs | 2 | ||||
-rw-r--r-- | tutorial/src/sinesrc/imp.rs | 2 | ||||
-rw-r--r-- | tutorial/src/sinesrc/mod.rs | 2 | ||||
-rw-r--r-- | tutorial/tutorial-1.md | 2 |
11 files changed, 11 insertions, 11 deletions
diff --git a/tutorial/Cargo.toml b/tutorial/Cargo.toml index c94f980ae..5103ea71f 100644 --- a/tutorial/Cargo.toml +++ b/tutorial/Cargo.toml @@ -3,7 +3,7 @@ name = "gst-plugin-tutorial" version = "0.9.0" authors = ["Sebastian Dröge <sebastian@centricular.com>"] repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs" -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" edition = "2021" rust-version = "1.57" description = "Rust Tutorial Plugin" diff --git a/tutorial/src/identity/imp.rs b/tutorial/src/identity/imp.rs index 1e5c72e87..e166a0d19 100644 --- a/tutorial/src/identity/imp.rs +++ b/tutorial/src/identity/imp.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::glib; use gst::prelude::*; diff --git a/tutorial/src/identity/mod.rs b/tutorial/src/identity/mod.rs index 19bfd861e..6ff031999 100644 --- a/tutorial/src/identity/mod.rs +++ b/tutorial/src/identity/mod.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::glib; use gst::prelude::*; diff --git a/tutorial/src/lib.rs b/tutorial/src/lib.rs index 9a4a8eeb6..9f7998ef0 100644 --- a/tutorial/src/lib.rs +++ b/tutorial/src/lib.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 #![allow(clippy::non_send_fields_in_send_ty)] use gst::glib; diff --git a/tutorial/src/progressbin/imp.rs b/tutorial/src/progressbin/imp.rs index c65eedbc0..e8dbbc772 100644 --- a/tutorial/src/progressbin/imp.rs +++ b/tutorial/src/progressbin/imp.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::glib; use gst::prelude::*; diff --git a/tutorial/src/progressbin/mod.rs b/tutorial/src/progressbin/mod.rs index 52efa9a33..5cb4dcddb 100644 --- a/tutorial/src/progressbin/mod.rs +++ b/tutorial/src/progressbin/mod.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::glib; use gst::prelude::*; diff --git a/tutorial/src/rgb2gray/imp.rs b/tutorial/src/rgb2gray/imp.rs index 2da282c51..5ff2cd612 100644 --- a/tutorial/src/rgb2gray/imp.rs +++ b/tutorial/src/rgb2gray/imp.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::glib; use gst::prelude::*; diff --git a/tutorial/src/rgb2gray/mod.rs b/tutorial/src/rgb2gray/mod.rs index 345cc5196..45acdd64d 100644 --- a/tutorial/src/rgb2gray/mod.rs +++ b/tutorial/src/rgb2gray/mod.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::glib; use gst::prelude::*; diff --git a/tutorial/src/sinesrc/imp.rs b/tutorial/src/sinesrc/imp.rs index ea3897a17..e412a8f9d 100644 --- a/tutorial/src/sinesrc/imp.rs +++ b/tutorial/src/sinesrc/imp.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::glib; use gst::prelude::*; diff --git a/tutorial/src/sinesrc/mod.rs b/tutorial/src/sinesrc/mod.rs index a6dc81eeb..bb95ff41a 100644 --- a/tutorial/src/sinesrc/mod.rs +++ b/tutorial/src/sinesrc/mod.rs @@ -6,7 +6,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. // -// SPDX-License-Identifier: MIT/Apache-2.0 +// SPDX-License-Identifier: MIT OR Apache-2.0 use gst::glib; use gst::prelude::*; diff --git a/tutorial/tutorial-1.md b/tutorial/tutorial-1.md index a190e275f..b60c62116 100644 --- a/tutorial/tutorial-1.md +++ b/tutorial/tutorial-1.md @@ -35,7 +35,7 @@ name = "gst-plugin-tutorial" version = "0.1.0" authors = ["Sebastian Dröge <sebastian@centricular.com>"] repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs" -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" edition = "2018" description = "Rust Tutorial Plugin" |