Bug#513946: lintian: should not tag copyright-refers-to-versionless-license-file when using 'GPL-2+'

[Evgeni Golov <sargentd@die-welt.net>]

Package: lintian
Version: 2.2.2
Severity: wishlist
Tags: patch

Hey,

currently lintian will tag a source with copyright-refers-to-versionless-license-file
when one refers to a license symlink and lintian can't find 
\b(any|or)\s+later(\s+version)?\b
in the copyright file.

That is imho wrong, esp with the new copyright format:
Files: foo
Copyright: bar
License: GPL-2+
That says foo is licensed under gpl v2 or later.

The attached patch against git solves the issue for me.

regards
Evgeni

-- System Information:
Debian Release: 5.0
  APT prefers unstable
  APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: i386 (i686)

Kernel: Linux 2.6.28-z61m-1 (SMP w/2 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages lintian depends on:
ii  binutils            2.18.1~cvs20080103-7 The GNU assembler, linker and bina
ii  diffstat            1.46-1               produces graph of changes introduc
ii  dpkg-dev            1.14.24              Debian package development tools
ii  file                4.26-2               Determines file type using "magic"
ii  gettext             0.17-6               GNU Internationalization utilities
ii  intltool-debian     0.35.0+20060710.1    Help i18n of RFC822 compliant conf
ii  libipc-run-perl     0.82-1               Perl module for running processes
ii  libparse-debianchan 1.1.1-2              parse Debian changelogs and output
ii  libtimedate-perl    1.1600-9             Time and date functions for Perl
ii  liburi-perl         1.37+dfsg-1          Manipulates and accesses URI strin
ii  man-db              2.5.2-4              on-line manual pager
ii  perl [libdigest-sha 5.10.0-19            Larry Wall's Practical Extraction 

lintian recommends no packages.

Versions of packages lintian suggests:
pn  binutils-multiarch            <none>     (no description available)
pn  libtext-template-perl         <none>     (no description available)
ii  man-db                        2.5.2-4    on-line manual pager

-- no debconf information

>From b8cc161335fed98e57d0a8e359dba32f2f209de1 Mon Sep 17 00:00:00 2001
From: Evgeni Golov <sargentd@die-welt.net>
Date: Mon, 2 Feb 2009 18:09:53 +0100
Subject: [PATCH] read $license-X+ as $license X or later in debian/copyright

---
 checks/copyright-file |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/checks/copyright-file b/checks/copyright-file
index fbfbd72..4c870f4 100644
--- a/checks/copyright-file
+++ b/checks/copyright-file
@@ -156,7 +156,8 @@ if (m,usr/share/common-licenses/(GPL|LGPL|BSD|Artistic)\.gz,) {
 if (m,(usr/share/common-licenses/(L?GPL|GFDL))[^-],i && !m,as Perl itself,i
     && !m,License-Alias:\s+Perl,) {
     my $ref = $1;
-    if (m,\b(any|or)\s+later(\s+version)?\b,i) {
+    my $license = $2;
+    if (m,\b(any|or)\s+later(\s+version)?\b,i || m,License: $license-[\d\.]+\+,i) {
 	tag "copyright-refers-to-symlink-license", $ref;
     } else {
 	tag "copyright-refers-to-versionless-license-file", $ref;
-- 
1.5.6.5