[lintian] 02/02: Ignore meta copyright statements such as "Original Author". Thanks to Thorsten Alteholz for the bug report. (Closes: #873323)
This is an automated email from the git hooks/post-receive script.
lamby pushed a commit to branch master
in repository lintian.
commit 36aa1955ecd6e7c0aaff14a1591789f84151f8ef
Author: Chris Lamb <lamby@debian.org>
Date: Sun Aug 27 09:11:26 2017 +0100
Ignore meta copyright statements such as "Original Author". Thanks to Thorsten Alteholz for the bug report. (Closes: #873323)
---
checks/copyright-file.pm | 1 +
debian/changelog | 2 ++
t/tests/copyright-file-year-in-future/debian/debian/copyright | 1 +
3 files changed, 4 insertions(+)
diff --git a/checks/copyright-file.pm b/checks/copyright-file.pm
index 55f8d63..05e6f93 100644
--- a/checks/copyright-file.pm
+++ b/checks/copyright-file.pm
@@ -355,6 +355,7 @@ qr/GNU (?:Lesser|Library) General Public License|(?-i:\bLGPL\b)/i
my $year = $1;
my $column = $-[0] + 1;
next if $year <= $latest_year;
+ next if $line =~ m/Original Author/;
# "Sun Microsystems, 4150 Network Drive, CA"
next if $year == 4150;
tag 'copyright-year-in-future',
diff --git a/debian/changelog b/debian/changelog
index 09f890d..8d141bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,8 @@ lintian (2.5.53) UNRELEASED; urgency=medium
addresses. (Closes: #869788)
- Match all violating years in a line, not just the first (eg.
"2000-2107").
+ - Ignore meta copyright statements such as "Original Author". Thanks
+ to Thorsten Alteholz for the bug report. (Closes: #873323)
- Expand testsuite.
* checks/cruft.{pm,desc}:
+ [CL] Downgrade severity of file-contains-fixme-placeholder
diff --git a/t/tests/copyright-file-year-in-future/debian/debian/copyright b/t/tests/copyright-file-year-in-future/debian/debian/copyright
index 2701f6a..58b56d3 100644
--- a/t/tests/copyright-file-year-in-future/debian/debian/copyright
+++ b/t/tests/copyright-file-year-in-future/debian/debian/copyright
@@ -14,6 +14,7 @@ Copyright:
2000 ISO 2203-2 & ISO-2204 LLC. (2008)
2000 Lintian Maintainers, Immensee, CH-2205, Switzerland.
2000 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, California 95054, U.S.A.
+ 2112 D. Original Author.
License: MIT
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: