summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2020-02-16 15:59:46 +0100
committerThomas Haller <thaller@redhat.com>2020-02-16 15:59:46 +0100
commitb2d3ba33a7a91f37b1aa53b70e338271da496a4a (patch)
treec4208f7a56aea9f564693063e7de3e985bd9979f
parent146743ecff0d55281f7affffc78cce1d1b7c29af (diff)
parent6963ecf0d1b14e0057b2be3b823bddaa69b055ec (diff)
license: merge branch 'th/fix-lgpl-license-violations' (part 1)
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/merge_requests/390
-rw-r--r--libnm-core/nm-errors.h2
-rw-r--r--shared/nm-glib-aux/nm-glib.h2
-rw-r--r--shared/nm-glib-aux/nm-jansson.h2
-rw-r--r--shared/nm-libnm-core-intern/nm-auth-subject.c2
-rw-r--r--shared/nm-libnm-core-intern/nm-auth-subject.h2
-rw-r--r--shared/nm-utils/nm-vpn-editor-plugin-call.h2
-rw-r--r--shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h2
7 files changed, 7 insertions, 7 deletions
diff --git a/libnm-core/nm-errors.h b/libnm-core/nm-errors.h
index 0b54133dc..031cc670b 100644
--- a/libnm-core/nm-errors.h
+++ b/libnm-core/nm-errors.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: LGPL-2.1+
/*
* Copyright (C) 2004 - 2014 Red Hat, Inc.
*/
diff --git a/shared/nm-glib-aux/nm-glib.h b/shared/nm-glib-aux/nm-glib.h
index e9d89ae0e..4ecba9ffc 100644
--- a/shared/nm-glib-aux/nm-glib.h
+++ b/shared/nm-glib-aux/nm-glib.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: LGPL-2.1+
/*
* Copyright (C) 2008 - 2018 Red Hat, Inc.
*/
diff --git a/shared/nm-glib-aux/nm-jansson.h b/shared/nm-glib-aux/nm-jansson.h
index 0a75cff5b..7c034222c 100644
--- a/shared/nm-glib-aux/nm-jansson.h
+++ b/shared/nm-glib-aux/nm-jansson.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: LGPL-2.1+
/*
* Copyright (C) 2018 Red Hat, Inc.
*/
diff --git a/shared/nm-libnm-core-intern/nm-auth-subject.c b/shared/nm-libnm-core-intern/nm-auth-subject.c
index 7d864e31a..15c2d6529 100644
--- a/shared/nm-libnm-core-intern/nm-auth-subject.c
+++ b/shared/nm-libnm-core-intern/nm-auth-subject.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: LGPL-2.1+
/*
* Copyright (C) 2013 - 2014 Red Hat, Inc.
*/
diff --git a/shared/nm-libnm-core-intern/nm-auth-subject.h b/shared/nm-libnm-core-intern/nm-auth-subject.h
index e885c4ea9..fc37b8e2b 100644
--- a/shared/nm-libnm-core-intern/nm-auth-subject.h
+++ b/shared/nm-libnm-core-intern/nm-auth-subject.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: LGPL-2.1+
/*
* Copyright (C) 2013 Red Hat, Inc.
*/
diff --git a/shared/nm-utils/nm-vpn-editor-plugin-call.h b/shared/nm-utils/nm-vpn-editor-plugin-call.h
index ab4730839..b2c39e298 100644
--- a/shared/nm-utils/nm-vpn-editor-plugin-call.h
+++ b/shared/nm-utils/nm-vpn-editor-plugin-call.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: LGPL-2.1+
/*
* Copyright (C) 2016 Red Hat, Inc.
*/
diff --git a/shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h b/shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h
index d4df97d6e..231e06bda 100644
--- a/shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h
+++ b/shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: LGPL-2.1+
/*
* Copyright (C) 2014 - 2018 Red Hat, Inc.
*/