r53105 - /trunk/dh-make-perl/lib/DhMakePerl.pm
dmn at users.alioth.debian.org
dmn at users.alioth.debian.org
Sat Feb 20 21:21:37 UTC 2010
Author: dmn
Date: Sat Feb 20 21:21:31 2010
New Revision: 53105
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=53105
Log:
convert $bdependsi to object accessor
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=53105&op=diff
==============================================================================
--- trunk/dh-make-perl/lib/DhMakePerl.pm (original)
+++ trunk/dh-make-perl/lib/DhMakePerl.pm Sat Feb 20 21:21:31 2010
@@ -9,8 +9,8 @@
__PACKAGE__->mk_accessors(
qw(
- cfg apt_contents main_dir debian_dir meta bdepends depends priority
- section
+ cfg apt_contents main_dir debian_dir meta bdepends bdependsi depends
+ priority section
)
);
@@ -77,7 +77,7 @@
# * get more info from the package (maybe using CPAN methods)
my (
- $bdependsi, $maintainer, $arch,
+ $maintainer, $arch,
$closes, $date,
$startdir,
);
@@ -90,9 +90,10 @@
use constant oldest_perl_version => '5.8.8-7';
our %DEFAULTS = (
- depends => Debian::Dependencies->new('${perl:Depends}'),
- priority => 'optional',
- section => 'perl',
+ bdependsi => Debian::Dependencies->new("perl"),
+ depends => Debian::Dependencies->new('${perl:Depends}'),
+ priority => 'optional',
+ section => 'perl',
);
sub new {
@@ -108,7 +109,6 @@
return $self;
}
-$bdependsi = Debian::Dependencies->new("perl");
$arch = 'all';
$date = email_date(time);
$startdir = getcwd();
@@ -386,9 +386,10 @@
if $self->cfg->bdepends;
$self->bdepends->add($extrabdepends);
- $bdependsi += Debian::Dependencies->new( $self->cfg->bdependsi )
+ $self->bdependsi->add(
+ Debian::Dependencies->new( $self->cfg->bdependsi ) )
if $self->cfg->bdependsi;
- $bdependsi += $extrabdependsi;
+ $self->bdependsi->add($extrabdependsi);
$self->apply_overrides();
@@ -1525,8 +1526,8 @@
and !defined($self->cfg->bdepends)
and !defined($self->cfg->bdependsi) )
{
- $self->bdepends->add($bdependsi);
- @$bdependsi = ();
+ $self->bdepends->add( $self->bdependsi );
+ @{ $self->bdependsi } = ();
}
$fh->print("Source: $srcname\n");
@@ -1537,8 +1538,9 @@
$fh->print( wrap( '', ' ', "Build-Depends: " . $self->bdepends . "\n" ) )
if $self->bdepends;
- $fh->print( wrap( '', ' ', "Build-Depends-Indep: $bdependsi\n" ) )
- if $bdependsi;
+ $fh->print(
+ wrap( '', ' ', "Build-Depends-Indep: " . $self->bdependsi . "\n" ) )
+ if $self->bdependsi;
$fh->print($extrasfields) if defined $extrasfields;
@@ -1987,7 +1989,7 @@
$val = $self->get_override_val( $data, $subkey, 'bdepends' )
)
);
- $bdependsi = Debian::Dependencies->new($val)
+ $self->bdependsi( Debian::Dependencies->new($val) )
if (
defined(
$val = $self->get_override_val( $data, $subkey, 'bdependsi' )
More information about the Pkg-perl-cvs-commits
mailing list