r53177 - /trunk/dh-make-perl/lib/DhMakePerl.pm

[dmn at users.alioth.debian.org]

Author: dmn
Date: Mon Feb 22 09:16:57 2010
New Revision: 53177

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=53177
Log:
convert $extra[sp]fields to object accessors

Modified:
    trunk/dh-make-perl/lib/DhMakePerl.pm

Modified: trunk/dh-make-perl/lib/DhMakePerl.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/lib/DhMakePerl.pm?rev=53177&op=diff
==============================================================================
--- trunk/dh-make-perl/lib/DhMakePerl.pm (original)
+++ trunk/dh-make-perl/lib/DhMakePerl.pm Mon Feb 22 09:16:57 2010
@@ -13,6 +13,7 @@
         priority section maintainer arch start_dir overrides
         perlname version pkgversion pkgname srcname
         desc longdesc copyright author
+        extrasfields  extrapfields
         )
 );
 
@@ -109,7 +110,6 @@
 # If we're being required rather than called as a main command, then
 # return now without doing any work.  This facilitates easier testing.
 
-my ( $extrasfields, $extrapfields );
 my ($module_build);
 my ( @docs, @examples, @args );
 
@@ -1535,7 +1535,7 @@
         wrap( '', ' ', "Build-Depends-Indep: " . $self->bdependsi . "\n" ) )
         if $self->bdependsi;
 
-    $fh->print($extrasfields) if defined $extrasfields;
+    $fh->print( $self->extrasfields ) if defined $self->extrasfields;
 
     if ($self->cfg->pkg_perl) {
         $fh->print(
@@ -1561,7 +1561,7 @@
     $fh->printf( "Architecture: %s\n", $self->arch );
     $fh->print( wrap( '', ' ', "Depends: " . $self->depends . "\n" ) )
         if $self->depends;
-    $fh->print($extrapfields) if defined $extrapfields;
+    $fh->print( $self->extrapfields ) if defined $self->extrapfields;
     $fh->printf(
         "Description:%s%s\n%s\n .\n This description was automagically extracted from the module by dh-make-perl.\n",
         ( $self->desc =~ m/^ / ) ? "" : " ", $self->desc, $self->longdesc,
@@ -2016,13 +2016,13 @@
         if (
         defined( $val = $self->get_override_val( $data, $subkey, 'docs' ) ) );
 
-    $extrasfields = $val
+    $self->extrasfields($val)
         if (
         defined(
             $val = $self->get_override_val( $data, $subkey, 'sfields' )
         )
         );
-    $extrapfields = $val
+    $self->extrapfields($val)
         if (
         defined(
             $val = $self->get_override_val( $data, $subkey, 'pfields' )