r66384 - in /trunk/dh-make-perl: Build.PL debian/changelog debian/control lib/DhMakePerl/Command/Packaging.pm

[dmn at users.alioth.debian.org]

Author: dmn
Date: Sat Dec 25 20:31:08 2010
New Revision: 66384

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=66384
Log:
Detect usage of 'Artistic License 2.0'

Include the license text in debian/copyright;
(build-)depend on libsoftware-license-perl.
(Closes: #589816)

Modified:
    trunk/dh-make-perl/Build.PL
    trunk/dh-make-perl/debian/changelog
    trunk/dh-make-perl/debian/control
    trunk/dh-make-perl/lib/DhMakePerl/Command/Packaging.pm

Modified: trunk/dh-make-perl/Build.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/Build.PL?rev=66384&op=diff
==============================================================================
--- trunk/dh-make-perl/Build.PL (original)
+++ trunk/dh-make-perl/Build.PL Sat Dec 25 20:31:08 2010
@@ -34,6 +34,7 @@
         'Module::Depends::Intrusive'=> 0,
         'Parse::DebianChangelog'    => 0,
         'Parse::DebControl'         => 0,
+        'Software::License::Artistic_2_0' => 0,
         'Storable'                  => 0,
         'Text::Diff'                => 0,
         'Text::Wrap'                => 0,

Modified: trunk/dh-make-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/debian/changelog?rev=66384&op=diff
==============================================================================
--- trunk/dh-make-perl/debian/changelog (original)
+++ trunk/dh-make-perl/debian/changelog Sat Dec 25 20:31:08 2010
@@ -21,6 +21,9 @@
   [ Damyan Ivanov ]
   * when looking for XS code, skip win32/ directories
   * Skip non-existing APT source files. (Closes: #557961 for real)
+  * Detect usage of 'Artistic License 2.0' and include the license text in
+    debian/copyright; (build-)depend on libsoftware-license-perl.
+    (Closes: #589816)
 
  -- Peter Pentchev <roam at ringlet.net>  Sun, 19 Dec 2010 20:43:10 +0200
 

Modified: trunk/dh-make-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/debian/control?rev=66384&op=diff
==============================================================================
--- trunk/dh-make-perl/debian/control (original)
+++ trunk/dh-make-perl/debian/control Sat Dec 25 20:31:08 2010
@@ -17,6 +17,7 @@
  libmodule-depends-perl (>= 0.15),
  libparse-debcontrol-perl,
  libparse-debianchangelog-perl,
+ libsoftware-license-perl,
  libtest-compile-perl,
  libtest-deep-perl,
  libtest-differences-perl,
@@ -55,6 +56,7 @@
  libmodule-depends-perl (>= 0.15),
  libparse-debcontrol-perl,
  libparse-debianchangelog-perl,
+ libsoftware-license-perl,
  libtie-ixhash-perl,
  libwww-mechanize-perl,
  libyaml-perl

Modified: trunk/dh-make-perl/lib/DhMakePerl/Command/Packaging.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/lib/DhMakePerl/Command/Packaging.pm?rev=66384&op=diff
==============================================================================
--- trunk/dh-make-perl/lib/DhMakePerl/Command/Packaging.pm (original)
+++ trunk/dh-make-perl/lib/DhMakePerl/Command/Packaging.pm Sat Dec 25 20:31:08 2010
@@ -827,6 +827,16 @@
             . " .\n"
             . " On Debian systems, the complete text of the Artistic License can be\n"
             . " found in `/usr/share/common-licenses/Artistic'.",
+        'Artistic-2.0' => do {
+            require Software::License::Artistic_2_0;
+            my $artistic2 = Software::License::Artistic_2_0->new(
+                { holder => 'noname', } );
+            my $text = $artistic2->license;
+            $text =~ s/\n$//s;
+            $text =~ s/^\n/.\n/mg;
+            $text =~ s/^/ /mg;
+            $text;
+            },
         'GPL-1+' =>
             " This program is free software; you can redistribute it and/or modify\n"
             . " it under the terms of the GNU General Public License as published by\n"
@@ -926,7 +936,10 @@
                 }
             }
 
-            if ( $mangle_cprt =~ /Artistic\s*License/is ) {
+            if ( $mangle_cprt =~ /Artistic\s*License\s*2\.0/is ) {
+                $licenses{'Artistic-2.0'} = 1;
+            }
+            elsif ( $mangle_cprt =~ /Artistic\s*License/is ) {
                 $licenses{'Artistic'} = 1;
             }