[libdevel-nytprof-perl] 01/02: Replace our sub-name.patch with the upstream commit.

[gregor herrmann]

This is an automated email from the git hooks/post-receive script.

gregoa pushed a commit to branch master
in repository libdevel-nytprof-perl.

commit 4d930dc60cac110a386ef07ced974328fb8e977b
Author: gregor herrmann <gregoa at debian.org>
Date:   Sun Sep 14 23:36:35 2014 +0200

    Replace our sub-name.patch with the upstream commit.
---
 debian/patches/sub-name.patch | 42 ++++++++++++++++++++++--------------------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/debian/patches/sub-name.patch b/debian/patches/sub-name.patch
index cd45b70..6e6aaa3 100644
--- a/debian/patches/sub-name.patch
+++ b/debian/patches/sub-name.patch
@@ -1,26 +1,28 @@
-Description: mark tests as TODO until Sub::Name is fixed
-Origin: vendor
+From 533760724091d3b1a01047038381dfb3fdb46b4a Mon Sep 17 00:00:00 2001
+From: Tim Bunce <Tim.Bunce at pobox.com>
+Date: Sun, 14 Sep 2014 22:24:53 +0100
+Subject: [PATCH] Only run t/70-subname.t if Sub::Name 0.11 or later is
+ installed.
+
 Bug: https://github.com/timbunce/devel-nytprof/issues/34
 Bug-Debian: https://bugs.debian.org/755332
-Forwarded: not-needed, the idea is from there
-Author: gregor herrmann <gregoa at debian.org>
-Last-Update: 2014-07-24
 
+---
+ t/70-subname.t | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/t/70-subname.t b/t/70-subname.t
+index 2253ef7..9c24b32 100644
 --- a/t/70-subname.t
 +++ b/t/70-subname.t
-@@ -39,10 +39,11 @@
-         is $sub->subname, 'main::named';
+@@ -6,8 +6,8 @@ use Test::More;
+ use lib qw(t/lib);
+ use NYTProfTest;
+ 
+-eval "use Sub::Name 0.04; 1"
+-	or plan skip_all => "Sub::Name 0.04 required (0.06+ preferred)";
++eval "use Sub::Name 0.11; 1"
++	or plan skip_all => "Sub::Name 0.11 or later required";
+ 
+ print "Sub::Name $Sub::Name::VERSION $INC{'Sub/Name.pm'}\n";
  
-         SKIP: {
--            skip "Sub::Name 0.06 required for subname line numbers", 2
--                if $Sub::Name::VERSION <= 0.06;
--            is $sub->first_line, 3;
--            is $sub->last_line,  3;
-+            {
-+                local $TODO = "Sub::Name problems, cf. CPAN RT #50524";
-+                is $sub->first_line, 3;
-+                is $sub->last_line,  3;
-+            }
-         }
-     },
- });

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libdevel-nytprof-perl.git