[pmtools] 01/03: refresh patches using --no-timestamps --no-index -p ab --strip- trailing-whitespace

Damyan Ivanov dmn at moszumanska.debian.org
Fri Jan 17 21:09:08 UTC 2014


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

dmn pushed a commit to branch master
in repository pmtools.

commit 03bf2f83b2e59711143486ae408fd1aca7175acb
Author: Damyan Ivanov <dmn at debian.org>
Date:   Fri Jan 17 21:01:15 2014 +0000

    refresh patches using --no-timestamps --no-index -p ab --strip- trailing-whitespace
---
 debian/changelog                                   |  5 +++++
 .../fix-carp-has-no-pod-for-test-suite.patch       | 24 ++++++++--------------
 debian/patches/pminst-should-follow-symlinks.patch |  8 +++-----
 3 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8794b56..c43ae5a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,12 @@
 pmtools (1.54-2) UNRELEASED; urgency=low
 
+  [ Axel Beckert ]
   * Bump Standard-Version to 3.9.5 (no changes).
 
+  [ Damyan Ivanov ]
+  * refresh patches using --no-timestamps --no-index -p ab --strip-
+    trailing-whitespace
+
  -- Axel Beckert <abe at debian.org>  Mon, 28 Oct 2013 14:06:09 +0100
 
 pmtools (1.54-1) unstable; urgency=low
diff --git a/debian/patches/fix-carp-has-no-pod-for-test-suite.patch b/debian/patches/fix-carp-has-no-pod-for-test-suite.patch
index 5925eb5..e4dc422 100644
--- a/debian/patches/fix-carp-has-no-pod-for-test-suite.patch
+++ b/debian/patches/fix-carp-has-no-pod-for-test-suite.patch
@@ -4,11 +4,9 @@ Author: Axel Beckert <abe at debian.org>
 Bug: https://rt.cpan.org/Public/Bug/Display.html?id=89006
 Forwarded: https://rt.cpan.org/Public/Bug/Display.html?id=89006#txn-1267890
 
-Index: pmtools/t/pmdesc.t
-===================================================================
---- pmtools.orig/t/pmdesc.t	2013-09-27 22:12:10.000000000 +0200
-+++ pmtools/t/pmdesc.t	2013-09-27 22:37:05.000000000 +0200
-@@ -12,8 +12,8 @@
+--- a/t/pmdesc.t
++++ b/t/pmdesc.t
+@@ -12,8 +12,8 @@ my $output = undef;	# output from pmdesc
  $ENV{"PATH"} = 'blib/script:' . $ENV{"PATH"};
  
  eval {
@@ -19,11 +17,9 @@ Index: pmtools/t/pmdesc.t
  is($?,        0,                          "pmdesc runs");
 -like($output, qr/Carp \(\d+\.\d+\) - \w/, "described a module");
 +like($output, qr/English \(\d+\.\d+\) - \w/, "described a module");
-Index: pmtools/t/pman.t
-===================================================================
---- pmtools.orig/t/pman.t	2013-09-27 22:12:10.000000000 +0200
-+++ pmtools/t/pman.t	2013-09-27 22:37:54.000000000 +0200
-@@ -12,8 +12,8 @@
+--- a/t/pman.t
++++ b/t/pman.t
+@@ -12,8 +12,8 @@ my $output = undef;	# output from pman
  $ENV{"PATH"} = 'blib/script:' . $ENV{"PATH"};
  
  eval {
@@ -34,11 +30,9 @@ Index: pmtools/t/pman.t
  is($?,        256,                                          "pman runs");
 -like($output, qr/NAME.*[Cc]arp - \w.*SYNOPSIS.*DESCRIPTION/ms, "found Carp");
 +like($output, qr/NAME.*[Ee]nglish - \w.*SYNOPSIS.*DESCRIPTION/ms, "found English");
-Index: pmtools/t/pmcat.t
-===================================================================
---- pmtools.orig/t/pmcat.t	2013-09-27 22:12:10.000000000 +0200
-+++ pmtools/t/pmcat.t	2013-09-27 22:38:43.000000000 +0200
-@@ -12,8 +12,8 @@
+--- a/t/pmcat.t
++++ b/t/pmcat.t
+@@ -12,8 +12,8 @@ my $output = undef;	# output from pmcat
  $ENV{"PATH"} = 'blib/script:' . $ENV{"PATH"};
  
  eval {
diff --git a/debian/patches/pminst-should-follow-symlinks.patch b/debian/patches/pminst-should-follow-symlinks.patch
index 578b125..79a316a 100644
--- a/debian/patches/pminst-should-follow-symlinks.patch
+++ b/debian/patches/pminst-should-follow-symlinks.patch
@@ -4,11 +4,9 @@ Description: At least on Debian pminst should follow symlinks
 Author: Axel Beckert <abe at debian.org>
 Forwarded: https://rt.cpan.org/Public/Bug/Display.html?id=89008
 
-Index: pmtools/bin/pminst
-===================================================================
---- pmtools.orig/bin/pminst	2013-09-27 23:37:28.000000000 +0200
-+++ pmtools/bin/pminst	2013-09-27 23:38:36.000000000 +0200
-@@ -35,7 +35,7 @@
+--- a/bin/pminst
++++ b/bin/pminst
+@@ -35,7 +35,7 @@ use vars qw($opt_l $opt_s %seen);
  for $startdir (@INC) { 
      next if (!-d $startdir);
  

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



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