Skip to content

Commit ed7b6a9

Browse files
mmstickjackpot51
authored andcommitted
chore(license): Relicense library + service to MPL-2.0
As the sole author of the library and service, I elect to relicense the code that I have written from GPL-3.0 to MPL-2.0. This is to preserve copyleft-ability while permitting linking of pop-launcher's libraries. The launcher binary and its plugins shall remain as GPL-3.0, as they are separate binaries with no need for linking to a frontend.
1 parent 9f78211 commit ed7b6a9

File tree

16 files changed

+402
-37
lines changed

16 files changed

+402
-37
lines changed

Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "pop-launcher"
33
version = "1.1.0"
4-
license = "GPL-3.0-only"
4+
license = "MPL-2.0"
55
authors = ["Michael Aaron Murphy <mmstick@pm.me>"]
66
description = "Library for writing plugins and frontends for pop-launcher"
77
repository = "https://github.com/pop-os/launcher"

LICENSE

+373
Large diffs are not rendered by default.

bin/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
name = "pop-launcher-bin"
33
version = "1.1.0"
44
edition = "2018"
5+
license = "GPL-3.0-only"
56
publish = false
67

78
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

bin/src/main.rs

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// Copyright 2021 System76 <info@system76.com>
2+
// SPDX-License-Identifier: MPL-2.0
3+
14
use pop_launcher_plugins as plugins;
25
use pop_launcher_service as service;
36
use smol::block_on;

debian/copyright

+5-17
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,8 @@ Source: https://github.com/pop-os/launcher
55

66
Files: *
77
Copyright: 2021 System76 <info@system76.com>
8-
License: GPL-3.0
9-
This software is free software; you can redistribute it and/or
10-
modify it under the terms of the GNU General Public
11-
License as published by the Free Software Foundation; either
12-
version 3 of the License, or (at your option) any later version.
13-
.
14-
This software is distributed in the hope that it will be useful,
15-
but WITHOUT ANY WARRANTY; without even the implied warranty of
16-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
17-
General Public License for more details.
18-
.
19-
You should have received a copy of the GNU General Public
20-
License along with this software; if not, write to the Free Software
21-
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
22-
.
23-
On Debian systems, the complete text of the GNU General
24-
Public License can be found in `/usr/share/common-licenses/LGPL-3'
8+
License: MPL-2.0
9+
10+
Files: debian/* plugins/*
11+
Copyright: 2021 System76 <info@system76.com>
12+
License: GPL-3

COPYING plugins/COPYING

File renamed without changes.

service/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "pop-launcher-service"
33
version= "1.1.0"
4-
license = "GPL-3.0-only"
4+
license = "MPL-2.0"
55
edition = "2018"
66

77
[dependencies]

service/src/lib.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// SPDX-License-Identifier: GPL-3.0-only
2-
// Copyright © 2021 System76
1+
// Copyright 2021 System76 <info@system76.com>
2+
// SPDX-License-Identifier: MPL-2.0
33

44
mod plugins;
55

service/src/plugins/config.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// SPDX-License-Identifier: GPL-3.0-only
2-
// Copyright © 2021 System76
1+
// Copyright 2021 System76 <info@system76.com>
2+
// SPDX-License-Identifier: MPL-2.0
33

44
use regex::Regex;
55
use serde::Deserialize;

service/src/plugins/external/load.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// SPDX-License-Identifier: GPL-3.0-only
2-
// Copyright © 2021 System76
1+
// Copyright 2021 System76 <info@system76.com>
2+
// SPDX-License-Identifier: MPL-2.0
33

44
use crate::PluginConfig;
55

service/src/plugins/external/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// SPDX-License-Identifier: GPL-3.0-only
2-
// Copyright © 2021 System76
1+
// Copyright 2021 System76 <info@system76.com>
2+
// SPDX-License-Identifier: MPL-2.0
33

44
pub mod load;
55

service/src/plugins/help.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// SPDX-License-Identifier: GPL-3.0-only
2-
// Copyright © 2021 System76
1+
// Copyright 2021 System76 <info@system76.com>
2+
// SPDX-License-Identifier: MPL-2.0
33

44
use crate::*;
55
use pop_launcher::*;

service/src/plugins/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// SPDX-License-Identifier: GPL-3.0-only
2-
// Copyright © 2021 System76
1+
// Copyright 2021 System76 <info@system76.com>
2+
// SPDX-License-Identifier: MPL-2.0
33

44
mod config;
55
pub(crate) mod external;

src/codec.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// SPDX-License-Identifier: GPL-3.0-only
2-
// Copyright © 2021 System76
1+
// Copyright 2021 System76 <info@system76.com>
2+
// SPDX-License-Identifier: MPL-2.0
33

44
use blocking::Unblock;
55
use futures_lite::{AsyncBufReadExt, AsyncRead, Stream, StreamExt};

src/config.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// SPDX-License-Identifier: GPL-3.0-only
2-
// Copyright © 2021 System76
1+
// Copyright 2021 System76 <info@system76.com>
2+
// SPDX-License-Identifier: MPL-2.0
33

44
use std::path::PathBuf;
55

src/lib.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// SPDX-License-Identifier: GPL-3.0-only
2-
// Copyright © 2021 System76
1+
// Copyright 2021 System76 <info@system76.com>
2+
// SPDX-License-Identifier: MPL-2.0
33

44
mod codec;
55
pub mod config;

0 commit comments

Comments
 (0)