diff options
| author | Simon McVittie <smcv@collabora.com> | 2019-07-15 12:56:31 +0100 |
|---|---|---|
| committer | Simon McVittie <smcv@collabora.com> | 2019-07-15 12:56:31 +0100 |
| commit | e977a44dcebb76a971cf6593e0fc2649269525b6 (patch) | |
| tree | 7493d37eeeae278ce0ea6726bd379311c22be233 | |
| parent | 96479fb8fd5e2f8896cdce7feff7839dcb47a7d1 (diff) | |
| parent | d42176ae4763e5288ef37ea314fe58387faf2005 (diff) | |
| download | dbus-glib-e977a44dcebb76a971cf6593e0fc2649269525b6.tar.gz | |
Merge branch 'dbus-gmain'
| -rw-r--r-- | dbus-gmain/COPYING | 7 | ||||
| -rw-r--r-- | dbus-gmain/Makefile.am | 2 | ||||
| -rw-r--r-- | dbus-gmain/dbus-gmain.c | 2 | ||||
| -rw-r--r-- | dbus-gmain/dbus-gmain.h | 2 | ||||
| -rw-r--r-- | dbus-gmain/tests/30574.c | 2 | ||||
| -rw-r--r-- | dbus-gmain/tests/test-thread-client.c | 2 | ||||
| -rw-r--r-- | dbus-gmain/tests/test-thread-server.c | 2 | ||||
| -rw-r--r-- | dbus-gmain/tests/util.c | 2 | ||||
| -rw-r--r-- | dbus-gmain/tests/util.h | 2 |
9 files changed, 21 insertions, 2 deletions
diff --git a/dbus-gmain/COPYING b/dbus-gmain/COPYING index 7096505..d89d965 100644 --- a/dbus-gmain/COPYING +++ b/dbus-gmain/COPYING @@ -1,7 +1,10 @@ The D-Bus GLib main loop bindings are licensed to you under your choice of the Academic Free License version 2.1, or the GNU General Public -License version 2. Both licenses are included here. Each source code -file is marked with the proper copyright information. +License version 2. Both licenses are included here. + +In SPDX terms, this is: + +SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later ------------------------------------------------------------------------ diff --git a/dbus-gmain/Makefile.am b/dbus-gmain/Makefile.am index 3e60286..63a1a2a 100644 --- a/dbus-gmain/Makefile.am +++ b/dbus-gmain/Makefile.am @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later + EXTRA_DIST = \ AUTHORS \ CONTRIBUTING.md \ diff --git a/dbus-gmain/dbus-gmain.c b/dbus-gmain/dbus-gmain.c index bea89aa..06a480c 100644 --- a/dbus-gmain/dbus-gmain.c +++ b/dbus-gmain/dbus-gmain.c @@ -8,6 +8,8 @@ * Copyright © 2006-2018 Collabora Ltd. * Copyright © 2010-2012 Mike Gorse * + * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later + * * Licensed under the Academic Free License version 2.1 * * This program is free software; you can redistribute it and/or modify diff --git a/dbus-gmain/dbus-gmain.h b/dbus-gmain/dbus-gmain.h index e887942..b8df034 100644 --- a/dbus-gmain/dbus-gmain.h +++ b/dbus-gmain/dbus-gmain.h @@ -4,6 +4,8 @@ * Copyright (C) 2002, 2003 CodeFactory AB * Copyright (C) 2003, 2004 Red Hat, Inc. * + * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later + * * Licensed under the Academic Free License version 2.1 * * This program is free software; you can redistribute it and/or modify diff --git a/dbus-gmain/tests/30574.c b/dbus-gmain/tests/30574.c index ca7b79f..bcc1276 100644 --- a/dbus-gmain/tests/30574.c +++ b/dbus-gmain/tests/30574.c @@ -2,6 +2,8 @@ * Copyright © 2010-2012 Mike Gorse * Copyright © 2011-2018 Collabora Ltd. * + * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later + * * Licensed under the Academic Free License version 2.1 * * This program is free software; you can redistribute it and/or modify diff --git a/dbus-gmain/tests/test-thread-client.c b/dbus-gmain/tests/test-thread-client.c index dbe92f8..a115d41 100644 --- a/dbus-gmain/tests/test-thread-client.c +++ b/dbus-gmain/tests/test-thread-client.c @@ -2,6 +2,8 @@ * Copyright © 2003 Red Hat Inc. * Copyright © 2006-2018 Collabora Ltd. * + * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later + * * Licensed under the Academic Free License version 2.1 * * This program is free software; you can redistribute it and/or modify diff --git a/dbus-gmain/tests/test-thread-server.c b/dbus-gmain/tests/test-thread-server.c index c8839d1..54f43b6 100644 --- a/dbus-gmain/tests/test-thread-server.c +++ b/dbus-gmain/tests/test-thread-server.c @@ -2,6 +2,8 @@ * Copyright © 2003-2006 Red Hat Inc. * Copyright © 2006-2018 Collabora Ltd. * + * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later + * * Licensed under the Academic Free License version 2.1 * * This program is free software; you can redistribute it and/or modify diff --git a/dbus-gmain/tests/util.c b/dbus-gmain/tests/util.c index d5fbe2f..07da5d9 100644 --- a/dbus-gmain/tests/util.c +++ b/dbus-gmain/tests/util.c @@ -3,6 +3,8 @@ * Copyright © 2009-2018 Collabora Ltd. <http://www.collabora.co.uk/> * Copyright © 2009-2011 Nokia Corporation * + * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later + * * Licensed under the Academic Free License version 2.1 * * This program is free software; you can redistribute it and/or modify diff --git a/dbus-gmain/tests/util.h b/dbus-gmain/tests/util.h index d9d7ced..0d8bfa3 100644 --- a/dbus-gmain/tests/util.h +++ b/dbus-gmain/tests/util.h @@ -3,6 +3,8 @@ * Copyright © 2009-2018 Collabora Ltd. <http://www.collabora.co.uk/> * Copyright © 2009-2011 Nokia Corporation * + * SPDX-License-Identifier: AFL-2.1 OR GPL-2.0-or-later + * * Licensed under the Academic Free License version 2.1 * * This program is free software; you can redistribute it and/or modify |