diff options
author | Dario Lombardo <lomato@gmail.com> | 2018-02-07 12:26:45 +0100 |
---|---|---|
committer | Anders Broman <a.broman58@gmail.com> | 2018-02-08 14:57:36 +0000 |
commit | 8cd389e16166fa4c075fbddfe69f26653a0169b3 (patch) | |
tree | 1bea70a898b41c700cfe8f192dae3ba7e08b3626 /plugins | |
parent | bfd2dbcf25749d9f1481c479af4aab098069c303 (diff) |
replace SPDX identifier GPL-2.0+ with GPL-2.0-or-later.
The first is deprecated, as per https://spdx.org/licenses/.
Change-Id: I8e21e1d32d09b8b94b93a2dc9fbdde5ffeba6bed
Reviewed-on: https://code.wireshark.org/review/25661
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/codecs/Makefile.am.inc | 2 | ||||
-rw-r--r-- | plugins/epan/Makefile.am.inc | 2 | ||||
-rw-r--r-- | plugins/wiretap/Makefile.am.inc | 2 | ||||
-rw-r--r-- | plugins/wiretap/usbdump/CMakeLists.txt | 2 | ||||
-rw-r--r-- | plugins/wiretap/usbdump/Makefile.am | 2 | ||||
-rw-r--r-- | plugins/wiretap/usbdump/usbdump.c | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/plugins/codecs/Makefile.am.inc b/plugins/codecs/Makefile.am.inc index 14ac941b08..fb1b6d7770 100644 --- a/plugins/codecs/Makefile.am.inc +++ b/plugins/codecs/Makefile.am.inc @@ -5,7 +5,7 @@ # By Gerald Combs <gerald@wireshark.org> # Copyright 1998 Gerald Combs # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # include $(top_srcdir)/plugins/Makefile.am.inc diff --git a/plugins/epan/Makefile.am.inc b/plugins/epan/Makefile.am.inc index 5c7f5256ec..4d3f145225 100644 --- a/plugins/epan/Makefile.am.inc +++ b/plugins/epan/Makefile.am.inc @@ -5,7 +5,7 @@ # By Gerald Combs <gerald@wireshark.org> # Copyright 1998 Gerald Combs # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # include $(top_srcdir)/plugins/Makefile.am.inc diff --git a/plugins/wiretap/Makefile.am.inc b/plugins/wiretap/Makefile.am.inc index eab1328465..384ea2e170 100644 --- a/plugins/wiretap/Makefile.am.inc +++ b/plugins/wiretap/Makefile.am.inc @@ -5,7 +5,7 @@ # By Gerald Combs <gerald@wireshark.org> # Copyright 1998 Gerald Combs # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # include $(top_srcdir)/plugins/Makefile.am.inc diff --git a/plugins/wiretap/usbdump/CMakeLists.txt b/plugins/wiretap/usbdump/CMakeLists.txt index 5093353ff3..2c6b22af8e 100644 --- a/plugins/wiretap/usbdump/CMakeLists.txt +++ b/plugins/wiretap/usbdump/CMakeLists.txt @@ -4,7 +4,7 @@ # By Gerald Combs <gerald@wireshark.org> # Copyright 1998 Gerald Combs # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # include(WiresharkPlugin) diff --git a/plugins/wiretap/usbdump/Makefile.am b/plugins/wiretap/usbdump/Makefile.am index b090b19e27..dd12ad96ac 100644 --- a/plugins/wiretap/usbdump/Makefile.am +++ b/plugins/wiretap/usbdump/Makefile.am @@ -4,7 +4,7 @@ # By Gerald Combs <gerald@wireshark.org> # Copyright 1998 Gerald Combs # -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0-or-later # include $(top_srcdir)/Makefile.am.inc diff --git a/plugins/wiretap/usbdump/usbdump.c b/plugins/wiretap/usbdump/usbdump.c index b52c94be09..99b88a2f1a 100644 --- a/plugins/wiretap/usbdump/usbdump.c +++ b/plugins/wiretap/usbdump/usbdump.c @@ -6,7 +6,7 @@ * File format support for usbdump file format * Copyright (c) 2017 by Jaap Keuter <jaap.keuter@xs4all.nl> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0-or-later */ /* |