[lintian] 01/01: Ignore DFSG-repacked packages when checking for upstream source tarball signatures as they will never match by definition.
This is an automated email from the git hooks/post-receive script.
lamby pushed a commit to branch master
in repository lintian.
commit 8914bb025f975e4a5584a3a0203cf808f3d0a430
Author: Chris Lamb <lamby@debian.org>
Date: Wed Jul 26 08:33:46 2017 +0100
Ignore DFSG-repacked packages when checking for upstream source tarball signatures as they will never match by definition.
---
checks/changes-file.desc | 4 ++++
checks/changes-file.pm | 3 ++-
debian/changelog | 3 +++
.../debian/debian/upstream/signing-key.asc | 1 +
t/tests/changes-upstream-signature-missing-dfsg/desc | 6 ++++++
t/tests/changes-upstream-signature-missing-dfsg/tags | 0
6 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/checks/changes-file.desc b/checks/changes-file.desc
index 48515f7..c21e7ef 100644
--- a/checks/changes-file.desc
+++ b/checks/changes-file.desc
@@ -186,3 +186,7 @@ Certainty: certain
Info: The packaging includes an upstream signing key but the corresponding
<tt>.asc</tt> signature for one or more source tarballs are not included
in your .changes file.
+ .
+ If you are repackaging your source tarballs for Debian Free Software
+ Guidelines compliance reasons, ensure that your package version includes
+ <tt>dfsg</tt> or similar.
diff --git a/checks/changes-file.pm b/checks/changes-file.pm
index cbf5c05..521d467 100644
--- a/checks/changes-file.pm
+++ b/checks/changes-file.pm
@@ -198,7 +198,8 @@ sub run {
# signature.
if ( $has_signing_key
&& $file =~ m/\.orig(-[A-Za-z\d-]+)?\.tar\./
- && $file !~ m/\.asc$/) {
+ && $file !~ m/\.asc$/
+ && $info->field('version') !~ m/(dfsg|debian|ds)/) {
next if exists $files->{"$file.asc"};
tag 'orig-tarball-missing-upstream-signature', $file;
}
diff --git a/debian/changelog b/debian/changelog
index 21efac3..77c5195 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ lintian (2.5.53) UNRELEASED; urgency=medium
XXX: generate tag summary
+ * checks/changes.{pm,desc}
+ + [CL] Ignore DFSG-repacked packages when checking for upstream
+ source tarball signatures as they will never match by definition.
* checks/debhelper.pm:
+ [CL] Prevent a false positive of
missing-build-dependency-for-dh_-command that can be exposed by
diff --git a/t/tests/changes-upstream-signature-missing-dfsg/debian/debian/upstream/signing-key.asc b/t/tests/changes-upstream-signature-missing-dfsg/debian/debian/upstream/signing-key.asc
new file mode 100644
index 0000000..bd03c4e
--- /dev/null
+++ b/t/tests/changes-upstream-signature-missing-dfsg/debian/debian/upstream/signing-key.asc
@@ -0,0 +1 @@
+Too lazy to fake this file
diff --git a/t/tests/changes-upstream-signature-missing-dfsg/desc b/t/tests/changes-upstream-signature-missing-dfsg/desc
new file mode 100644
index 0000000..a3aa624
--- /dev/null
+++ b/t/tests/changes-upstream-signature-missing-dfsg/desc
@@ -0,0 +1,6 @@
+Testname: changes-upstream-signature-missing-dfsg
+Type: non-native
+Version: 1.0+dfsg1-1
+Description: No upstream signature included in DFSG package
+Test-Against:
+ orig-tarball-missing-upstream-signature
diff --git a/t/tests/changes-upstream-signature-missing-dfsg/tags b/t/tests/changes-upstream-signature-missing-dfsg/tags
new file mode 100644
index 0000000..e69de29
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: