From cbf25d0f57c81be3569b432d7c99f3ba9037871b Mon Sep 17 00:00:00 2001 From: Rui Chen Date: Wed, 24 Apr 2024 16:38:40 -0400 Subject: [PATCH] license: s/LGPL-2.1+/LGPL-2.1-or-later/g Signed-off-by: Rui Chen --- contrib/generate-version-script.py | 2 +- gusb/gusb-bos-descriptor-private.h | 2 +- gusb/gusb-bos-descriptor.c | 2 +- gusb/gusb-bos-descriptor.h | 2 +- gusb/gusb-context-private.h | 2 +- gusb/gusb-context.c | 2 +- gusb/gusb-context.h | 2 +- gusb/gusb-device-event-private.h | 2 +- gusb/gusb-device-event.c | 2 +- gusb/gusb-device-event.h | 2 +- gusb/gusb-device-list.c | 2 +- gusb/gusb-device-list.h | 2 +- gusb/gusb-device-private.h | 2 +- gusb/gusb-device.c | 2 +- gusb/gusb-device.h | 2 +- gusb/gusb-endpoint-private.h | 2 +- gusb/gusb-endpoint.c | 2 +- gusb/gusb-endpoint.h | 2 +- gusb/gusb-interface-private.h | 2 +- gusb/gusb-interface.c | 2 +- gusb/gusb-interface.h | 2 +- gusb/gusb-json-common.c | 2 +- gusb/gusb-json-common.h | 2 +- gusb/gusb-private.h | 2 +- gusb/gusb-self-test.c | 2 +- gusb/gusb-source.c | 2 +- gusb/gusb-source.h | 2 +- gusb/gusb-umockdev-test.c | 2 +- gusb/gusb-util.c | 2 +- gusb/gusb-util.h | 2 +- gusb/gusb-version.c | 2 +- gusb/gusb-version.h.in | 2 +- gusb/gusb.h | 2 +- meson.build | 2 +- tools/gusb-main.c | 2 +- 35 files changed, 35 insertions(+), 35 deletions(-) diff --git a/contrib/generate-version-script.py b/contrib/generate-version-script.py index ad8463b..e0e0c9d 100644 --- a/contrib/generate-version-script.py +++ b/contrib/generate-version-script.py @@ -2,7 +2,7 @@ # # Copyright (C) 2017 Richard Hughes # -# SPDX-License-Identifier: LGPL-2.1+ +# SPDX-License-Identifier: LGPL-2.1-or-later import sys import xml.etree.ElementTree as ET diff --git a/gusb/gusb-bos-descriptor-private.h b/gusb/gusb-bos-descriptor-private.h index 1b8cde7..8354c0d 100644 --- a/gusb/gusb-bos-descriptor-private.h +++ b/gusb/gusb-bos-descriptor-private.h @@ -2,7 +2,7 @@ * * Copyright (C) 2022 Richard Hughes * - * SPDX-License-Identifier: LGPL-2.1+ + * SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once diff --git a/gusb/gusb-bos-descriptor.c b/gusb/gusb-bos-descriptor.c index 4fb20be..a78ca4c 100644 --- a/gusb/gusb-bos-descriptor.c +++ b/gusb/gusb-bos-descriptor.c @@ -2,7 +2,7 @@ * * Copyright (C) 2022 Richard Hughes * - * SPDX-License-Identifier: LGPL-2.1+ + * SPDX-License-Identifier: LGPL-2.1-or-later */ /** diff --git a/gusb/gusb-bos-descriptor.h b/gusb/gusb-bos-descriptor.h index b230a7c..61371ce 100644 --- a/gusb/gusb-bos-descriptor.h +++ b/gusb/gusb-bos-descriptor.h @@ -2,7 +2,7 @@ * * Copyright (C) 2022 Richard Hughes * - * SPDX-License-Identifier: LGPL-2.1+ + * SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once diff --git a/gusb/gusb-context-private.h b/gusb/gusb-context-private.h index 42b7f77..e65150c 100644 --- a/gusb/gusb-context-private.h +++ b/gusb/gusb-context-private.h @@ -2,7 +2,7 @@ * * Copyright (C) 2011 Richard Hughes * - * SPDX-License-Identifier: LGPL-2.1+ + * SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once diff --git a/gusb/gusb-context.c b/gusb/gusb-context.c index 9ecd41e..d20cbc5 100644 --- a/gusb/gusb-context.c +++ b/gusb/gusb-context.c @@ -3,7 +3,7 @@ * Copyright (C) 2011 Richard Hughes * Copyright (C) 2011 Hans de Goede * - * SPDX-License-Identifier: LGPL-2.1+ + * SPDX-License-Identifier: LGPL-2.1-or-later */ /** diff --git a/gusb/gusb-context.h b/gusb/gusb-context.h index b1d4d54..aedfff0 100644 --- a/gusb/gusb-context.h +++ b/gusb/gusb-context.h @@ -3,7 +3,7 @@ * Copyright (C) 2011 Richard Hughes * Copyright (C) 2011 Hans de Goede * - * SPDX-License-Identifier: LGPL-2.1+ + * SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once diff --git a/gusb/gusb-device-event-private.h b/gusb/gusb-device-event-private.h index 4d4551a..a35e089 100644 --- a/gusb/gusb-device-event-private.h +++ b/gusb/gusb-device-event-private.h @@ -2,7 +2,7 @@ * * Copyright (C) 2022 Richard Hughes * - * SPDX-License-Identifier: LGPL-2.1+ + * SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once diff --git a/gusb/gusb-device-event.c b/gusb/gusb-device-event.c index 3cd9ab5..dcc6f20 100644 --- a/gusb/gusb-device-event.c +++ b/gusb/gusb-device-event.c @@ -2,7 +2,7 @@ * * Copyright (C) 2022 Richard Hughes * - * SPDX-License-Identifier: LGPL-2.1+ + * SPDX-License-Identifier: LGPL-2.1-or-later */ /** diff --git a/gusb/gusb-device-event.h b/gusb/gusb-device-event.h index 73ba808..503ef99 100644 --- a/gusb/gusb-device-event.h +++ b/gusb/gusb-device-event.h @@ -2,7 +2,7 @@ * * Copyright (C) 2022 Richard Hughes * - * SPDX-License-Identifier: LGPL-2.1+ + * SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once diff --git a/gusb/gusb-device-list.c b/gusb/gusb-device-list.c index 5c2ba59..25208da 100644 --- a/gusb/gusb-device-list.c +++ b/gusb/gusb-device-list.c @@ -3,7 +3,7 @@ * Copyright (C) 2011 Hans de Goede * Copyright (C) 2011 Richard Hughes * - * SPDX-License-Identifier: LGPL-2.1+ + * SPDX-License-Identifier: LGPL-2.1-or-later */ /** diff --git a/gusb/gusb-device-list.h b/gusb/gusb-device-list.h index d209e9c..2984bbd 100644 --- a/gusb/gusb-device-list.h +++ b/gusb/gusb-device-list.h @@ -3,7 +3,7 @@ * Copyright (C) 2011 Hans de Goede * Copyright (C) 2011 Richard Hughes * - * SPDX-License-Identifier: LGPL-2.1+ + * SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once diff --git a/gusb/gusb-device-private.h b/gusb/gusb-device-private.h index d1cd376..b96ba62 100644 --- a/gusb/gusb-device-private.h +++ b/gusb/gusb-device-private.h @@ -2,7 +2,7 @@ * * Copyright (C) 2011 Hans de Goede * - * SPDX-License-Identifier: LGPL-2.1+ + * SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once diff --git a/gusb/gusb-device.c b/gusb/gusb-device.c index 223e482..ad81d52 100644 --- a/gusb/gusb-device.c +++ b/gusb/gusb-device.c @@ -4,7 +4,7 @@ * Copyright (C) 2011 Hans de Goede * Copyright (C) 2011 Debarshi Ray * - * SPDX-License-Identifier: LGPL-2.1+ + * SPDX-License-Identifier: LGPL-2.1-or-later */ /** diff --git a/gusb/gusb-device.h b/gusb/gusb-device.h index 3a8a644..40296a9 100644 --- a/gusb/gusb-device.h +++ b/gusb/gusb-device.h @@ -3,7 +3,7 @@ * Copyright (C) 2010 Richard Hughes * Copyright (C) 2011 Hans de Goede * - * SPDX-License-Identifier: LGPL-2.1+ + * SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once diff --git a/gusb/gusb-endpoint-private.h b/gusb/gusb-endpoint-private.h index 88c11f6..ed08be3 100644 --- a/gusb/gusb-endpoint-private.h +++ b/gusb/gusb-endpoint-private.h @@ -3,7 +3,7 @@ * Copyright (C) 2020 Emmanuel Pacaud * Copyright (C) 2022 Richard Hughes * - * SPDX-License-Identifier: LGPL-2.1+ + * SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once diff --git a/gusb/gusb-endpoint.c b/gusb/gusb-endpoint.c index 3898e4f..c754b94 100644 --- a/gusb/gusb-endpoint.c +++ b/gusb/gusb-endpoint.c @@ -2,7 +2,7 @@ * * Copyright (C) 2020 Emmanuel Pacaud * - * SPDX-License-Identifier: LGPL-2.1+ + * SPDX-License-Identifier: LGPL-2.1-or-later */ /** diff --git a/gusb/gusb-endpoint.h b/gusb/gusb-endpoint.h index c642d32..d0253a2 100644 --- a/gusb/gusb-endpoint.h +++ b/gusb/gusb-endpoint.h @@ -2,7 +2,7 @@ * * Copyright (C) 2020 Emmanuel Pacaud * - * SPDX-License-Identifier: LGPL-2.1+ + * SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once diff --git a/gusb/gusb-interface-private.h b/gusb/gusb-interface-private.h index dcdfde1..f92ee6b 100644 --- a/gusb/gusb-interface-private.h +++ b/gusb/gusb-interface-private.h @@ -2,7 +2,7 @@ * * Copyright (C) 2015 Richard Hughes * - * SPDX-License-Identifier: LGPL-2.1+ + * SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once diff --git a/gusb/gusb-interface.c b/gusb/gusb-interface.c index df29159..f4cc805 100644 --- a/gusb/gusb-interface.c +++ b/gusb/gusb-interface.c @@ -3,7 +3,7 @@ * Copyright (C) 2015 Richard Hughes * Copyright (C) 2020 Emmanuel Pacaud * - * SPDX-License-Identifier: LGPL-2.1+ + * SPDX-License-Identifier: LGPL-2.1-or-later */ /** diff --git a/gusb/gusb-interface.h b/gusb/gusb-interface.h index 523e1dd..874915e 100644 --- a/gusb/gusb-interface.h +++ b/gusb/gusb-interface.h @@ -3,7 +3,7 @@ * Copyright (C) 2015 Richard Hughes * Copyright (C) 2020 Emmanuel Pacaud * - * SPDX-License-Identifier: LGPL-2.1+ + * SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once diff --git a/gusb/gusb-json-common.c b/gusb/gusb-json-common.c index 5c93932..44d877e 100644 --- a/gusb/gusb-json-common.c +++ b/gusb/gusb-json-common.c @@ -3,7 +3,7 @@ * Copyright (C) 2023 Collabora Ltd. * @author Frédéric Danis * - * SPDX-License-Identifier: LGPL-2.1+ + * SPDX-License-Identifier: LGPL-2.1-or-later */ #include "config.h" diff --git a/gusb/gusb-json-common.h b/gusb/gusb-json-common.h index c6b8a2a..a5358dc 100644 --- a/gusb/gusb-json-common.h +++ b/gusb/gusb-json-common.h @@ -3,7 +3,7 @@ * Copyright (C) 2023 Collabora Ltd. * @author Frédéric Danis * - * SPDX-License-Identifier: LGPL-2.1+ + * SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once diff --git a/gusb/gusb-private.h b/gusb/gusb-private.h index 1490726..b1065f8 100644 --- a/gusb/gusb-private.h +++ b/gusb/gusb-private.h @@ -2,7 +2,7 @@ * * Copyright (C) 2011 Richard Hughes * - * SPDX-License-Identifier: LGPL-2.1+ + * SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once diff --git a/gusb/gusb-self-test.c b/gusb/gusb-self-test.c index 26dd4f5..2195754 100644 --- a/gusb/gusb-self-test.c +++ b/gusb/gusb-self-test.c @@ -2,7 +2,7 @@ * * Copyright (C) 2011 Richard Hughes * - * SPDX-License-Identifier: LGPL-2.1+ + * SPDX-License-Identifier: LGPL-2.1-or-later */ #include "config.h" diff --git a/gusb/gusb-source.c b/gusb/gusb-source.c index becb8c8..a68add7 100644 --- a/gusb/gusb-source.c +++ b/gusb/gusb-source.c @@ -3,7 +3,7 @@ * Copyright (C) 2010 Richard Hughes * Copyright (C) 2011 Hans de Goede * - * SPDX-License-Identifier: LGPL-2.1+ + * SPDX-License-Identifier: LGPL-2.1-or-later */ /** diff --git a/gusb/gusb-source.h b/gusb/gusb-source.h index cd4bca0..85c894d 100644 --- a/gusb/gusb-source.h +++ b/gusb/gusb-source.h @@ -3,7 +3,7 @@ * Copyright (C) 2010 Richard Hughes * Copyright (C) 2011 Hans de Goede * - * SPDX-License-Identifier: LGPL-2.1+ + * SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once diff --git a/gusb/gusb-umockdev-test.c b/gusb/gusb-umockdev-test.c index e1b7714..464a352 100644 --- a/gusb/gusb-umockdev-test.c +++ b/gusb/gusb-umockdev-test.c @@ -3,7 +3,7 @@ * * Copyright (C) 2022 Benjamin Berg * - * SPDX-License-Identifier: LGPL-2.1+ + * SPDX-License-Identifier: LGPL-2.1-or-later */ #include diff --git a/gusb/gusb-util.c b/gusb/gusb-util.c index 0456e52..24a713c 100644 --- a/gusb/gusb-util.c +++ b/gusb/gusb-util.c @@ -2,7 +2,7 @@ * * Copyright (C) 2011 Hans de Goede * - * SPDX-License-Identifier: LGPL-2.1+ + * SPDX-License-Identifier: LGPL-2.1-or-later */ #include "config.h" diff --git a/gusb/gusb-util.h b/gusb/gusb-util.h index ed26eb3..5405931 100644 --- a/gusb/gusb-util.h +++ b/gusb/gusb-util.h @@ -2,7 +2,7 @@ * * Copyright (C) 2011 Hans de Goede * - * SPDX-License-Identifier: LGPL-2.1+ + * SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once diff --git a/gusb/gusb-version.c b/gusb/gusb-version.c index e4630f8..18a5126 100644 --- a/gusb/gusb-version.c +++ b/gusb/gusb-version.c @@ -2,7 +2,7 @@ * * Copyright (C) 2018 Richard Hughes * - * SPDX-License-Identifier: LGPL-2.1+ + * SPDX-License-Identifier: LGPL-2.1-or-later */ #include "config.h" diff --git a/gusb/gusb-version.h.in b/gusb/gusb-version.h.in index f2510c2..64db6cd 100644 --- a/gusb/gusb-version.h.in +++ b/gusb/gusb-version.h.in @@ -2,7 +2,7 @@ * * Copyright (C) 2010 Richard Hughes * - * SPDX-License-Identifier: LGPL-2.1+ + * SPDX-License-Identifier: LGPL-2.1-or-later */ /** diff --git a/gusb/gusb.h b/gusb/gusb.h index 30bc511..52d1f30 100644 --- a/gusb/gusb.h +++ b/gusb/gusb.h @@ -2,7 +2,7 @@ * * Copyright (C) 2010 Richard Hughes * - * SPDX-License-Identifier: LGPL-2.1+ + * SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once diff --git a/meson.build b/meson.build index 244dee1..5fe82da 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,6 @@ project('libgusb', 'c', version : '0.4.9', - license : 'LGPL-2.1+', + license : 'LGPL-2.1-or-later', meson_version : '>=0.56.0', default_options : ['c_std=c99'] ) diff --git a/tools/gusb-main.c b/tools/gusb-main.c index c5f1a1b..372579a 100644 --- a/tools/gusb-main.c +++ b/tools/gusb-main.c @@ -2,7 +2,7 @@ * * Copyright (C) 2011 Richard Hughes * - * SPDX-License-Identifier: LGPL-2.1+ + * SPDX-License-Identifier: LGPL-2.1-or-later */ #include "config.h"