diff -Nru liblog-log4perl-perl-1.43/Changes liblog-log4perl-perl-1.44/Changes --- liblog-log4perl-perl-1.43/Changes 2014-03-17 05:11:53.000000000 +0000 +++ liblog-log4perl-perl-1.44/Changes 2014-05-18 03:33:17.000000000 +0000 @@ -2,6 +2,14 @@ Revision history for Log::Log4perl ################################################## +1.44 (2014/05/17) + * (ms) Skipped mkpath umask tests on Win32 which doesn't support it + properly. + * (ms) Requiring core module File::Path 2.06_06, which has remove_tree() + (fixes test suite for ancient perl-5.6.2). + * (ms) Brian Wightman fixed temporary file cleanup in the test suite + for Win32: https://github.com/mschilli/log4perl/pull/45 + 1.43 (2014/03/16) * (ms) Added %m{indent} to indent multi-line messages according to the PatternLayout (inspired by Wolfgang Pecho) diff -Nru liblog-log4perl-perl-1.43/debian/changelog liblog-log4perl-perl-1.44/debian/changelog --- liblog-log4perl-perl-1.43/debian/changelog 2014-04-25 14:49:03.000000000 +0000 +++ liblog-log4perl-perl-1.44/debian/changelog 2014-11-10 10:58:29.000000000 +0000 @@ -1,3 +1,31 @@ +liblog-log4perl-perl (1.44-1ubuntu1) vivid; urgency=low + + * Merge from Debian unstable (LP: #1388872). Remaining changes: + - Drop unneeded Universe Build-Depends-Indep libdbd-csv-perl and + liblog-dispatch-perl and change them to Suggests from Recommends + + -- Scarlett Clark Fri, 23 May 2014 03:40:41 +0000 + +liblog-log4perl-perl (1.44-1) unstable; urgency=medium + + * Team upload + + [ Dominique Dumont ] + * Take over for the Debian Perl Group on maintainer's request + (https://lists.debian.org/debian-perl/2014/04/msg00009.html) + * debian/control: Added: Vcs-Git field (source stanza); Vcs-Browser + field (source stanza). Changed: Homepage field changed to + metacpan.org URL; Maintainer set to Debian Perl Group (was: Manoj Srivastava + ); Manoj Srivastava moved + to Uploaders. + * debian/watch: use metacpan-based URL. + + [ Damyan Ivanov ] + * Imported Upstream version 1.44 + + -- Damyan Ivanov Thu, 22 May 2014 23:22:32 +0300 + liblog-log4perl-perl (1.43-1ubuntu1) utopic; urgency=low * Merge from Debian unstable. Remaining changes: diff -Nru liblog-log4perl-perl-1.43/debian/control liblog-log4perl-perl-1.44/debian/control --- liblog-log4perl-perl-1.43/debian/control 2014-04-25 18:52:05.000000000 +0000 +++ liblog-log4perl-perl-1.44/debian/control 2014-11-10 10:57:40.000000000 +0000 @@ -1,12 +1,13 @@ Source: liblog-log4perl-perl -VCS-Git: git://anonscm.debian.org/users/srivasta/debian/liblog-log4perl-perl.git -VCS-Browser: http://git.debian.org/git/?p=users/srivasta/debian/liblog-log4perl-perl.git Section: perl Priority: optional Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Manoj Srivastava +XSBC-Original-Maintainer: Debian Perl Group +Uploaders: Manoj Srivastava Standards-Version: 3.9.5 -Homepage: http://search.cpan.org/~mschilli/Log-Log4perl-1.41/lib/Log/Log4perl.pm +Vcs-Git: git://anonscm.debian.org/pkg-perl/packages/liblog-log4perl-perl.git +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-perl/packages/liblog-log4perl-perl.git +Homepage: https://metacpan.org/release/Log-Log4perl Build-Depends-Indep: perl-modules, libxml-dom-perl, debhelper (>= 9.0.0) Package: liblog-log4perl-perl diff -Nru liblog-log4perl-perl-1.43/debian/watch liblog-log4perl-perl-1.44/debian/watch --- liblog-log4perl-perl-1.43/debian/watch 2014-04-05 09:40:12.000000000 +0000 +++ liblog-log4perl-perl-1.44/debian/watch 2014-04-11 20:20:44.000000000 +0000 @@ -1,5 +1,5 @@ # format version number, currently 2; this line is compulsory! -version=2 +version=3 # Line continuations are performed with \ @@ -7,4 +7,4 @@ # as the FTP format #http://log4perl.sourceforge.net/releases/Log-Log4perl-(.*).tar.gz debian #ftp://ftp.sf.net/pub/sourceforge/l/lo//Log-Log4perl-(.*).tar.gz -http://search.cpan.org/CPAN/authors/id/M/MS/MSCHILLI/Log-Log4perl-(.*).tar.gz debian +https://metacpan.org/release/Log-Log4perl .*/Log-Log4perl-v?(\d[\d.-]+)\.(?:tar(?:\.gz|\.bz2)?|tgz|zip)$ debian diff -Nru liblog-log4perl-perl-1.43/lib/Log/Log4perl.pm liblog-log4perl-perl-1.44/lib/Log/Log4perl.pm --- liblog-log4perl-perl-1.43/lib/Log/Log4perl.pm 2014-03-17 05:12:03.000000000 +0000 +++ liblog-log4perl-perl-1.44/lib/Log/Log4perl.pm 2014-05-18 03:33:27.000000000 +0000 @@ -14,7 +14,7 @@ use Log::Log4perl::Config; use Log::Log4perl::Appender; -our $VERSION = '1.43'; +our $VERSION = '1.44'; # set this to '1' if you're using a wrapper # around Log::Log4perl @@ -929,7 +929,7 @@ you can use the following: - $logger->logdie(); + $logger->logdie($err); And if instead of using @@ -939,7 +939,7 @@ to both issue a warning via Perl's warn() mechanism and make sure you have the same message in the log file as well, use: - $logger->logwarn(); + $logger->logwarn($message); Since there is an ERROR level between WARN and FATAL, there are two additional helper @@ -2036,7 +2036,9 @@ GetOptions("v+" => \$v, ...); - $logger->more_logging($v); # inc logging level once for each -v in ARGV + if( $v ) { + $logger->more_logging($v); # inc logging level once for each -v in ARGV + } =head2 Custom Log Levels diff -Nru liblog-log4perl-perl-1.43/Makefile.PL liblog-log4perl-perl-1.44/Makefile.PL --- liblog-log4perl-perl-1.43/Makefile.PL 2013-01-10 23:09:18.000000000 +0000 +++ liblog-log4perl-perl-1.44/Makefile.PL 2014-04-27 01:15:25.000000000 +0000 @@ -45,6 +45,7 @@ 'VERSION_FROM' => 'lib/Log/Log4perl.pm', # finds $VERSION 'PREREQ_PM' => { Test::More => 0.45, File::Spec => 0.82, + File::Path => 2.06_06, }, # e.g., Module::Name => 1.1 ($] >= 5.005 ? ## Add these new keywords supported since 5.005 (ABSTRACT_FROM => 'lib/Log/Log4perl.pm', # retrieve abstract from module diff -Nru liblog-log4perl-perl-1.43/META.json liblog-log4perl-perl-1.44/META.json --- liblog-log4perl-perl-1.43/META.json 2014-03-17 05:34:04.000000000 +0000 +++ liblog-log4perl-perl-1.44/META.json 2014-05-18 03:52:17.000000000 +0000 @@ -4,7 +4,7 @@ "Mike Schilli " ], "dynamic_config" : 1, - "generated_by" : "ExtUtils::MakeMaker version 6.6302, CPAN::Meta::Converter version 2.130880", + "generated_by" : "ExtUtils::MakeMaker version 6.98, CPAN::Meta::Converter version 2.131560", "license" : [ "unknown" ], @@ -32,6 +32,7 @@ }, "runtime" : { "requires" : { + "File::Path" : "2.0606", "File::Spec" : "0.82", "Test::More" : "0.45" } @@ -44,5 +45,5 @@ }, "x_MailingList" : "mailto:log4perl-devel@lists.sourceforge.net" }, - "version" : "1.43" + "version" : "1.44" } diff -Nru liblog-log4perl-perl-1.43/META.yml liblog-log4perl-perl-1.44/META.yml --- liblog-log4perl-perl-1.43/META.yml 2014-03-17 05:34:03.000000000 +0000 +++ liblog-log4perl-perl-1.44/META.yml 2014-05-18 03:52:17.000000000 +0000 @@ -7,7 +7,7 @@ configure_requires: ExtUtils::MakeMaker: 0 dynamic_config: 1 -generated_by: 'ExtUtils::MakeMaker version 6.6302, CPAN::Meta::Converter version 2.130880' +generated_by: 'ExtUtils::MakeMaker version 6.98, CPAN::Meta::Converter version 2.131560' license: unknown meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html @@ -18,9 +18,10 @@ - t - inc requires: + File::Path: 2.0606 File::Spec: 0.82 Test::More: 0.45 resources: + MailingList: mailto:log4perl-devel@lists.sourceforge.net repository: http://github.com/mschilli/log4perl - x_MailingList: mailto:log4perl-devel@lists.sourceforge.net -version: 1.43 +version: 1.44 diff -Nru liblog-log4perl-perl-1.43/README liblog-log4perl-perl-1.44/README --- liblog-log4perl-perl-1.43/README 2014-03-17 05:33:59.000000000 +0000 +++ liblog-log4perl-perl-1.44/README 2014-05-18 03:52:17.000000000 +0000 @@ -1,5 +1,5 @@ ###################################################################### - Log::Log4perl 1.43 + Log::Log4perl 1.44 ###################################################################### NAME @@ -282,7 +282,7 @@ you can use the following: - $logger->logdie(); + $logger->logdie($err); And if instead of using @@ -292,7 +292,7 @@ to both issue a warning via Perl's warn() mechanism and make sure you have the same message in the log file as well, use: - $logger->logwarn(); + $logger->logwarn($message); Since there is an ERROR level between WARN and FATAL, there are two additional helper functions in case you'd like to use ERROR for either @@ -1328,7 +1328,9 @@ GetOptions("v+" => \$v, ...); - $logger->more_logging($v); # inc logging level once for each -v in ARGV + if( $v ) { + $logger->more_logging($v); # inc logging level once for each -v in ARGV + } Custom Log Levels First off, let me tell you that creating custom levels is heavily diff -Nru liblog-log4perl-perl-1.43/t/026FileApp.t liblog-log4perl-perl-1.44/t/026FileApp.t --- liblog-log4perl-perl-1.43/t/026FileApp.t 2014-03-17 05:11:07.000000000 +0000 +++ liblog-log4perl-perl-1.44/t/026FileApp.t 2014-05-18 03:31:53.000000000 +0000 @@ -1,5 +1,12 @@ #Testing if the file-appender appends in default mode +END { + # Must be before enabling the Log4Perl stuff, or file will still + # be open and locked (under Win32) on program close. + + unlink_testfiles(); + } + BEGIN { if($ENV{INTERNAL_DEBUG}) { require Log::Log4perl::InternalDebug; @@ -38,10 +45,6 @@ BEGIN {plan tests => 26} -END { - unlink_testfiles(); - } - sub unlink_testfiles { unlink $testfile; unlink "${testfile}_1"; @@ -458,30 +461,34 @@ # Create path with umask if it is not already created #################################################### -my $oldumask = umask; - -$testmkpathfile = File::Spec->catfile("${testpath}_1", "test26.log"); - -$data = <info("Shu-wa-chi!"); - -my ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size, $atime,$mtime,$ctime,$blksize,$blocks) = stat("${testpath}_1"); - -is($mode & 07777,0750); - - ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size, $atime,$mtime,$ctime,$blksize,$blocks) = stat($testmkpathfile); - -is($mode & 07777,0640); +SKIP: { + skip "Umask not supported on Win32", 3 if $^O eq "MSWin32"; -is(umask,$oldumask); + my $oldumask = umask; + + $testmkpathfile = File::Spec->catfile("${testpath}_1", "test26.log"); + + $data = <info("Shu-wa-chi!"); + + my ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size, $atime,$mtime,$ctime,$blksize,$blocks) = stat("${testpath}_1"); + + is($mode & 07777,0750); #Win32 777 + + ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size, $atime,$mtime,$ctime,$blksize,$blocks) = stat($testmkpathfile); + + is($mode & 07777,0640); #Win32 666 + + is(umask,$oldumask); +};