spdx: use consistent formatting for GPL-2.0-or-later

Change-Id: If8ffe67f6b624d7f1bcaa278a146e41247720226
Reviewed-on: https://code.wireshark.org/review/26393
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>

diff --git a/epan/dissectors/packet-dplay.c b/epan/dissectors/packet-dplay.c
index 5d3def151d0d762e14d3ad20b6ca479ff9181ed0..bb2f68893ffcbdbfa63036b88b33f2d96c6273b1 100644 (file)
--- a/epan/dissectors/packet-dplay.c
+++ b/epan/dissectors/packet-dplay.c
@@ -6,7 +6,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0-or-later51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * SPDX-License-Identifier: GPL-2.0-or-later
  *
  */
 

diff --git a/epan/dissectors/packet-dpnet.c b/epan/dissectors/packet-dpnet.c
index b4d3b6f6aa7b801e2ee86694e176fd74b21cf21e..247799366125fa7dbaeb352991bb7730cbccf754 100644 (file)
--- a/epan/dissectors/packet-dpnet.c
+++ b/epan/dissectors/packet-dpnet.c
@@ -7,7 +7,7 @@
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
- * SPDX-License-Identifier: GPL-2.0-or-later51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * SPDX-License-Identifier: GPL-2.0-or-later
  *
  */
 

diff --git a/ui/qt/models/coloring_rules_delegate.cpp b/ui/qt/models/coloring_rules_delegate.cpp
index a15c2e44a3c699907a76f5b63923b6a70e10a4c3..4dd3fd3b116c16b6814c5e65f9a5a2e46f5e71c7 100644 (file)
--- a/ui/qt/models/coloring_rules_delegate.cpp
+++ b/ui/qt/models/coloring_rules_delegate.cpp
@@ -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 <ui/qt/models/coloring_rules_delegate.h>

diff --git a/ui/qt/models/coloring_rules_delegate.h b/ui/qt/models/coloring_rules_delegate.h
index 3daf8cb60b3d78822011527130b7a59b0cf34913..1bd05818c9b7d9daa637d1961078774088e4409f 100644 (file)
--- a/ui/qt/models/coloring_rules_delegate.h
+++ b/ui/qt/models/coloring_rules_delegate.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 COLORING_RULE_DELEGATE_H

diff --git a/ui/qt/models/coloring_rules_model.cpp b/ui/qt/models/coloring_rules_model.cpp
index cc210c2aa08ae5c27f65b61746c0c5cf02411103..3e7effae5b7a0f19fa8a49c59a5d4f93cbdb650e 100644 (file)
--- a/ui/qt/models/coloring_rules_model.cpp
+++ b/ui/qt/models/coloring_rules_model.cpp
@@ -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/ui/qt/models/coloring_rules_model.h b/ui/qt/models/coloring_rules_model.h
index a3d727a33a209f75ecddf07678b8e03dcdebb1da..ec4e0a6309a52b7e200e2c354711553d8903fdba 100644 (file)
--- a/ui/qt/models/coloring_rules_model.h
+++ b/ui/qt/models/coloring_rules_model.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 COLORING_RULES_MODEL_H