Compare commits

...

3 Commits

Author SHA1 Message Date
Mario Fetka
7f9a1cfcff add patch 2020-03-29 18:39:02 +02:00
Mario Fetka
989685eb4a add compat for wheezy 2017-01-16 15:18:37 +01:00
Mario Fetka
b4e7fabecd Bump 2017-01-16 14:41:47 +01:00
10 changed files with 202 additions and 0 deletions

19
debian/changelog vendored Normal file
View File

@ -0,0 +1,19 @@
liblog-dispatch-file-rolling-perl (1.09-1) UNRELEASED; urgency=medium
* Non-maintainer upload.
* New Release
* Rebuild
-- Mario Fetka <mario.fetka@gmail.com> Mon, 16 Jan 2017 14:39:46 +0100
liblog-dispatch-file-rolling-perl (0.16-2) unstable; urgency=medium
* Fixed metadata
-- Marco Pessotto <melmothx@gmail.com> Sun, 21 Feb 2016 13:03:43 +0100
liblog-dispatch-file-rolling-perl (0.16-1) unstable; urgency=low
* Initial Release.
-- Marco Pessotto <melmothx@gmail.com> Sun, 21 Feb 2016 12:59:24 +0100

1
debian/compat vendored Normal file
View File

@ -0,0 +1 @@
9

19
debian/control vendored Normal file
View File

@ -0,0 +1,19 @@
Source: liblog-dispatch-file-rolling-perl
Section: perl
Priority: optional
Maintainer: Marco Pessotto <melmothx@gmail.com>
Build-Depends: debhelper (>= 9)
Build-Depends-Indep: liblog-dispatch-perl (>= 2.30),
liblog-log4perl-perl (>= 0.28),
perl
Standards-Version: 3.9.6
Homepage: https://metacpan.org/release/Log-Dispatch-File-rolling
Package: liblog-dispatch-file-rolling-perl
Architecture: all
Depends: ${misc:Depends}, ${perl:Depends},
liblog-dispatch-perl (>= 2.30),
liblog-log4perl-perl (>= 0.28)
Description: Logging to date/time rolling files
Log::Dispatch::File::rolling subclasses Log::Dispatch::File for logging to
date/time rolling files, respecting all its configuration options.

28
debian/copyright vendored Normal file
View File

@ -0,0 +1,28 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Source: https://metacpan.org/release/Log-Dispatch-File-Stamped
Upstream-Contact: Eric Cholet <cholet@logilune.com>, Karen Etheridge <ether@cpan.org>
Upstream-Name: Log-Dispatch-File-Stamped
Files: *
Copyright: Eric Cholet <cholet@logilune.com>, Karen Etheridge <ether@cpan.org>
License: Artistic or GPL-1+
Files: debian/*
Copyright: 2016, Marco Pessotto <melmothx@gmail.com>
License: Artistic or GPL-1+
License: Artistic
This program is free software; you can redistribute it and/or modify
it under the terms of the Artistic License, which comes with Perl.
.
On Debian systems, the complete text of the Artistic License can be
found in `/usr/share/common-licenses/Artistic'.
License: GPL-1+
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 1, or (at your option)
any later version.
.
On Debian systems, the complete text of version 1 of the GNU General
Public License can be found in `/usr/share/common-licenses/GPL-1'.

View File

@ -0,0 +1,119 @@
From f5ff541806ee2f0c5d6c8623ac6a591a79556342 Mon Sep 17 00:00:00 2001
From: Michael Schout <mschout@gkg.net>
Date: Mon, 14 Aug 2017 13:09:27 -0500
Subject: [PATCH] Update to work with Log::Dispatch v2.59 and later
See https://rt.cpan.org/Ticket/Display.html?id=120378
---
META.json | 2 +-
META.yml | 2 +-
Makefile.PL | 2 +-
lib/Log/Dispatch/File/Rolling.pm | 26 ++++++++++----------------
4 files changed, 13 insertions(+), 19 deletions(-)
diff --git a/META.json b/META.json
index c17c800..194ee13 100644
--- a/META.json
+++ b/META.json
@@ -32,7 +32,7 @@
},
"runtime" : {
"requires" : {
- "Log::Dispatch" : "2.37",
+ "Log::Dispatch" : "2.59",
"Log::Log4perl" : "0.32"
}
}
diff --git a/META.yml b/META.yml
index dd9b950..da355e1 100644
--- a/META.yml
+++ b/META.yml
@@ -18,6 +18,6 @@ no_index:
- t
- inc
requires:
- Log::Dispatch: 2.37
+ Log::Dispatch: 2.59
Log::Log4perl: 0.32
version: 1.09
diff --git a/Makefile.PL b/Makefile.PL
index add5084..c3bfaeb 100755
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -7,7 +7,7 @@ WriteMakefile(
'VERSION_FROM' => 'lib/Log/Dispatch/File/Rolling.pm', # finds $VERSION
'PREREQ_PM' => {
'Log::Log4perl' => '0.32',
- 'Log::Dispatch' => '2.37',
+ 'Log::Dispatch' => '2.59',
# 'Pod::Readme' => '0.05', # only needed for 'make dist'
},
($] >= 5.005 ? ( ## Add these new keywords supported since 5.005
diff --git a/lib/Log/Dispatch/File/Rolling.pm b/lib/Log/Dispatch/File/Rolling.pm
index 2928c1e..3e5fbbc 100755
--- a/lib/Log/Dispatch/File/Rolling.pm
+++ b/lib/Log/Dispatch/File/Rolling.pm
@@ -5,7 +5,7 @@ use 5.006001;
use strict;
use warnings;
-use Log::Dispatch::File '2.37';
+use Log::Dispatch::File '2.59';
use Log::Log4perl::DateFormat;
use Fcntl ':flock'; # import LOCK_* constants
@@ -30,42 +30,36 @@ BEGIN { # borrowed from Log::Log4perl::Layout::PatternLayout, Thanks!
# Preloaded methods go here.
-sub new {
- my $proto = shift;
- my $class = ref $proto || $proto;
+sub _basic_init {
+ my $self = shift;
my %p = @_;
- my $self = bless {}, $class;
-
# only append mode is supported
- $p{mode} = 'append';
+ $self->{mode} = '>>';
- # base class initialization
- $self->_basic_init(%p);
+ $self->{rolling_fh_pid} = $$;
# split pathname into path, basename, extension
- if ($p{filename} =~ /^(.*)\%d\{([^\}]*)\}(.*)$/) {
+ if ($self->{filename} =~ /^(.*)\%d\{([^\}]*)\}(.*)$/) {
$self->{rolling_filename_prefix} = $1;
$self->{rolling_filename_postfix} = $3;
$self->{rolling_filename_format} = Log::Log4perl::DateFormat->new($2);
$self->{filename} = $self->_createFilename();
- } elsif ($p{filename} =~ /^(.*)(\.[^\.]+)$/) {
+ } elsif ($self->{filename} =~ /^(.*)(\.[^\.]+)$/) {
$self->{rolling_filename_prefix} = $1;
$self->{rolling_filename_postfix} = $2;
$self->{rolling_filename_format} = Log::Log4perl::DateFormat->new('-yyyy-MM-dd');
$self->{filename} = $self->_createFilename();
} else {
- $self->{rolling_filename_prefix} = $p{filename};
+ $self->{rolling_filename_prefix} = $self->{filename};
$self->{rolling_filename_postfix} = '';
$self->{rolling_filename_format} = Log::Log4perl::DateFormat->new('.yyyy-MM-dd');
$self->{filename} = $self->_createFilename();
}
- $self->{rolling_fh_pid} = $$;
- $self->_make_handle();
-
- return $self;
+ # base class initialization
+ $self->SUPER::_basic_init(%p);
}
sub log_message { # parts borrowed from Log::Dispatch::FileRotate, Thanks!
--
2.12.2

1
debian/patches/series vendored Normal file
View File

@ -0,0 +1 @@
0001-Update-to-work-with-Log-Dispatch-v2.59-and-later.patch

4
debian/rules vendored Executable file
View File

@ -0,0 +1,4 @@
#!/usr/bin/make -f
%:
dh $@

1
debian/source/format vendored Normal file
View File

@ -0,0 +1 @@
3.0 (quilt)

8
debian/upstream/metadata vendored Normal file
View File

@ -0,0 +1,8 @@
---
Archive: CPAN
Bug-Database: https://rt.cpan.org/Public/Dist/Display.html?Name=Log-Dispatch-File-Rolling
Bug-Submit: bug-Log-Dispatch-File-Rolling@rt.cpan.org
Contact: Eric Cholet <cholet@logilune.com>, Karen Etheridge <ether@cpan.org>
Name: Log-Dispatch-File-Rolling
Repository: https://github.com/karenetheridge/Log-Dispatch-File-Rolling.git
Repository-Browse: https://github.com/karenetheridge/Log-Dispatch-File-Rolling

2
debian/watch vendored Normal file
View File

@ -0,0 +1,2 @@
version=3
https://metacpan.org/release/Log-Dispatch-File-Rolling .*/Log-Dispatch-File-Rolling-v?(\d[\d.-]*)\.(?:tar(?:\.gz|\.bz2)?|tgz|zip)$