r52188 - in /trunk/dh-make-perl: TODO debian/changelog lib/DhMakePerl.pm

dmn at users.alioth.debian.org dmn at users.alioth.debian.org
Fri Feb 5 07:09:28 UTC 2010


Author: dmn
Date: Fri Feb  5 07:07:34 2010
New Revision: 52188

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=52188
Log:
drop unused extract_changelog()

It was actually used, but the results weren't

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

Modified: trunk/dh-make-perl/TODO
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/TODO?rev=52188&op=diff
==============================================================================
--- trunk/dh-make-perl/TODO (original)
+++ trunk/dh-make-perl/TODO Fri Feb  5 07:07:34 2010
@@ -35,5 +35,5 @@
   adds a leading "0" (even worse). we somehow need to get those versions
   back. or strip the "v". or something. - at least if the tarball is
   Foo-Bar-v1.2.0.
-* cleanup lib/DhMakePerl.pm: Changes is extracted and never used, fix_rules
-  doesn't fix rules anymore but only writes examples and docs, ...
+* cleanup lib/DhMakePerl.pm: fix_rules doesn't fix rules anymore but only
+  writes examples and docs, ...

Modified: trunk/dh-make-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/debian/changelog?rev=52188&op=diff
==============================================================================
--- trunk/dh-make-perl/debian/changelog (original)
+++ trunk/dh-make-perl/debian/changelog Fri Feb  5 07:07:34 2010
@@ -1,3 +1,9 @@
+dh-make-perl (0.64) UNRELEASED; urgency=low
+
+  * DhMakePerl: drop unused extract_changelog()
+
+ -- Damyan Ivanov <dmn at debian.org>  Fri, 05 Feb 2010 09:05:25 +0200
+
 dh-make-perl (0.63) unstable; urgency=low
 
   [ Brian Cassidy ]

Modified: trunk/dh-make-perl/lib/DhMakePerl.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/lib/DhMakePerl.pm?rev=52188&op=diff
==============================================================================
--- trunk/dh-make-perl/lib/DhMakePerl.pm (original)
+++ trunk/dh-make-perl/lib/DhMakePerl.pm Fri Feb  5 07:07:34 2010
@@ -107,7 +107,7 @@
 );
 my ( $extrasfields, $extrapfields );
 my ($module_build);
-my ( @docs, @examples, $changelog, @args );
+my ( @docs, @examples, @args );
 
 # use Array::Unique for @docs and @examples
 tie @examples, 'Array::Unique';
@@ -212,11 +212,8 @@
         $module_build
             = ( -f $self->main_file('Build.PL') ) ? "Module-Build" : "MakeMaker";
 
-        $self->extract_changelog;
         $self->extract_docs if 'docs' ~~ $self->cfg->only;
         $self->extract_examples if 'examples' ~~ $self->cfg->only;
-        print "Found changelog: $changelog\n"
-            if defined $changelog and $self->cfg->verbose;
         print "Found docs: @docs\n" if @docs and $self->cfg->verbose;
         print "Found examples: @examples\n" if @examples and $self->cfg->verbose;
 
@@ -229,9 +226,7 @@
         }
 
         if ( 'docs' ~~ $self->cfg->only or 'examples' ~~ $self->cfg->only) {
-        $self->fix_rules( $self->debian_file('rules'),
-            ( defined $changelog ? $changelog : '' ),
-            \@docs, \@examples, );
+        $self->fix_rules( $self->debian_file('rules'), \@docs, \@examples, );
         }
 
         if ( 'copyright' ~~ $self->cfg->only ) {
@@ -339,7 +334,6 @@
         if $self->cfg->depends;
 
     $module_build = ( -f $self->main_file('Build.PL') ) ? "Module-Build" : "MakeMaker";
-    $self->extract_changelog;
     $self->extract_docs;
     $self->extract_examples;
 
@@ -374,8 +368,6 @@
         if ( !defined $longdesc or $longdesc =~ /^\s*\.?\s*$/ )
             and $self->cfg->verbose;
     print "Using maintainer: $maintainer\n" if $self->cfg->verbose;
-    print "Found changelog: $changelog\n"
-        if defined $changelog and $self->cfg->verbose;
     print "Found docs: @docs\n" if $self->cfg->verbose;
     print "Found examples: @examples\n" if @examples and $self->cfg->verbose;
 
@@ -395,9 +387,7 @@
 
     #create_readme("$debiandir/README.Debian");
     $self->create_copyright("$debiandir/copyright");
-    $self->fix_rules( "$debiandir/rules",
-        ( defined $changelog ? $changelog : '' ),
-        \@docs, \@examples );
+    $self->fix_rules( "$debiandir/rules", \@docs, \@examples );
     $self->apply_final_overrides();
     $self->build_package
         if $self->cfg->build or $self->cfg->install;
@@ -963,23 +953,6 @@
     }
 
     $parser->cleanup;
-}
-
-sub extract_changelog {
-    my ( $self ) = @_;
-
-    my $dir = $self->main_dir;
-
-    $dir .= '/' unless $dir =~ m(/$);
-    find(
-        sub {
-            $changelog = substr( $File::Find::name, length($dir) )
-                if ( !defined($changelog) && /^change(s|log)$/i
-                and ( !$self->cfg->exclude or $File::Find::name !~ $self->cfg->exclude )
-                );
-        },
-        $dir
-    );
 }
 
 sub extract_docs {
@@ -1460,7 +1433,7 @@
 }
 
 sub fix_rules {
-    my ( $self, $rules_file, $changelog_file, $docs, $examples ) = @_;
+    my ( $self, $rules_file, $docs, $examples ) = @_;
 
     my ( $test_line, $fh, @content );
 
@@ -1996,12 +1969,6 @@
     $arch = $val
         if (
         defined( $val = $self->get_override_val( $data, $subkey, 'arch' ) ) );
-    $changelog = $val
-        if (
-        defined(
-            $val = $self->get_override_val( $data, $subkey, 'changelog' )
-        )
-        );
     @docs = split( /\s+/, $val )
         if (
         defined( $val = $self->get_override_val( $data, $subkey, 'docs' ) ) );




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