diff -Nru libapache2-reload-perl-0.13/Changes libapache2-reload-perl-0.14/Changes --- libapache2-reload-perl-0.13/Changes 2015-05-09 11:56:21.000000000 +0000 +++ libapache2-reload-perl-0.14/Changes 2023-08-06 10:38:39.000000000 +0000 @@ -6,6 +6,18 @@ =over 1 +=item 0.14 August 06, 2023 + +Fix unnecessary FAIL reports on CPAN Testers by checking for mod_perl or +mod_perl2. +[Andreas Koenig , CPAN RT#34316; Steve Hay] + +Fix spelling error. +[, CPAN RT#127004] + +Fix Makefile.PL when Apache::Test is not present. +[Nigel Gregoire, CPAN RT#113778] + =item 0.13 May 09, 2015 Fix reload.t. Reported in CPAN RT#96656. diff -Nru libapache2-reload-perl-0.13/debian/changelog libapache2-reload-perl-0.14/debian/changelog --- libapache2-reload-perl-0.13/debian/changelog 2023-08-06 00:53:20.000000000 +0000 +++ libapache2-reload-perl-0.14/debian/changelog 2023-09-24 16:38:48.000000000 +0000 @@ -1,3 +1,10 @@ +libapache2-reload-perl (0.14-1) unstable; urgency=medium + + * Import upstream version 0.14. + * Drop spelling.patch, applied upstream. + + -- gregor herrmann Sun, 24 Sep 2023 18:38:48 +0200 + libapache2-reload-perl (0.13-5) unstable; urgency=medium * Fix clean target. diff -Nru libapache2-reload-perl-0.13/debian/patches/series libapache2-reload-perl-0.14/debian/patches/series --- libapache2-reload-perl-0.13/debian/patches/series 2023-08-06 00:53:20.000000000 +0000 +++ libapache2-reload-perl-0.14/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -spelling.patch diff -Nru libapache2-reload-perl-0.13/debian/patches/spelling.patch libapache2-reload-perl-0.14/debian/patches/spelling.patch --- libapache2-reload-perl-0.13/debian/patches/spelling.patch 2023-08-06 00:53:20.000000000 +0000 +++ libapache2-reload-perl-0.14/debian/patches/spelling.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,16 +0,0 @@ -Description: spelling error -Author: Xavier Guimard -Forwarded: https://rt.cpan.org/Ticket/Display.html?id=127004 -Last-Update: 2018-08-31 - ---- a/lib/Apache2/Reload.pm -+++ b/lib/Apache2/Reload.pm -@@ -363,7 +363,7 @@ - - Apache2::Reload->unregister_module('Some::Module'); - --But be carefull, since unregistering a module in this way will only -+But be careful, since unregistering a module in this way will only - do so for the current interpreter. This feature should be used with - care. - diff -Nru libapache2-reload-perl-0.13/lib/Apache/Reload.pm libapache2-reload-perl-0.14/lib/Apache/Reload.pm --- libapache2-reload-perl-0.13/lib/Apache/Reload.pm 2015-05-09 11:56:21.000000000 +0000 +++ libapache2-reload-perl-0.14/lib/Apache/Reload.pm 2023-08-06 10:38:39.000000000 +0000 @@ -17,7 +17,7 @@ use strict; -$Apache::Reload::VERSION = '0.13'; +$Apache::Reload::VERSION = '0.14'; use vars qw(%INCS %Stat $TouchTime %UndefFields %Ignore); diff -Nru libapache2-reload-perl-0.13/lib/Apache2/Reload.pm libapache2-reload-perl-0.14/lib/Apache2/Reload.pm --- libapache2-reload-perl-0.13/lib/Apache2/Reload.pm 2015-05-09 11:56:21.000000000 +0000 +++ libapache2-reload-perl-0.14/lib/Apache2/Reload.pm 2023-08-06 10:38:39.000000000 +0000 @@ -18,7 +18,7 @@ use strict; use warnings FATAL => 'all'; -our $VERSION = '0.13'; +our $VERSION = '0.14'; use Apache2::Const -compile => qw(OK); @@ -363,7 +363,7 @@ Apache2::Reload->unregister_module('Some::Module'); -But be carefull, since unregistering a module in this way will only +But be careful, since unregistering a module in this way will only do so for the current interpreter. This feature should be used with care. diff -Nru libapache2-reload-perl-0.13/Makefile.PL libapache2-reload-perl-0.14/Makefile.PL --- libapache2-reload-perl-0.13/Makefile.PL 2015-05-09 11:56:21.000000000 +0000 +++ libapache2-reload-perl-0.14/Makefile.PL 2023-08-06 10:38:39.000000000 +0000 @@ -2,6 +2,7 @@ use lib qw(lib); use Config; +use Symbol qw(gensym); my %prereqs = (); my %mp2 = ( mod_perl2 => 1.99022 ); @@ -13,7 +14,7 @@ # also set MP_APXS if ($ENV{MOD_PERL_2_BUILD}) { push @ARGV, "-apxs", $ENV{MP_APXS}; - my $mp_gen = satisfy_mp_generation(2); + $mp_gen = satisfy_mp_generation(2); } else { $mp_gen = satisfy_mp_generation(); @@ -24,7 +25,7 @@ my $HAS_APACHE_TEST = check_for_apache_test(); my $VERSION; -set_version(); +set_apache_reload_version(); my %common_opts = ( VERSION => $VERSION, @@ -84,7 +85,7 @@ return 1; } -sub set_version { +sub set_apache_reload_version { require Apache::Reload; $VERSION = $Apache::Reload::VERSION; @@ -121,13 +122,14 @@ unless ($wanted == 1 || $wanted == 2) { die "don't know anything about mod_perl generation: $wanted\n" . - "currently supporting only generations 1 and 2"; + "currently supporting only generations 1 and 2.\n" . + "Please specify MOD_PERL=1 or MOD_PERL=2 on the commandline\n"; } my $selected = 0; if ($wanted == 1) { - require_mod_perl(); + require_mod_perl(1); if ($mod_perl::VERSION >= 1.99) { # so we don't pick 2.0 version if 1.0 is wanted die "You don't seem to have mod_perl 1.0 installed"; @@ -136,7 +138,7 @@ } elsif ($wanted == 2) { #warn "Looking for mod_perl 2.0"; - require_mod_perl(); + require_mod_perl(2); if ($mod_perl::VERSION < 2.0) { die "You don't seem to have mod_perl 2.0 installed"; } @@ -152,8 +154,25 @@ } sub require_mod_perl { - eval { require mod_perl }; - eval { require mod_perl2 } if ($@); + my($rversion) = @_; + if (!$rversion || $rversion==1){ + eval { require mod_perl }; + if ($rversion == 1){ + if ($@){ + warn "Note: Did not find mod_perl installed\n"; + } + return; # do not die, let PREREQ_PM handle it + } + } + if ($@ || !$rversion || $rversion==2){ + eval { require mod_perl2 }; + if ($rversion == 2){ + if ($@){ + warn "Note: Did not find mod_perl2 installed\n"; + } + return; # do not die, let PREREQ_PM handle it + } + } die "Can't find mod_perl installed\nThe error was: $@" if $@; } @@ -210,7 +229,7 @@ unshift @INC, $atlib if -d $atlib; } - eval { require mod_perl2 } if ($@); + eval { require mod_perl2 }; unless ($@) { $wanted = 2; } @@ -228,12 +247,13 @@ sub postamble { my $self = shift; + my $q = ($^O =~ /MSWin32/i ? '"' : "'"); + my $string = $self->SUPER::postamble; - $string .= <<'EOF'; + $string .= <<"EOF"; tag : - svn copy https://svn.apache.org/repos/asf/perl/Apache-Reload/trunk https://svn.apache.org/repos/asf/perl/Apache-Reload/tags/$(VERSION_SYM) - @echo update lib/Apache/Reload.pm VERSION now + svn copy -m $q\$(VERSION_SYM) tag$q https://svn.apache.org/repos/asf/perl/Apache-Reload/trunk https://svn.apache.org/repos/asf/perl/Apache-Reload/tags/\$(VERSION_SYM) EOF return $string; diff -Nru libapache2-reload-perl-0.13/META.json libapache2-reload-perl-0.14/META.json --- libapache2-reload-perl-0.13/META.json 2015-05-09 11:56:21.000000000 +0000 +++ libapache2-reload-perl-0.14/META.json 2023-08-06 10:38:39.000000000 +0000 @@ -4,13 +4,13 @@ "unknown" ], "dynamic_config" : 1, - "generated_by" : "ExtUtils::MakeMaker version 6.98, CPAN::Meta::Converter version 2.150001", + "generated_by" : "ExtUtils::MakeMaker version 7.70, CPAN::Meta::Converter version 2.150010", "license" : [ "unknown" ], "meta-spec" : { "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", - "version" : "2" + "version" : 2 }, "name" : "Apache-Reload", "no_index" : { @@ -37,5 +37,6 @@ } }, "release_status" : "stable", - "version" : "0.13" + "version" : "0.14", + "x_serialization_backend" : "JSON::PP version 4.16" } diff -Nru libapache2-reload-perl-0.13/META.yml libapache2-reload-perl-0.14/META.yml --- libapache2-reload-perl-0.13/META.yml 2015-05-09 11:56:21.000000000 +0000 +++ libapache2-reload-perl-0.14/META.yml 2023-08-06 10:38:39.000000000 +0000 @@ -7,7 +7,7 @@ configure_requires: ExtUtils::MakeMaker: '0' dynamic_config: 1 -generated_by: 'ExtUtils::MakeMaker version 6.98, CPAN::Meta::Converter version 2.150001' +generated_by: 'ExtUtils::MakeMaker version 7.70, CPAN::Meta::Converter version 2.150010' license: unknown meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html @@ -19,4 +19,5 @@ - inc requires: mod_perl2: '1.99022' -version: '0.13' +version: '0.14' +x_serialization_backend: 'CPAN::Meta::YAML version 0.018' diff -Nru libapache2-reload-perl-0.13/RELEASE libapache2-reload-perl-0.14/RELEASE --- libapache2-reload-perl-0.13/RELEASE 2015-05-09 11:56:21.000000000 +0000 +++ libapache2-reload-perl-0.14/RELEASE 2023-08-06 10:38:39.000000000 +0000 @@ -1,22 +1,21 @@ Instructions for Apache-Reload Release Manager -0. Ask the PMC to verify that you have the appropriate CPAN permissions - on dev@perl. +0. Ask the PMC to verify that you have the appropriate CPAN permissions + on dev@perl. - If this is your first release, ask someone with APML karma on PAUSE - to verify you have the appropriate permissions. Likely someone on - the PMC can do this. - - a. login into https://pause.perl.org - b. menu click: Select Mailinglist/Action - c. choose APML and Change Permissions and click go - d. click 3.1 Make somebody else co-maintainer - e. choose the modules to give the perms to - type the username of the new co-maintainer - f. if you happen to know that packages were added this release, - make sure you give the correct permissions to them. - - MAINTAINER_BUILDING_RELEASE=1 perl Makefile.PL + If this is your first release, ask someone with APML karma on PAUSE + to verify you have the appropriate permissions. Likely someone on + the PMC can do this. + + a. login into https://pause.perl.org + b. menu click: Select Mailinglist/Action + c. choose APML and Change Permissions and click go + d. click 3.1 Make somebody else co-maintainer + e. choose the modules to give the perms to + type the username of the new co-maintainer + f. if you happen to know that packages were added this release, + make sure you give the correct permissions to them. + % MAINTAINER_BUILDING_RELEASE=1 perl Makefile.PL 1. 'make disttest' - to make sure nothing is missing from the manifest. Now 'make dist', and test this generated package (not svn) @@ -26,26 +25,28 @@ a. edit ./Changes: - change -dev to -rc\d+ starting with -rc1 - b. nuke any preinstalled Apache-Reload libs and run 'make test' + b. commit Changes + % svn ci -m "0.14 rc1" Changes - c. test that you can 'make install' and then run 'make test' again + c. nuke any preinstalled Apache-Reload libs and run 'make test' - d. test whether we still 100% OK on systems with no LWP: + d. test that you can 'make install' and then run 'make test' again + e. test whether we are still 100% OK on systems with no LWP: % APACHE_TEST_PRETEND_NO_LWP=1 make test -2. once confident that the package is good, upload a release candidate - to people.apache.org/~username and post 24 hour-ish candidate alert - to the various lists +2. once confident that the package is good, commit the release candidate + to https://dist.apache.org/repos/dist/dev/perl and post 24 hour-ish + candidate alert to the various lists o dev/perl.apache.org o modperl/perl.apache.org - Subject: [RELEASE CANDIDATE] Apache-Reload 0.13 RC\d+ - (or maybe longer to give most people a chance to catch up). no need to tag this package + Subject: [RELEASE CANDIDATE] Apache-Reload 0.14 RC\d+ + a. if problems are detected during stage 2, repeat stages 1 and 2. 3. when the package has been reported to be good, prepare a new @@ -61,7 +62,7 @@ % make -n tag c. commit Changes - % svn ci Changes + % svn ci -m "0.14 release" Changes d. tag % make tag @@ -75,11 +76,15 @@ 5. Announce the package - a. post ... to the modperl, announce lists - Subject: [ANNOUNCE] Apache-Reload 0.13 - include - - MD5 sig (as it comes from CPAN upload announce). - - the latest Changes + a. post to the following list: + + o modperl/perl.apache.org + + Subject: [ANNOUNCE] Apache-Reload 0.14 + + include: + - MD5 sig (as it comes from CPAN upload announce). + - the latest Changes 6. Prepare for the next cycle @@ -88,15 +93,14 @@ b. edit ./Changes: - start a new item with incremented version + '-dev' - =item 0.14-dev + =item 0.15-dev c. bump up version numbers in this file to make it easier to do the next release. - - $ perl -pi -e 's/(\d+)\.(\d+)/join(".", $1, $2+1)/eg' RELEASE + % perl -pi.bak -e 's/(\d+)\.(\d+)/join(".", $1, $2+1)/eg' RELEASE (undo the change to the PAUSE menu item number in item 0d. above) d. commit Changes - % svn ci -m "start 0.13-dev cycle" Changes RELEASE \ + % svn ci -m "start 0.14-dev cycle" Changes RELEASE \ lib/Apache/Reload.pm lib/Apache2/Reload.pm