[libapache2-mod-perl2] 01/01: refresh patches to apply cleanly

Damyan Ivanov dmn at moszumanska.debian.org
Sat May 28 18:10:28 UTC 2016


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

dmn pushed a commit to branch master
in repository libapache2-mod-perl2.

commit c1095800f5bacb82ea2ae1f94454dd9b038001e4
Author: Damyan Ivanov <dmn at debian.org>
Date:   Sat May 28 17:44:29 2016 +0000

    refresh patches to apply cleanly
---
 debian/patches/006_man_section_and_build_warnings.patch | 2 +-
 debian/patches/031-test-extra-args.patch                | 2 +-
 debian/patches/200_fix-pod-spelling-errors.patch        | 4 ++--
 debian/patches/210_fix-pod-errors.patch                 | 4 ++--
 debian/patches/220_fix-bad-whatis-entry.patch           | 2 +-
 debian/patches/avoid-db-linkage.patch                   | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/debian/patches/006_man_section_and_build_warnings.patch b/debian/patches/006_man_section_and_build_warnings.patch
index 9a10318..4afa941 100644
--- a/debian/patches/006_man_section_and_build_warnings.patch
+++ b/debian/patches/006_man_section_and_build_warnings.patch
@@ -7,7 +7,7 @@ Last-Update: 2011-03-22
 Reviewed-by: Nicholas Bamber <nicholas at periapt.co.uk>
 --- a/lib/ModPerl/BuildMM.pm
 +++ b/lib/ModPerl/BuildMM.pm
-@@ -282,7 +282,7 @@ sub ModPerl::BuildMM::MY::postamble {
+@@ -283,7 +283,7 @@ sub ModPerl::BuildMM::MY::postamble {
                  $man =~ s!/!::!g;
  
                  push @target,
diff --git a/debian/patches/031-test-extra-args.patch b/debian/patches/031-test-extra-args.patch
index f883ef4..524bd87 100644
--- a/debian/patches/031-test-extra-args.patch
+++ b/debian/patches/031-test-extra-args.patch
@@ -7,7 +7,7 @@ Last-Update: 2012-05-19
 Reviewed-by: Nicholas Bamber <nicholas at periapt.co.uk>
 --- a/Makefile.PL
 +++ b/Makefile.PL
-@@ -840,12 +840,12 @@ TEST_FILES =
+@@ -843,12 +843,12 @@ TEST_FILES =
  
  test_clean :
  	$(FULLPERL) -I$(INST_ARCHLIB) -I$(INST_LIB) \
diff --git a/debian/patches/200_fix-pod-spelling-errors.patch b/debian/patches/200_fix-pod-spelling-errors.patch
index 895bccb..a89e180 100644
--- a/debian/patches/200_fix-pod-spelling-errors.patch
+++ b/debian/patches/200_fix-pod-spelling-errors.patch
@@ -118,7 +118,7 @@ Reviewed-by: Nicholas Bamber <nicholas at periapt.co.uk>
  
 --- a/lib/Apache2/compat.pm
 +++ b/lib/Apache2/compat.pm
-@@ -255,7 +255,7 @@ sub override_mp2_api {
+@@ -260,7 +260,7 @@ sub override_mp2_api {
  }
  
  # restore_mp2_api does the opposite of override_mp2_api(), it removes
@@ -253,7 +253,7 @@ Reviewed-by: Nicholas Bamber <nicholas at periapt.co.uk>
  
 --- a/Apache-Test/lib/Apache/Test.pm
 +++ b/Apache-Test/lib/Apache/Test.pm
-@@ -749,7 +749,7 @@ Same as I<Test::ok>, see I<Test.pm> docu
+@@ -765,7 +765,7 @@ Same as I<Test::ok>, see I<Test.pm> docu
  
  =item sok
  
diff --git a/debian/patches/210_fix-pod-errors.patch b/debian/patches/210_fix-pod-errors.patch
index d8be0f9..d522447 100644
--- a/debian/patches/210_fix-pod-errors.patch
+++ b/debian/patches/210_fix-pod-errors.patch
@@ -5,7 +5,7 @@ Last-Update: 2011-03-22
 Reviewed-by: Nicholas Bamber <nicholas at periapt.co.uk>
 --- a/Apache-Test/lib/Apache/Test.pm
 +++ b/Apache-Test/lib/Apache/Test.pm
-@@ -1020,6 +1020,8 @@ if no reason is given a default reason w
+@@ -1040,6 +1040,8 @@ if no reason is given a default reason w
  
  =head1 Additional Configuration Variables
  
@@ -14,7 +14,7 @@ Reviewed-by: Nicholas Bamber <nicholas at periapt.co.uk>
  =item basic_config
  
    my $basic_cfg = Apache::Test::basic_config();
-@@ -1052,6 +1054,8 @@ If no arguments are passed, the referenc
+@@ -1072,6 +1074,8 @@ If no arguments are passed, the referenc
  returned. If one or more arguments are passed the corresponding values
  are returned.
  
diff --git a/debian/patches/220_fix-bad-whatis-entry.patch b/debian/patches/220_fix-bad-whatis-entry.patch
index 4e8244b..4824c79 100644
--- a/debian/patches/220_fix-bad-whatis-entry.patch
+++ b/debian/patches/220_fix-bad-whatis-entry.patch
@@ -8,7 +8,7 @@ Last-Update: 2011-03-22
 Reviewed-by: Nicholas Bamber <nicholas at periapt.co.uk>
 --- a/Apache-Test/lib/Apache/TestServer.pm
 +++ b/Apache-Test/lib/Apache/TestServer.pm
-@@ -379,7 +379,7 @@ sub port_available {
+@@ -395,7 +395,7 @@ sub port_available {
      }
  }
  
diff --git a/debian/patches/avoid-db-linkage.patch b/debian/patches/avoid-db-linkage.patch
index d36e99d..ad6a59b 100644
--- a/debian/patches/avoid-db-linkage.patch
+++ b/debian/patches/avoid-db-linkage.patch
@@ -6,7 +6,7 @@ Last-Update: 2011-04-10
 Forwarded: not-needed
 --- a/lib/Apache2/Build.pm
 +++ b/lib/Apache2/Build.pm
-@@ -1175,6 +1175,8 @@ sub apru_link_flags {
+@@ -1181,6 +1181,8 @@ sub apru_link_flags {
      # resolve the symbols right during linking
      for ($self->apu_config_path, $self->apr_config_path) {
          my $flags = '--link-ld --libs';

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



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