[lintian] 02/02: c/src-cpy: Rename a tag and rewrite description (#779866)
This is an automated email from the git hooks/post-receive script.
nthykier pushed a commit to branch master
in repository lintian.
commit 1c20996736fc93f0b2ae2468f064d5edb8d4c8d3
Author: Niels Thykier <niels@thykier.net>
Date: Sun Mar 15 21:45:56 2015 +0100
c/src-cpy: Rename a tag and rewrite description (#779866)
Signed-off-by: Niels Thykier <niels@thykier.net>
---
checks/source-copyright.desc | 14 ++++++--------
checks/source-copyright.pm | 2 +-
t/tests/source-copyright-license-header/desc | 2 +-
t/tests/source-copyright-license-header/tags | 2 +-
4 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/checks/source-copyright.desc b/checks/source-copyright.desc
index 914ff34..98955f8 100644
--- a/checks/source-copyright.desc
+++ b/checks/source-copyright.desc
@@ -240,17 +240,15 @@ Info: In contrast to package dependencies, the pipe symbol or vertical
between two license short names. Instead, the keyword "or" between
two license names indicates the dual licensing.
-Tag: dep5-file-paragraph-reference-header
+Tag: dep5-file-paragraph-reference-header-paragraph
Severity: normal
Certainty: possible
Ref: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Info: One of the file paragraph reference in the
- license field a standalone license defined in the header
- paragraph.
- .
- According to specification all of the short names license
- or short names followed by license exceptions making up
- the first line must be described in stand-alone License paragraphs.
+Info: The Files paragraph uses a reference to a license, which is
+ only defined in the Header paragraph. The copyright specification
+ requires that the Files paragraph either contains the full license
+ itself or references a "stand-alone" License paragraph, and not the
+ Header paragraph
Tag: dep5-copyright-license-name-not-unique
Severity: normal
diff --git a/checks/source-copyright.pm b/checks/source-copyright.pm
index 6714383..525a0a9 100644
--- a/checks/source-copyright.pm
+++ b/checks/source-copyright.pm
@@ -444,7 +444,7 @@ sub _parse_dep5 {
tag 'missing-license-paragraph-in-dep5-copyright', $license,
"(paragraph at line $lines[$i]{'START-OF-PARAGRAPH'})";
} elsif ($standalone_licenses{$license} == -1) {
- tag 'dep5-file-paragraph-reference-header', $license,
+ tag 'dep5-file-paragraph-reference-header-paragraph', $license,
"(paragraph at line $lines[$i]{'START-OF-PARAGRAPH'})";
}
diff --git a/t/tests/source-copyright-license-header/desc b/t/tests/source-copyright-license-header/desc
index 373505d..32cbd32 100644
--- a/t/tests/source-copyright-license-header/desc
+++ b/t/tests/source-copyright-license-header/desc
@@ -3,4 +3,4 @@ Sequence: 6000
Version: 1.0
Description: Test for license field referencing header
Test-For:
- dep5-file-paragraph-reference-header
+ dep5-file-paragraph-reference-header-paragraph
diff --git a/t/tests/source-copyright-license-header/tags b/t/tests/source-copyright-license-header/tags
index 75395c5..710e58d 100644
--- a/t/tests/source-copyright-license-header/tags
+++ b/t/tests/source-copyright-license-header/tags
@@ -1 +1 @@
-W: source-copyright-license-header source: dep5-file-paragraph-reference-header public-domain (paragraph at line 13)
+W: source-copyright-license-header source: dep5-file-paragraph-reference-header-paragraph public-domain (paragraph at line 13)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: