r49420 - in /trunk/libdevel-nytprof-perl/debian: changelog patches/bin-docs.patch patches/series

jawnsy-guest at users.alioth.debian.org jawnsy-guest at users.alioth.debian.org
Sat Dec 26 14:25:20 UTC 2009


Author: jawnsy-guest
Date: Sat Dec 26 14:24:29 2009
New Revision: 49420

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=49420
Log:
Cherry-pick changes from upstream (RT#53098, RT#53097)

Added:
    trunk/libdevel-nytprof-perl/debian/patches/bin-docs.patch
Modified:
    trunk/libdevel-nytprof-perl/debian/changelog
    trunk/libdevel-nytprof-perl/debian/patches/series

Modified: trunk/libdevel-nytprof-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdevel-nytprof-perl/debian/changelog?rev=49420&op=diff
==============================================================================
--- trunk/libdevel-nytprof-perl/debian/changelog (original)
+++ trunk/libdevel-nytprof-perl/debian/changelog Sat Dec 26 14:24:29 2009
@@ -1,8 +1,4 @@
 libdevel-nytprof-perl (3.00-1) UNRELEASED; urgency=low
-
-  NOTE: waiting to hear back from upstream re
-    http://rt.cpan.org/Public/Bug/Display.html?id=53098
-    http://rt.cpan.org/Public/Bug/Display.html?id=53097
 
   [ Jonathan Yu ]
   * New upstream release
@@ -11,6 +7,7 @@
   * Refresh patches
   * Standards-Version 3.8.3 (drop perl version dep)
   * Add overrides to deal with shebangs and resource forks
+  * Cherry-pick changes from upstream (RT#53098, RT#53097)
 
   [ Ryan Niebur ]
   * Update jawnsy's email address

Added: trunk/libdevel-nytprof-perl/debian/patches/bin-docs.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdevel-nytprof-perl/debian/patches/bin-docs.patch?rev=49420&op=file
==============================================================================
--- trunk/libdevel-nytprof-perl/debian/patches/bin-docs.patch (added)
+++ trunk/libdevel-nytprof-perl/debian/patches/bin-docs.patch Sat Dec 26 14:24:29 2009
@@ -1,0 +1,183 @@
+Description: apply doc patch from upstream
+ This has been fixed in SVN r999; please remove this patch
+ upon package upgrade.
+Bug-CPAN: http://rt.cpan.org/Public/Bug/Display.html?id=53098
+Author: Tim Bunce <Tim.Bunce at pobox.com>
+Origin: upstream
+Forwarded: yes
+--- a/bin/nytprofcg
++++ b/bin/nytprofcg
+@@ -9,15 +9,22 @@
+ ###########################################################
+ use warnings;
+ use strict;
+-use Devel::NYTProf::Data;
++
+ use Getopt::Long;
+ 
++use Devel::NYTProf::Data;
++
++
+ my %opt = (
+     file => 'nytprof.out',
+     out  => 'nytprof.callgrind',
+ );
+ 
+-process_cli();
++GetOptions( \%opt, qw/file|f=s out|o=s help|h/ )
++    or usage();
++
++usage() if $opt{help};
++
+ 
+ print "Reading $opt{file} ...\n";
+ 
+@@ -48,7 +55,7 @@
+ 
+     print $fh 'fl='.( $fi ? $fi->filename : "Unknown").$/;
+     print $fh 'fn='.$sub->subname.$/;
+-    print $fh join(' ',$sub->first_line, int($sub->excl_time * 1000000)).$/;
++    print $fh join(' ',$sub->first_line, int($sub->excl_time * 1_000_000)).$/;
+     print $fh $/;
+ 
+     my @callers;
+@@ -90,37 +97,45 @@
+         # calls=(Call Count) (Destination position)
+         # (Source position) (Inclusive cost of call)
+         print $fh "calls=$count ".$sub->first_line.$/;
+-        print $fh "$line ".int(1000000 * $incl_time).$/;
++        print $fh "$line ".int(1_000_000 * $incl_time).$/;
+         print $fh $/;
+     }
+ }
+ 
+-sub process_cli {
+-    GetOptions( \%opt, qw/file|f=s out|o=s help|h/ )
+-        or do {
+-            usage();
+-            exit 1;
+-        };
+-
+-    if ( defined( $opt{help} ) ) {
+-        usage();
+-        exit;
+-    }
+-}
+-
+ sub usage {
+-    print <<END
++    print <<END;
+ usage: [perl] nytprofcg [opts]
+- --file <file>, -f <file>  Use the specified file as Devel::NYTProf database
+-                            file. [default: ./nytprof.out]
+- --out <dir>,   -o <dir>   Place generated files here [default: ./nytprof]
+- --delete,      -d         Delete the old output [uses --out]
++ --file <file>, -f <file>  Specify NYTProf data file [default: nytprof.out]
++ --out <file>,  -o <file>  Specify output file [default: nytprof.callgrind]
+  --help,        -h         Print this message
+ 
+ This script of part of the Devel::NYTProf distribution.
+ Released under the same terms as Perl 5.8.0
+ See http://search.cpan.org/dist/Devel-NYTProf/
+ END
++    exit 1;
+ }
+ 
+ __END__
++
++=head1 NAME
++
++nytprofcg - Convert an NYTProf profile into Callgrind format
++
++=head1 SYNOPSIS
++
++ $ nytprofcg --file=nytprof.out --out=nytprof.callgrind
++
++ $ nytprofcg    # same as above
++
++=head1 DESCRIPTION
++
++Reads a profile data file generated by Devel::NYTProf and writes out the
++subroutine call graph information it contains in Callgrind format.
++
++The output Callgrind file can be loaded into the C<kcachegrind> GUI for
++interactive exploration.
++
++For more information see L<http://kcachegrind.sourceforge.net/html/Home.html>
++
++=cut
+--- a/bin/nytprofmerge
++++ b/bin/nytprofmerge
+@@ -17,7 +17,7 @@
+ require Devel::NYTProf::FileHandle;
+ use Devel::NYTProf::ReadStream qw(for_chunks);
+ 
+-our $VERSION = '2.11';
++our $VERSION = '3.00';
+     
+ if ($VERSION != $Devel::NYTProf::Core::VERSION) {
+     die "$0 version '$VERSION' doesn't match version '$Devel::NYTProf::Core::VERSION' of $INC{'Devel/NYTProf/Core.pm'}\n";
+@@ -35,19 +35,6 @@
+ ) or usage();
+ 
+ 
+-sub usage {
+-    print <<END;
+-usage: [perl] nytprofmerge [opts] nytprof-file [...]
+- --out <file>,  -o <file>  Name of output file [default: $opt_out]
+- --help,        -h         Print this message
+- --verbose,     -v         Be more verbose
+-
+-This script of part of the Devel::NYTProf distribution.
+-See http://search.cpan.org/dist/Devel-NYTProf/ for details and copyright.
+-END
+-    exit 1;
+-}
+-
+ print "Writing $opt_out\n" if $opt_verbose;
+ my $out = Devel::NYTProf::FileHandle::open($opt_out, "wb")
+     or die "Error opening $opt_out: $!\n";
+@@ -312,3 +299,43 @@
+ 
+ print "Done.\n" if $opt_verbose;
+ exit 0;
++
++sub usage {
++    print <<END;
++usage: [perl] nytprofmerge [opts] nytprof-file [...]
++ --out <file>,  -o <file>  Name of output file [default: $opt_out]
++ --help,        -h         Print this message
++ --verbose,     -v         Be more verbose
++
++This script of part of the Devel::NYTProf distribution.
++See http://search.cpan.org/dist/Devel-NYTProf/ for details and copyright.
++END
++    exit 1;
++}
++
++__END__
++
++=head1 NAME
++
++nytprofmerge - Reads multiple NYTProf profiles and outputs a merged one
++
++=head1 SYNOPSIS
++
++ $ nytprofmerge --out=nytprof-merged.out nytprof.out.*
++
++ $ nytprofmerge nytprof.out.*
++
++=head1 DESCRIPTION
++
++Reads multiple profile data files generated by Devel::NYTProf and writes out
++a new profile data file containing data merged from the original files.
++
++C<nytprofmerge> is likely to produce garbage if the input profiles
++aren't all profiles of exactly the same software.
++
++C<nytprofmerge> is new and somewhat experimental. If it produces unexpected
++results please produce a I<small> test case that demonstrates the problem and
++let us know at L<http://groups.google.com/group/develnytprof-dev> - thanks!
++
++=cut
++

Modified: trunk/libdevel-nytprof-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdevel-nytprof-perl/debian/patches/series?rev=49420&op=diff
==============================================================================
--- trunk/libdevel-nytprof-perl/debian/patches/series (original)
+++ trunk/libdevel-nytprof-perl/debian/patches/series Sat Dec 26 14:24:29 2009
@@ -1,3 +1,4 @@
 manpage-section.patch
 usr-share.patch
 test_more.patch
+bin-docs.patch




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