From d42176ae4763e5288ef37ea314fe58387faf2005 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@collabora.com>
Date: Mon, 15 Jul 2019 12:55:36 +0100
Subject: Add clearer licensing information using SPDX-License-Identifier

Signed-off-by: Simon McVittie <smcv@collabora.com>
---
 COPYING                    | 7 +++++--
 Makefile.am                | 2 ++
 dbus-gmain.c               | 2 ++
 dbus-gmain.h               | 2 ++
 tests/30574.c              | 2 ++
 tests/test-thread-client.c | 2 ++
 tests/test-thread-server.c | 2 ++
 tests/util.c               | 2 ++
 tests/util.h               | 2 ++
 9 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/COPYING b/COPYING
index 7096505..d89d965 100644
--- a/COPYING
+++ b/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/Makefile.am b/Makefile.am
index 3e60286..63a1a2a 100644
--- a/Makefile.am
+++ b/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.c b/dbus-gmain.c
index bea89aa..06a480c 100644
--- a/dbus-gmain.c
+++ b/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.h b/dbus-gmain.h
index e887942..b8df034 100644
--- a/dbus-gmain.h
+++ b/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/tests/30574.c b/tests/30574.c
index ca7b79f..bcc1276 100644
--- a/tests/30574.c
+++ b/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/tests/test-thread-client.c b/tests/test-thread-client.c
index dbe92f8..a115d41 100644
--- a/tests/test-thread-client.c
+++ b/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/tests/test-thread-server.c b/tests/test-thread-server.c
index c8839d1..54f43b6 100644
--- a/tests/test-thread-server.c
+++ b/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/tests/util.c b/tests/util.c
index d5fbe2f..07da5d9 100644
--- a/tests/util.c
+++ b/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/tests/util.h b/tests/util.h
index d9d7ced..0d8bfa3 100644
--- a/tests/util.h
+++ b/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
-- 
cgit v1.2.1