[libdevel-cover-perl] 04/06: drop keep-non-existent-dirs-in-INC.patch, fixed upstream in a different way

Florian Schlichting fsfs at alioth.debian.org
Thu Aug 22 12:14:24 UTC 2013


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

fsfs pushed a commit to branch master
in repository libdevel-cover-perl.

commit 6a4393184e5f8aade8883a5f80238776d5474d04
Author: Florian Schlichting <fsfs at debian.org>
Date:   Thu Aug 22 12:47:50 2013 +0200

    drop keep-non-existent-dirs-in-INC.patch, fixed upstream in a different way
    
    I could test that a current version built without this patch does not
    have the /usr/local dirs in Inc.pm, but the coverage report does not
    include locally installed modules (as I could observe with old versions
    of libdevel-cover-perl). So I trust upstream's solution works and we can
    indeed drop keep-non-existent-dirs-in-INC.patch.
---
 debian/patches/keep-non-existent-dirs-in-INC.patch |   30 --------------------
 debian/patches/series                              |    1 -
 2 files changed, 31 deletions(-)

diff --git a/debian/patches/keep-non-existent-dirs-in-INC.patch b/debian/patches/keep-non-existent-dirs-in-INC.patch
deleted file mode 100644
index 4e8de7c..0000000
--- a/debian/patches/keep-non-existent-dirs-in-INC.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Subject: Fix directories
- The idea of the patch is to pass non-existent directories literally so
- that they can be examined when they exist on the user's system
-Author: Damyan Ivanov <dmn at debian.org>
-Bug-Debian: http://bugs.debian.org/476272
-Bug: http://rt.cpan.org/Ticket/Display.html?id=37349
-Reviewed-by: Nicholas Bamber <nicholas at periapt.co.uk>
-Reviewed-by: gregor herrmann <gregoa at debian.org>
-Last-Update: 2012-12-09
-
---- a/Makefile.PL
-+++ b/Makefile.PL
-@@ -24,7 +24,7 @@
-                           "-s", "Installation of Devel::Cover $Version");
- my $Perlbug = join " ", map { / / ? "'$_'" : $_ } @perlbug;
- my $base    = getcwd;
--my %inc     = map { -d $_ ? (($_ eq "." ? $_ : Cwd::abs_path($_)) => 1) : () }
-+my %inc     = map { (($_ eq "." or ! -d $_) ? $_ : Cwd::abs_path($_)) => 1 }
-                   @INC;
- my @inc     = sort keys %inc;
- 
-@@ -65,7 +65,7 @@
- 
- EOM
-     eval "use Cwd";
--    my \%inc = map { -d \$_ ? ((\$_ eq "." ? \$_ : Cwd::abs_path(\$_)) => 1) : () }
-+    my \%inc = map { ((\$_ eq "." or ! -d \$_) ? \$_ : Cwd::abs_path(\$_)) => 1 }
-                    \@INC;
-     \@Inc = sort keys \%inc;
- }
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index fe8ebb1..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-keep-non-existent-dirs-in-INC.patch

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



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