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>

16 files changed, 16 insertions, 16 deletions

diff --git a/codecs/G711a/G711adecode.c b/codecs/G711a/G711adecode.c
index 1fd122b820..2c4d9727cf 100644
--- a/codecs/G711a/G711adecode.c
+++ b/codecs/G711a/G711adecode.c
@@ -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 "config.h"
 
diff --git a/codecs/G711a/G711adecode.h b/codecs/G711a/G711adecode.h
index 2d229a6d71..688d85d50d 100644
--- a/codecs/G711a/G711adecode.h
+++ b/codecs/G711a/G711adecode.h
@@ -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*/
 
 #ifndef __CODECS_G711ADECODE_H__
 #define __CODECS_G711ADECODE_H__
diff --git a/codecs/G711a/G711atable.h b/codecs/G711a/G711atable.h
index ce74f19937..d4235ded74 100644
--- a/codecs/G711a/G711atable.h
+++ b/codecs/G711a/G711atable.h
@@ -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*/
 
 gint16 alaw_exp_table[256] = {
       -5504, -5248, -6016, -5760, -4480, -4224, -4992, -4736,
diff --git a/codecs/G711u/G711udecode.c b/codecs/G711u/G711udecode.c
index 4344d6399d..d235a3bc10 100644
--- a/codecs/G711u/G711udecode.c
+++ b/codecs/G711u/G711udecode.c
@@ -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 "config.h"
 
diff --git a/codecs/G711u/G711udecode.h b/codecs/G711u/G711udecode.h
index 988cfa83db..dedf2bf451 100644
--- a/codecs/G711u/G711udecode.h
+++ b/codecs/G711u/G711udecode.h
@@ -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*/
 
 #ifndef __CODECS_G711UDECODE_H__
 #define __CODECS_G711UDECODE_H__
diff --git a/codecs/G711u/G711utable.h b/codecs/G711u/G711utable.h
index ceb9df9ca9..548dc3e573 100644
--- a/codecs/G711u/G711utable.h
+++ b/codecs/G711u/G711utable.h
@@ -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*/
 
 gint16 ulaw_exp_table[256] = {
    -32124,-31100,-30076,-29052,-28028,-27004,-25980,-24956,
diff --git a/codecs/G722/G722decode.c b/codecs/G722/G722decode.c
index b9baa2a3ef..08c6473f2f 100644
--- a/codecs/G722/G722decode.c
+++ b/codecs/G722/G722decode.c
@@ -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 "config.h"
 
diff --git a/codecs/G722/G722decode.h b/codecs/G722/G722decode.h
index c38e5f197a..1bf603b8ae 100644
--- a/codecs/G722/G722decode.h
+++ b/codecs/G722/G722decode.h
@@ -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*/
 
 #ifndef __CODECS_G722DECODE_H__
 #define __CODECS_G722DECODE_H__
diff --git a/codecs/G726/G726decode.c b/codecs/G726/G726decode.c
index 3edfa09237..1ed0066759 100644
--- a/codecs/G726/G726decode.c
+++ b/codecs/G726/G726decode.c
@@ -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 "config.h"
 
diff --git a/codecs/G726/G726decode.h b/codecs/G726/G726decode.h
index b9bbce346b..4ae50d2c67 100644
--- a/codecs/G726/G726decode.h
+++ b/codecs/G726/G726decode.h
@@ -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*/
 
 #ifndef __CODECS_G726DECODE_H__
 #define __CODECS_G726DECODE_H__
diff --git a/codecs/G729/G729decode.c b/codecs/G729/G729decode.c
index b73e783692..082a0704c6 100644
--- a/codecs/G729/G729decode.c
+++ b/codecs/G729/G729decode.c
@@ -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 "config.h"
 
diff --git a/codecs/G729/G729decode.h b/codecs/G729/G729decode.h
index 36110329f3..d8a0870ca9 100644
--- a/codecs/G729/G729decode.h
+++ b/codecs/G729/G729decode.h
@@ -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*/
 
 #ifndef __CODECS_G729DECODE_H__
 #define __CODECS_G729DECODE_H__
diff --git a/codecs/codecs.c b/codecs/codecs.c
index 5188bfd3c9..4e5f542116 100644
--- a/codecs/codecs.c
+++ b/codecs/codecs.c
@@ -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 "config.h"
diff --git a/codecs/codecs.h b/codecs/codecs.h
index 94dc474fb1..7d2715418c 100644
--- a/codecs/codecs.h
+++ b/codecs/codecs.h
@@ -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*/
 
 #ifndef _CODECS_H_
 #define _CODECS_H_
diff --git a/codecs/sbc/sbc.c b/codecs/sbc/sbc.c
index 809b0300b6..beb614b329 100644
--- a/codecs/sbc/sbc.c
+++ b/codecs/sbc/sbc.c
@@ -7,7 +7,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 "config.h"
 
diff --git a/codecs/sbc/sbc_private.h b/codecs/sbc/sbc_private.h
index 1a23357293..259a4f2acb 100644
--- a/codecs/sbc/sbc_private.h
+++ b/codecs/sbc/sbc_private.h
@@ -7,7 +7,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*/
 
 #ifndef __CODECS_SBC_H__
 #define __CODECS_SBC_H__