[SCM] Debian packaging of libdevel-cover-perl branch, master, updated. upstream/0.79-82-g6434fcc

gregor herrmann gregoa at debian.org
Sat Apr 7 13:22:33 UTC 2012


The following commit has been merged in the master branch:
commit 7124aa70eb571465764d21b1db2225855a9e0fcb
Author: gregor herrmann <gregoa at debian.org>
Date:   Sat Apr 7 15:02:15 2012 +0200

    Drop whatis.patch, refresh remaining patches.

diff --git a/debian/patches/keep-non-existent-dirs-in-INC.patch b/debian/patches/keep-non-existent-dirs-in-INC.patch
index a76bc0b..9851a0b 100644
--- a/debian/patches/keep-non-existent-dirs-in-INC.patch
+++ b/debian/patches/keep-non-existent-dirs-in-INC.patch
@@ -5,19 +5,20 @@ 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>
-Last-Update: 2010-09-25
+Reviewed-by: gregor herrmann <gregoa at debian.org>
+Last-Update: 2012-04-07
 --- a/Makefile.PL
 +++ b/Makefile.PL
-@@ -32,7 +32,7 @@
+@@ -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;
  
- 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;
- 
-@@ -73,7 +73,7 @@
+@@ -65,7 +65,7 @@
  
  EOM
      eval "use Cwd";
diff --git a/debian/patches/path-regexp.patch b/debian/patches/path-regexp.patch
index 8603bee..9a7b76f 100644
--- a/debian/patches/path-regexp.patch
+++ b/debian/patches/path-regexp.patch
@@ -4,14 +4,14 @@ Subject: Fix test failures when the build directory contains regexp metacharacte
  that need escaping or they break the substitution.
 Forwarded: no
 Reviewed-by: Nicholas Bamber <nicholas at periapt.co.uk>
-Last-Update: 2011-05-17
+Last-Update: 2012-04-07
 ---
  lib/Devel/Cover.pm |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 --- a/lib/Devel/Cover.pm
 +++ b/lib/Devel/Cover.pm
-@@ -469,7 +469,7 @@
+@@ -490,7 +490,7 @@
          # print STDERR "finally <$file> <$Dir>\n";
      }
      $file =~ s|\\|/|g if $^O eq "MSWin32";
diff --git a/debian/patches/series b/debian/patches/series
index ab168a1..8b11fde 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 keep-non-existent-dirs-in-INC.patch
-whatis.patch
 spelling.patch
 path-regexp.patch
diff --git a/debian/patches/spelling.patch b/debian/patches/spelling.patch
index daf6c57..9386dd2 100644
--- a/debian/patches/spelling.patch
+++ b/debian/patches/spelling.patch
@@ -3,11 +3,11 @@ Origin: vendor
 Forwarded: no
 Author: gregor herrmann <gregoa at debian.org>
 Reviewed-by: Nicholas Bamber <nicholas at periapt.co.uk>
-Last-Update: 2010-09-25
+Last-Update: 2012-04-07
 
 --- a/lib/Devel/Cover/Report/Html_minimal.pm
 +++ b/lib/Devel/Cover/Report/Html_minimal.pm
-@@ -761,7 +761,7 @@
+@@ -787,7 +787,7 @@
  =item unified
  
  Generates a "unified" report for each file. The detailed data that normally
diff --git a/debian/patches/whatis.patch b/debian/patches/whatis.patch
deleted file mode 100644
index e68753b..0000000
--- a/debian/patches/whatis.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Subject: Add missing whatis entry
-Author: Damyan Ivanov <dmn at debian.org>
-Bug: http://rt.cpan.org/Ticket/Display.html?id=37350
-Reviewed-by: Nicholas Bamber <nicholas at periapt.co.uk>
-Last-Update: 2010-09-25
---- a/lib/Devel/Cover/Tutorial.pod
-+++ b/lib/Devel/Cover/Tutorial.pod
-@@ -1,3 +1,7 @@
-+=head1 NAME
-+
-+Devel::Cover::Tutorial - Tutorial for Devel::Cover
-+
- =head1 TUTORIAL
- 
- Here's part of a message I sent to perl-qa about code coverage metrics.

-- 
Debian packaging of libdevel-cover-perl



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