From 48c2308f445f8c3493d0a4875af5c4172a2157ed Mon Sep 17 00:00:00 2001
From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Mon, 25 Aug 2025 15:46:02 +0200
Subject: [PATCH 1/3] Ugrade reuse config file to modern style

This fixes the following warning when running reuse:

    "PendingDeprecationWarning: '.reuse/dep5' is deprecated.
    You are recommended to instead use REUSE.toml"
---
 .reuse/dep5 | 9 ---------
 REUSE.toml  | 9 +++++++++
 2 files changed, 9 insertions(+), 9 deletions(-)
 delete mode 100644 .reuse/dep5
 create mode 100644 REUSE.toml

diff --git a/.reuse/dep5 b/.reuse/dep5
deleted file mode 100644
index 07c8b23e..00000000
--- a/.reuse/dep5
+++ /dev/null
@@ -1,9 +0,0 @@
-Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: dbus
-Source: https://gitlab.freedesktop.org/dbus/dbus
-
-Files:
- subprojects/*.wrap
-Copyright:
- © 2022-2023 Meson contributors
-License: MIT
diff --git a/REUSE.toml b/REUSE.toml
new file mode 100644
index 00000000..a464d0e1
--- /dev/null
+++ b/REUSE.toml
@@ -0,0 +1,9 @@
+version = 1
+SPDX-PackageName = "dbus"
+SPDX-PackageDownloadLocation = "https://gitlab.freedesktop.org/dbus/dbus"
+
+[[annotations]]
+path = ["subprojects/**.wrap"]
+precedence = "aggregate"
+SPDX-FileCopyrightText = ["© 2022-2023 Meson contributors"]
+SPDX-License-Identifier = "MIT"

From d55d5ef4c967f8363d08cab7efcdeec50fa32348 Mon Sep 17 00:00:00 2001
From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Fri, 7 Nov 2025 12:09:03 +0100
Subject: [PATCH 2/3] Import .license files into REUSE.toml

Signed-off-by: Ralf Habacker <ralf.habacker@freenet.de>
---
 REUSE.toml                                    | 65 +++++++++++++++++++
 .../boolean-has-no-value.message-raw.license  |  2 -
 ...ed-array-not-divisible.message-raw.license |  3 -
 .../issue418.message-raw.license              |  3 -
 .../mis-nested-sig.message-raw.license        |  3 -
 .../truncated-variant-sig.message-raw.license |  2 -
 ...ero-length-variant-sig.message-raw.license |  2 -
 .../byteswap-fd-index.message-raw.license     |  3 -
 .../minimal.message-raw.license               |  2 -
 9 files changed, 65 insertions(+), 20 deletions(-)
 delete mode 100644 test/data/invalid-messages/boolean-has-no-value.message-raw.license
 delete mode 100644 test/data/invalid-messages/fixed-array-not-divisible.message-raw.license
 delete mode 100644 test/data/invalid-messages/issue418.message-raw.license
 delete mode 100644 test/data/invalid-messages/mis-nested-sig.message-raw.license
 delete mode 100644 test/data/invalid-messages/truncated-variant-sig.message-raw.license
 delete mode 100644 test/data/invalid-messages/zero-length-variant-sig.message-raw.license
 delete mode 100644 test/data/valid-messages/byteswap-fd-index.message-raw.license
 delete mode 100644 test/data/valid-messages/minimal.message-raw.license

diff --git a/REUSE.toml b/REUSE.toml
index a464d0e1..9e13228e 100644
--- a/REUSE.toml
+++ b/REUSE.toml
@@ -7,3 +7,68 @@ path = ["subprojects/**.wrap"]
 precedence = "aggregate"
 SPDX-FileCopyrightText = ["© 2022-2023 Meson contributors"]
 SPDX-License-Identifier = "MIT"
+
+[[annotations]]
+path = [
+    "test/data/valid-messages/byteswap-fd-index.message-raw",
+    "test/data/valid-messages/byteswap-fd-index.message-raw.hex"
+]
+precedence = "override"
+SPDX-FileCopyrightText = ["2022 Evgeny Vereshchagin", "2022 Collabora Ltd."]
+SPDX-License-Identifier = "MIT"
+
+[[annotations]]
+path = [
+    "test/data/valid-messages/minimal.message-raw"
+]
+precedence = "override"
+SPDX-FileCopyrightText = ["2022 Collabora Ltd."]
+SPDX-License-Identifier = "MIT"
+
+[[annotations]]
+path = [
+    "test/data/invalid-messages/truncated-variant-sig.message-raw"
+]
+precedence = "override"
+SPDX-FileCopyrightText = ["2022 Collabora Ltd."]
+SPDX-License-Identifier = "MIT"
+
+[[annotations]]
+path = [
+    "test/data/invalid-messages/mis-nested-sig.message-raw"
+]
+precedence = "override"
+SPDX-FileCopyrightText = ["2022 Evgeny Vereshchagin", "2022 Collabora Ltd."]
+SPDX-License-Identifier = "MIT"
+
+[[annotations]]
+path = [
+    "test/data/invalid-messages/issue418.message-raw"
+]
+precedence = "override"
+SPDX-FileCopyrightText = ["2022 Evgeny Vereshchagin", "2022 Collabora Ltd."]
+SPDX-License-Identifier = "MIT"
+
+[[annotations]]
+path = [
+    "test/data/invalid-messages/boolean-has-no-value.message-raw"
+]
+precedence = "override"
+SPDX-FileCopyrightText = ["2003 Red Hat, Inc."]
+SPDX-License-Identifier = "MIT"
+
+[[annotations]]
+path = [
+    "test/data/invalid-messages/fixed-array-not-divisible.message-raw"
+]
+precedence = "override"
+SPDX-FileCopyrightText = ["2022 Evgeny Vereshchagin", "2022 Collabora Ltd."]
+SPDX-License-Identifier = "MIT"
+
+[[annotations]]
+path = [
+    "test/data/invalid-messages/zero-length-variant-sig.message-raw"
+]
+precedence = "override"
+SPDX-FileCopyrightText = ["2022 Collabora Ltd."]
+SPDX-License-Identifier = "MIT"
diff --git a/test/data/invalid-messages/boolean-has-no-value.message-raw.license b/test/data/invalid-messages/boolean-has-no-value.message-raw.license
deleted file mode 100644
index 31bb323c..00000000
--- a/test/data/invalid-messages/boolean-has-no-value.message-raw.license
+++ /dev/null
@@ -1,2 +0,0 @@
-SPDX-FileCopyrightText: 2003 Red Hat, Inc.
-SPDX-License-Identifier: MIT
diff --git a/test/data/invalid-messages/fixed-array-not-divisible.message-raw.license b/test/data/invalid-messages/fixed-array-not-divisible.message-raw.license
deleted file mode 100644
index 252ebde8..00000000
--- a/test/data/invalid-messages/fixed-array-not-divisible.message-raw.license
+++ /dev/null
@@ -1,3 +0,0 @@
-SPDX-FileCopyrightText: 2022 Evgeny Vereshchagin
-SPDX-FileCopyrightText: 2022 Collabora Ltd.
-SPDX-License-Identifier: MIT
diff --git a/test/data/invalid-messages/issue418.message-raw.license b/test/data/invalid-messages/issue418.message-raw.license
deleted file mode 100644
index 252ebde8..00000000
--- a/test/data/invalid-messages/issue418.message-raw.license
+++ /dev/null
@@ -1,3 +0,0 @@
-SPDX-FileCopyrightText: 2022 Evgeny Vereshchagin
-SPDX-FileCopyrightText: 2022 Collabora Ltd.
-SPDX-License-Identifier: MIT
diff --git a/test/data/invalid-messages/mis-nested-sig.message-raw.license b/test/data/invalid-messages/mis-nested-sig.message-raw.license
deleted file mode 100644
index 252ebde8..00000000
--- a/test/data/invalid-messages/mis-nested-sig.message-raw.license
+++ /dev/null
@@ -1,3 +0,0 @@
-SPDX-FileCopyrightText: 2022 Evgeny Vereshchagin
-SPDX-FileCopyrightText: 2022 Collabora Ltd.
-SPDX-License-Identifier: MIT
diff --git a/test/data/invalid-messages/truncated-variant-sig.message-raw.license b/test/data/invalid-messages/truncated-variant-sig.message-raw.license
deleted file mode 100644
index 3833a492..00000000
--- a/test/data/invalid-messages/truncated-variant-sig.message-raw.license
+++ /dev/null
@@ -1,2 +0,0 @@
-SPDX-FileCopyrightText: 2022 Collabora Ltd.
-SPDX-License-Identifier: MIT
diff --git a/test/data/invalid-messages/zero-length-variant-sig.message-raw.license b/test/data/invalid-messages/zero-length-variant-sig.message-raw.license
deleted file mode 100644
index 3833a492..00000000
--- a/test/data/invalid-messages/zero-length-variant-sig.message-raw.license
+++ /dev/null
@@ -1,2 +0,0 @@
-SPDX-FileCopyrightText: 2022 Collabora Ltd.
-SPDX-License-Identifier: MIT
diff --git a/test/data/valid-messages/byteswap-fd-index.message-raw.license b/test/data/valid-messages/byteswap-fd-index.message-raw.license
deleted file mode 100644
index 252ebde8..00000000
--- a/test/data/valid-messages/byteswap-fd-index.message-raw.license
+++ /dev/null
@@ -1,3 +0,0 @@
-SPDX-FileCopyrightText: 2022 Evgeny Vereshchagin
-SPDX-FileCopyrightText: 2022 Collabora Ltd.
-SPDX-License-Identifier: MIT
diff --git a/test/data/valid-messages/minimal.message-raw.license b/test/data/valid-messages/minimal.message-raw.license
deleted file mode 100644
index 3833a492..00000000
--- a/test/data/valid-messages/minimal.message-raw.license
+++ /dev/null
@@ -1,2 +0,0 @@
-SPDX-FileCopyrightText: 2022 Collabora Ltd.
-SPDX-License-Identifier: MIT

From 65e9cf86e8da3eaeacfaf9f0fb5a06520e0f215c Mon Sep 17 00:00:00 2001
From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Fri, 7 Nov 2025 11:43:29 +0100
Subject: [PATCH 3/3] CI: add job to check reuse compliance

---
 .gitlab-ci.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dfb15cbc..06e9c397 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -329,6 +329,15 @@ opensuse mingw64 meson debug:
     ci_test: "no"
     ci_variant: "debug"
 
+opensuse tumbleweed reuse:
+  image: opensuse/tumbleweed
+  stage: build
+  allow_failure: true
+  before_script:
+    - zypper --non-interactive install reuse
+  script:
+    - reuse --root /builds/dbus lint
+
 .ubuntu-build:
   extends: .unix-host-build
   image: "ubuntu:latest"