Skip to content

Commit 4b61758

Browse files
committed
chore: Relicense to MPL-2.0
1 parent 7c7c558 commit 4b61758

File tree

8 files changed

+397
-225
lines changed

8 files changed

+397
-225
lines changed

Cargo.toml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@ name = "freedesktop-desktop-entry"
33
version = "0.4.0"
44
authors = ["Michael Aaron Murphy <[email protected]>"]
55
edition = "2018"
6-
homepage = "https://codeberg.org/mmstick/freedesktop-desktop-entry"
7-
repository = "https://codeberg.org/mmstick/freedesktop-desktop-entry"
6+
homepage = "https://github.com/pop-os/freedesktop-desktop-entry"
87
description = "Freedesktop Desktop Entry Specification"
9-
license = "MIT/Apache-2.0"
8+
license = "MPL-2.0"
109
readme = "README.md"
1110
categories = [ "os::unix-apis" ]
1211
keywords = [ "freedesktop", "desktop", "entry" ]

LICENSE

Lines changed: 373 additions & 0 deletions
Large diffs are not rendered by default.

LICENSE-APACHE

Lines changed: 0 additions & 201 deletions
This file was deleted.

LICENSE-MIT

Lines changed: 0 additions & 21 deletions
This file was deleted.

README.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,17 @@ fn main() {
1616
}
1717
}
1818
}
19+
```
20+
21+
## License
22+
23+
Licensed under the [Mozilla Public License 2.0](https://choosealicense.com/licenses/mpl-2.0/). Permissions of this copyleft license are conditioned on making available source code of licensed files and modifications of those files under the same license (or in certain cases, one of the GNU licenses). Copyright and license notices must be preserved. Contributors provide an express grant of patent rights. However, a larger work using the licensed work may be distributed under different terms and without source code for files added in the larger work.
24+
25+
### Contribution
26+
27+
Any contribution intentionally submitted for inclusion in the work by you shall be licensed under the Mozilla Public License 2.0 (MPL-2.0). It is required to add a boilerplate copyright notice to the top of each file:
28+
29+
```rs
30+
// Copyright {year} {person OR org} <{email}>
31+
// SPDX-License-Identifier: MPL-2.0
1932
```

examples/example.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// Copyright 2021 System76 <[email protected]>
2+
// SPDX-License-Identifier: MPL-2.0
3+
14
use std::fs;
25

36
use freedesktop_desktop_entry::{default_paths, DesktopEntry, Iter};

src/iter.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// Copyright 2021 System76 <[email protected]>
2+
// SPDX-License-Identifier: MPL-2.0
3+
14
use crate::PathSource;
25
use std::{fs, path::PathBuf};
36

src/lib.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// Copyright 2021 System76 <[email protected]>
2+
// SPDX-License-Identifier: MPL-2.0
3+
14
#[macro_use]
25
extern crate thiserror;
36

0 commit comments

Comments
 (0)