r54411 - in /trunk/dh-make-perl/lib/DhMakePerl/Command: Packaging.pm make.pm refresh.pm

dmn at users.alioth.debian.org dmn at users.alioth.debian.org
Wed Mar 17 10:28:14 UTC 2010


Author: dmn
Date: Wed Mar 17 10:28:10 2010
New Revision: 54411

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=54411
Log:
create_rules(): drop the filename argument

we always use debian_file('rules')

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

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=54411&op=diff
==============================================================================
--- trunk/dh-make-perl/lib/DhMakePerl/Command/Packaging.pm (original)
+++ trunk/dh-make-perl/lib/DhMakePerl/Command/Packaging.pm Wed Mar 17 10:28:10 2010
@@ -616,9 +616,9 @@
 }
 
 sub create_rules {
-    my ( $self, $file ) = @_;
-
-    my $rulesname = 'rules.dh7.tiny';
+    my ( $self ) = @_;
+
+    my $file = $self->debian_file('rules');
 
     $self->rules( Debian::Rules->new($file) );
 
@@ -634,6 +634,8 @@
     $self->backup_file($file);
 
     $self->rules( Debian::Rules->new($file) );
+
+    my $rulesname = 'rules.dh7.tiny';
 
     for my $source (
         catfile( $self->cfg->home_dir, $rulesname ),

Modified: trunk/dh-make-perl/lib/DhMakePerl/Command/make.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/lib/DhMakePerl/Command/make.pm?rev=54411&op=diff
==============================================================================
--- trunk/dh-make-perl/lib/DhMakePerl/Command/make.pm (original)
+++ trunk/dh-make-perl/lib/DhMakePerl/Command/make.pm Wed Mar 17 10:28:10 2010
@@ -173,7 +173,7 @@
         catfile( $self->debian_dir, 'source', 'format' ) );
     $self->create_changelog( $self->debian_file('changelog'),
         $self->cfg->closes // $self->get_wnpp( $self->pkgname ) );
-    $self->create_rules( $self->debian_file('rules') );
+    $self->create_rules;
 
     # now that rules are there, see if we need some dependency for them
     $self->discover_utility_deps( $self->control );

Modified: trunk/dh-make-perl/lib/DhMakePerl/Command/refresh.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/lib/DhMakePerl/Command/refresh.pm?rev=54411&op=diff
==============================================================================
--- trunk/dh-make-perl/lib/DhMakePerl/Command/refresh.pm (original)
+++ trunk/dh-make-perl/lib/DhMakePerl/Command/refresh.pm Wed Mar 17 10:28:10 2010
@@ -48,7 +48,7 @@
         if @{ $self->examples } and $self->cfg->verbose;
 
     if ( 'rules' ~~ $self->cfg->only ) {
-        $self->create_rules( $self->debian_file('rules') );
+        $self->create_rules;
         if ( !-f $self->debian_file('compat') or $self->cfg->dh == 7 ) {
             $self->create_compat( $self->debian_file('compat') );
         }




More information about the Pkg-perl-cvs-commits mailing list