r76984 - in /trunk/dh-make-perl: debian/changelog lib/DhMakePerl/Command/Packaging.pm

[dmn at users.alioth.debian.org]

Author: dmn
Date: Sun Jul  3 08:36:01 2011
New Revision: 76984

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=76984
Log:
fix calls to extract_basic_copyright from File::Find::find to not chdir, fixing lookups for ./LICENSE, etc on refresh. Closes: #613606 -- Fails to correctly identify GPLv2 in RT::Authen::ExternalAuth v0.08 on refresh

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

Modified: trunk/dh-make-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/debian/changelog?rev=76984&op=diff
==============================================================================
--- trunk/dh-make-perl/debian/changelog (original)
+++ trunk/dh-make-perl/debian/changelog Sun Jul  3 08:36:01 2011
@@ -32,6 +32,9 @@
   * Use CPAN::Meta for processing META.* files, adding support for META.json.
   * When no META file is available, try parsing name and version from Build.PL
     before Makefile.PL. Closes: #589946
+  * fix calls to extract_basic_copyright from File::Find::find to not chdir,
+    fixing lookups for ./LICENSE, etc on refresh. Closes: #613606 -- Fails to
+    correctly identify GPLv2 in RT::Authen::ExternalAuth v0.08 on refresh
 
  -- Salvatore Bonaccorso <carnil at debian.org>  Wed, 25 May 2011 16:04:40 +0200
 

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=76984&op=diff
==============================================================================
--- trunk/dh-make-perl/lib/DhMakePerl/Command/Packaging.pm (original)
+++ trunk/dh-make-perl/lib/DhMakePerl/Command/Packaging.pm Sun Jul  3 08:36:01 2011
@@ -274,15 +274,18 @@
     $self->debian_dir( $self->main_file('debian') );
 
     find(
-        sub {
-            return if $File::Find::name =~ $self->cfg->exclude;
-
-            if (/\.(pm|pod)$/) {
-                $self->extract_desc($_)
-                    unless $bin->short_description and $bin->long_description;
-                $self->extract_basic_copyright($_)
-                    unless $self->author and $self->copyright;
-            }
+        {   no_chdir => 1,
+            wanted   => sub {
+                return if $File::Find::name =~ $self->cfg->exclude;
+
+                if (/\.(pm|pod)$/) {
+                    $self->extract_desc($_)
+                        unless $bin->short_description
+                            and $bin->long_description;
+                    $self->extract_basic_copyright($_)
+                        unless $self->author and $self->copyright;
+                }
+            },
         },
         $self->main_dir
     );