Package: devscripts
Version: 2.10.47
Severity: wishlist
Tags: patch

Hi, 

licensecheck does not detect standard AGPL headers (very similar to {L,}GPL
ones).

The attached patch is correctly detecting AGPLv3+ at least (I did not try it
with other variants).

Best regards, 

OdyX

-- Package-specific info:

--- /etc/devscripts.conf ---

--- ~/.devscripts ---
Not present

-- System Information:
Debian Release: squeeze/sid
  APT prefers testing
  APT policy: (500, 'testing')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.26-1-xen-amd64 (SMP w/2 CPU cores)
Locale: LANG=fr_CH.UTF-8, LC_CTYPE=fr_CH.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

Versions of packages devscripts depends on:
ii  dpkg-dev                      1.14.25    Debian package development tools
ii  libc6                         2.9-4      GNU C Library: Shared libraries
ii  perl                          5.10.0-19  Larry Wall's Practical Extraction 

Versions of packages devscripts recommends:
ii  at                 3.1.10.2              Delayed job execution and batch pr
ii  bsd-mailx [mailx]  8.1.2-0.20081101cvs-2 A simple mail user agent
ii  dctrl-tools        2.13.1                Command-line tools to process Debi
ii  debian-keyring     2009.01.18            GnuPG (and obsolete PGP) keys of D
ii  debian-maintainers 1.53                  GPG keys of Debian maintainers
ii  dput               0.9.3                 Debian package upload tool
ii  equivs             2.0.7-0.1             Circumvent Debian package dependen
ii  fakeroot           1.12.2                Gives a fake root environment
ii  gnupg              1.4.9-4               GNU privacy guard - a free PGP rep
ii  libauthen-sasl-per 2.12-1                Authen::SASL - SASL Authentication
ii  libcrypt-ssleay-pe 0.57-1+b1             Support for https protocol in LWP
ii  libparse-debcontro 2.005-2               Easy OO parsing of Debian control-
ii  libsoap-lite-perl  0.710.08-2            Client and server side SOAP implem
ii  libterm-size-perl  0.2-4+b1              Perl extension for retrieving term
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  libwww-perl        5.825-1               WWW client/server library for Perl
ii  libyaml-syck-perl  1.05-1                Fast, lightweight YAML loader and 
ii  lintian            2.2.8                 Debian package checker
ii  lsb-release        3.2-20                Linux Standard Base version report
ii  mailx              1:20081101-2          Transitional package for mailx ren
ii  man-db             2.5.4-1               on-line manual pager
ii  openssh-client [ss 1:5.1p1-5             secure shell client, an rlogin/rsh
ii  patch              2.5.9-5               Apply a diff file to an original
ii  patchutils         0.3.1-1               Utilities to work with patches
ii  strace             4.5.17+cvs080723-2    A system call tracer
ii  subversion         1.5.6dfsg-1           Advanced version control system
ii  unzip              5.52-12               De-archiver for .zip files
ii  wdiff              0.5-18                Compares two files word by word
ii  wget               1.11.4-2              retrieves files from the web
pn  www-browser        <none>                (no description available)

Versions of packages devscripts suggests:
ii  build-essential               11.4       Informational list of build-essent
pn  cvs-buildpackage              <none>     (no description available)
pn  devscripts-el                 <none>     (no description available)
ii  gnuplot                       4.2.4-4    A command-line driven interactive 
pn  libfile-desktopentry-perl     <none>     (no description available)
pn  libnet-smtp-ssl-perl          <none>     (no description available)
pn  mutt                          <none>     (no description available)
pn  svn-buildpackage              <none>     (no description available)

-- no debconf information
--- /usr/bin/licensecheck       2009-03-04 20:25:31.000000000 +0100
+++ licensecheck        2009-03-23 14:27:49.000000000 +0100
@@ -386,11 +386,11 @@
     my $extrainfo = "";
     my $license = "";
 
-    if ($licensetext =~ /version ([^ ]+) (?:\(?only\)?.? )?(?:of the GNU 
General Public License )?as published by the Free Software Foundation/i or
-       $licensetext =~ /GNU General Public License as published by the Free 
Software Foundation; version ([^ ]+) /i) {
+    if ($licensetext =~ /version ([^ ]+) (?:\(?only\)?.? )?(?:of the GNU 
(Affero )?General Public License )?as published by the Free Software 
Foundation/i or
+       $licensetext =~ /GNU (Affero )?General Public License as published by 
the Free Software Foundation; version ([^ ]+) /i) {
 
        $gplver = " (v$1)";
-    } elsif ($licensetext =~ /GNU General Public License, version ([^ ]+?)[ 
.]/) {
+    } elsif ($licensetext =~ /GNU (Affero ?)General Public License, version 
([^ ]+?)[ .]/) {
        $gplver = " (v$1)";
     } elsif ($licensetext =~ /either version ([^ ]+) of the License, or \(at 
your option\) any later version/) {
        $gplver = " (v$1 or later)";
@@ -411,6 +411,10 @@
     if ($licensetext =~ /is free software.? you can redistribute it and\/or 
modify it under the terms of the (GNU (Library|Lesser) General Public 
License|LGPL)/i) {
        $license = "LGPL$gplver$extrainfo $license";
     }
+    
+    if ($licensetext =~ /is free software.? you can redistribute it and\/or 
modify it under the terms of the (GNU Affero General Public License|AGPL)/i) {
+       $license = "AGPL$gplver$extrainfo $license";
+    }
 
     if ($licensetext =~ /is free software.? you (can|may) redistribute it 
and\/or modify it under the terms of (?:version [^ ]+ (?:\(?only\)? )?of )?the 
GNU General Public License/i) {
        $license = "GPL$gplver$extrainfo $license";

Reply via email to