From 89442198699292da111e151ae4c7a72a61fd2c32 Mon Sep 17 00:00:00 2001
From: Walter Lozano <walter.lozano@collabora.com>
Date: Tue, 22 Oct 2024 16:11:10 -0300
Subject: [PATCH 1/3] dh_setup_copyright: Warn if no package found
The script dh_setup_copyright tries to find the package each reference
file belongs to, however, in some cases this is not possible and there
is now warning about that.
Add a warning about the unknown file to allow further investigations.
Signed-off-by: Walter Lozano <walter.lozano@collabora.com>
---
dh_setup_copyright | 1 +
1 file changed, 1 insertion(+)
diff --git a/dh_setup_copyright b/dh_setup_copyright
index 91dbe89..b6f3410 100755
--- a/dh_setup_copyright
+++ b/dh_setup_copyright
@@ -135,6 +135,7 @@ sub find_package_providing_path {
}
if (!defined $package) {
$external_files_to_packages_cache{$path} = PATH_HAS_NO_PACKAGE;
+ print STDERR "WARNING: $path was not found in any package\n";
return undef;
}
--
GitLab
From f69feec674096fec58b098f2dd4588de630baaff Mon Sep 17 00:00:00 2001
From: Walter Lozano <walter.lozano@collabora.com>
Date: Tue, 22 Oct 2024 16:13:32 -0300
Subject: [PATCH 2/3] dh_setup_copyright: Workaround rust-coreutils issues
Package rust-coreutils is special as it uses a different folder for the
registry, causing dh_setup_copyright to fail at finding the package
reference files belong to.
To avoid this issue, take into account this fact and replace the names.
Signed-off-by: Walter Lozano <walter.lozano@collabora.com>
---
dh_setup_copyright | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/dh_setup_copyright b/dh_setup_copyright
index b6f3410..31bffd9 100755
--- a/dh_setup_copyright
+++ b/dh_setup_copyright
@@ -123,6 +123,11 @@ sub find_package_providing_path {
use constant PATH_HAS_NO_PACKAGE => '';
+ # rust-coreutils uses a different place for the registry
+ # making it difficult to find the source package based on the path
+ # so replace the file path with the expected one
+ $path =~ s!^.*/debian/cargo_registry/!/usr/share/cargo/registry/!g;
+
my $package = $external_files_to_packages_cache{$path};
if (defined $package) {
return $package eq PATH_HAS_NO_PACKAGE ? undef : $package;
--
GitLab
From 638e16e3a84fc5ee8eaba95db2c561c1ada5a56c Mon Sep 17 00:00:00 2001
From: Walter Lozano <walter.lozano@collabora.com>
Date: Tue, 22 Oct 2024 16:25:03 -0300
Subject: [PATCH 3/3] Release debhelper version 13.11.4+apertis8
Signed-off-by: Walter Lozano <walter.lozano@collabora.com>
---
debian/changelog | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 64883db..4dafe05 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+debhelper (13.11.4+apertis8) apertis; urgency=medium
+
+ * dh_setup_copyright: Warn if no package found.
+ The script dh_setup_copyright tries to find the package each reference
+ file belongs to, however, in some cases this is not possible and there
+ is now warning about that.
+ Add a warning about the unknown file to allow further investigations.
+ * dh_setup_copyright: Workaround rust-coreutils issues.
+ Package rust-coreutils is special as it uses a different folder for the
+ registry, causing dh_setup_copyright to fail at finding the package
+ reference files belong to.
+ To avoid this issue, take into account this fact and replace the names.
+
+ -- Walter Lozano <walter.lozano@collabora.com> Tue, 22 Oct 2024 16:24:59 -0300
+
debhelper (13.11.4+apertis7) apertis; urgency=medium
* dh_setup_copyright: Sort JSON keys to preserve reproducible builds
--
GitLab