r71876 - in /trunk/libapache2-mod-perl2/debian: changelog patches/200_fix-pod-spelling-errors.patch

Tue Mar 22 21:33:22 UTC 2011

Author: periapt-guest
Date: Tue Mar 22 21:33:11 2011
New Revision: 71876

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=71876
Log:
Reviewed 9 patches

Modified:
    trunk/libapache2-mod-perl2/debian/changelog
    trunk/libapache2-mod-perl2/debian/patches/200_fix-pod-spelling-errors.patch

Modified: trunk/libapache2-mod-perl2/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libapache2-mod-perl2/debian/changelog?rev=71876&op=diff
==============================================================================

--- trunk/libapache2-mod-perl2/debian/changelog (original)
+++ trunk/libapache2-mod-perl2/debian/changelog Tue Mar 22 21:33:11 2011
@@ -13,7 +13,7 @@
   * Added versioning of depdendency between dev and core packages
   * Registered documents with doc-base (in progress)
   * New upstream release
-  * Reviewed 8 patches
+  * Reviewed 9 patches
     - Removed 009_allow_parallel_build.patch [applied upstream]
     - Removed 100-svn-XSS-Status.patch [applied upstream]
     - Removed 110-Fix-two-uninitialized-....patch [applied upstream]

Modified: trunk/libapache2-mod-perl2/debian/patches/200_fix-pod-spelling-errors.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libapache2-mod-perl2/debian/patches/200_fix-pod-spelling-errors.patch?rev=71876&op=diff
==============================================================================
--- trunk/libapache2-mod-perl2/debian/patches/200_fix-pod-spelling-errors.patch (original)
+++ trunk/libapache2-mod-perl2/debian/patches/200_fix-pod-spelling-errors.patch Tue Mar 22 21:33:11 2011
@@ -4,67 +4,12 @@
  but is not done with this patch.
 Forwarded: http://mail-archives.apache.org/mod_mbox/perl-modperl/201004.mbox/thread
 Author: Damyan Ivanov <dmn at debian.org>
-Last-Update: 2010-04-20
+Last-Update: 2011-03-22
+Reviewed-by: Nicholas Bamber <nicholas at periapt.co.uk>
 
---- a/Apache-Test/lib/Apache/TestConfig.pm
-+++ b/Apache-Test/lib/Apache/TestConfig.pm
-@@ -2221,8 +2221,8 @@ sub custom_config_add_conf_opts {
-     # the logic is quite complicated with 'httpd' and 'apxs', since
-     # one is enough to run the test suite, and we need to avoid the
-     # situation where both are saved in custom config but only one
--    # (let's say httpd) is overriden by the command line /env var and
--    # a hell may break loose if we take that overriden httpd value and
-+    # (let's say httpd) is overridden by the command line /env var and
-+    # a hell may break loose if we take that overridden httpd value and
-     # also use apxs from custom config which could point to a different
-     # server. So if there is an override of apxs or httpd, do not use
-     # the custom config for apxs or httpd.
---- a/Apache-Test/lib/Apache/TestRun.pm
-+++ b/Apache-Test/lib/Apache/TestRun.pm
-@@ -1456,7 +1456,7 @@ F<lib/Apache/TestConfigData.pm> (if duri
- F<~/.apache-test/Apache/TestConfigData.pm> and
- F<Apache/TestConfigData.pm> in the perl's libraries.
- 
--C<$config_overriden> - that means that we have either C<apxs> or
-+C<$config_overridden> - that means that we have either C<apxs> or
- C<httpd> values provided by user, via env vars or command line options.
- 
- =over
-@@ -1477,12 +1477,12 @@ bundles Apache-Test).
-   3) make test
- 
-   if $config_exists
--      if $config_overriden
--          override saved options (for those that were overriden)
-+      if $config_overridden
-+          override saved options (for those that were overridden)
-       else
-           use saved options
-   else
--      if $config_overriden
-+      if $config_overridden
-           save them in lib/Apache/TestConfigData.pm
-           (which will be installed on 'make install')
-       else
-@@ -1523,12 +1523,12 @@ F<~/.apache-test/Apache/TestConfigData.p
-   3) make test
- 
-   if $config_exists
--      if $config_overriden
--          override saved options (for those that were overriden)
-+      if $config_overridden
-+          override saved options (for those that were overridden)
-       else
-           use saved options
-   else
--      if $config_overriden
-+      if $config_overridden
-           save them in $custom_config_path
-       else
-           - run interactive prompt for C<httpd> and optionally for C<apxs>
 --- a/Apache-Test/lib/Apache/TestTrace.pm
 +++ b/Apache-Test/lib/Apache/TestTrace.pm
-@@ -126,9 +126,9 @@ sub nc_trace {
+@@ -126,9 +126,9 @@
  }
  
  sub trace_level {
@@ -78,7 +23,7 @@
      # or default
 --- a/Apache-Test/lib/Apache/TestUtil.pm
 +++ b/Apache-Test/lib/Apache/TestUtil.pm
-@@ -822,7 +822,7 @@ directory separators. The function is no
+@@ -859,7 +859,7 @@
  =item t_start_error_log_watch(), t_finish_error_log_watch()
  
  This pair of functions provides an easy interface for checking
@@ -89,7 +34,7 @@
  this with a call to one of the t_*_is_expected() functions.
 --- a/ModPerl-Registry/lib/ModPerl/RegistryCooker.pm
 +++ b/ModPerl-Registry/lib/ModPerl/RegistryCooker.pm
-@@ -61,7 +61,7 @@ use constant D_WARN    => 2;
+@@ -61,7 +61,7 @@
  use constant D_COMPILE => 4;
  use constant D_NOISE   => 8;
  
@@ -100,7 +45,7 @@
  use constant DEBUG => 0;
 --- a/docs/api/APR.pod
 +++ b/docs/api/APR.pod
-@@ -18,7 +18,7 @@ libaprutil Libraries)
+@@ -18,7 +18,7 @@
  
  =head1 Description
  
@@ -111,7 +56,7 @@
  You don't need to use this module explicitly, since it's already
 --- a/docs/api/Apache2/Module.pod
 +++ b/docs/api/Apache2/Module.pod
-@@ -413,7 +413,7 @@ Remove a module from the list of loaded
+@@ -413,7 +413,7 @@
  
  =head2 C<top_module>
  
@@ -122,7 +67,7 @@
    $module = Apache2::Module::top_module();
 --- a/docs/api/Apache2/Util.pod
 +++ b/docs/api/Apache2/Util.pod
-@@ -36,7 +36,7 @@ C<Apache2::Util> provides the following
+@@ -36,7 +36,7 @@
  
  =head2 C<escape_path>
  
@@ -133,7 +78,7 @@
    $escaped_path = Apache2::Util::escape_path($path, $p, $partial);
 --- a/docs/api/ModPerl/MM.pod
 +++ b/docs/api/ModPerl/MM.pod
-@@ -55,7 +55,7 @@ hasn't already specified a method I<MY::
+@@ -55,7 +55,7 @@
  C<ModPerl::MM> will DWIM and do nothing.
  
  In case the functionality of C<ModPerl::MM> methods needs to be
@@ -142,7 +87,7 @@
  can be called internally. For example if you need to modify constants
  in addition to the modifications applied by
  C<ModPerl::MM::MY::constants>, call the C<ModPerl::MM::MY::constants>
-@@ -72,7 +72,7 @@ not C<ModPerl::MM>), then do your extra
+@@ -72,7 +72,7 @@
  In certain cases a developers may want to prevent from C<ModPerl::MM>
  to override certain methods. In that case an explicit override in
  I<Makefile.PL> will do the job. For example if you don't want the
@@ -151,7 +96,7 @@
  I<Makefile.PL>:
  
    sub MY::constants { shift->MM::constants(@_); }";
-@@ -89,7 +89,7 @@ C<ModPerl::MM::WriteMakefile> supplies d
+@@ -89,7 +89,7 @@
  C<INC> and C<TYPEMAPS> unless they weren't passed to
  C<ModPerl::MM::WriteMakefile> from I<Makefile.PL>.
  
@@ -162,7 +107,7 @@
  
 --- a/docs/api/ModPerl/RegistryCooker.pod
 +++ b/docs/api/ModPerl/RegistryCooker.pod
-@@ -25,7 +25,7 @@ Provide ingredients that can be used by
+@@ -25,7 +25,7 @@
  
  =item *
  
@@ -173,7 +118,7 @@
  
 --- a/lib/Apache2/compat.pm
 +++ b/lib/Apache2/compat.pm
-@@ -254,7 +254,7 @@ sub override_mp2_api {
+@@ -254,7 +254,7 @@
  }
  
  # restore_mp2_api does the opposite of override_mp2_api(), it removes
@@ -184,7 +129,7 @@
  
 --- a/lib/Apache2/porting.pm
 +++ b/lib/Apache2/porting.pm
-@@ -84,9 +84,9 @@ BEGIN {
+@@ -84,9 +84,9 @@
          $package =~ s|/|::|g;
          $package =~ s|.pm$||;
  
@@ -198,7 +143,7 @@
          my $msg = "mod_perl 2.0 API doesn't include package '$package'.";
 --- a/xs/APR/Pool/APR__Pool.h
 +++ b/xs/APR/Pool/APR__Pool.h
-@@ -49,7 +49,7 @@ APR_OPTIONAL_FN_TYPE(modperl_thx_interp_
+@@ -49,7 +49,7 @@
  #define MP_APR_POOL_SV_HAS_OWNERSHIP(sv) mpxs_pool_is_custom(sv)
  
  /* before the magic is freed, one needs to carefully detach the
@@ -209,7 +154,7 @@
   * destruction of the parent pool will destroy the child pool C guts
 --- a/todo/bugs_build
 +++ b/todo/bugs_build
-@@ -71,7 +71,7 @@ HPUX11i     DSO
+@@ -71,7 +71,7 @@
  
  * we have a dependency check problem when xs/*/*.h use code from
    xs/modperl_xs*.h, when the latter change 'make' won't rebuild the


