[libfile-tail-perl] 09/18: Imported Debian patch 1.2-1

Roland Rosenfeld roland at moszumanska.debian.org
Mon Aug 21 17:31:31 UTC 2017


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

roland pushed a commit to branch master
in repository libfile-tail-perl.

commit 588aadc32fb051580ad21dd64c5d04320ba68a94
Merge: b143dd8 1e379a0
Author: Roland Rosenfeld <roland at debian.org>
Date:   Sun Apr 26 10:19:18 2015 +0200

    Imported Debian patch 1.2-1

 Changes                              | 19 +++++++-
 MANIFEST                             |  1 +
 META.json                            | 44 ++++++++++++++++++
 META.yml                             | 37 +++++++++------
 Makefile.PL                          |  1 +
 Tail.pm                              | 83 +++++++++++++++++----------------
 Tail.pm.debug                        | 89 +++++++++++++++++++-----------------
 debian/changelog                     | 10 ++++
 debian/compat                        |  2 +-
 debian/control                       |  4 +-
 debian/copyright                     |  8 ++--
 debian/patches/10_pod_fixup.patch    | 86 ++--------------------------------
 debian/patches/20_manpage_typo.patch | 46 ++-----------------
 t/10open.t                           | 21 +++++----
 14 files changed, 216 insertions(+), 235 deletions(-)

diff --cc debian/changelog
index e907471,0000000..fa8c5d6
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,105 -1,0 +1,115 @@@
++libfile-tail-perl (1.2-1) unstable; urgency=medium
++
++  * New upstream version 1.2.
++  * Update all patches to new version (partly merged upstream).
++  * Upgrade to Standards-Version 3.9.6 (no changes).
++  * debian/changelog: versioned URI, new package URL, GPL version.
++  * Change to debhelper 9.
++
++ -- Roland Rosenfeld <roland at debian.org>  Sun, 26 Apr 2015 10:19:18 +0200
++
 +libfile-tail-perl (0.99.3-5) unstable; urgency=low
 +
 +  * Migrate from dpatch to 3.0 (quilt) format.
 +  * Reformat all patches.
 +  * Change build depenency from dpatch to debhelper (>= 7.0.50~).
 +  * Change debian/compat to "7".
 +  * Remove README.source.
 +  * dh-make-perl refresh.
 +  * Update debian/copyright to DEP5 format.
 +  * Fix more typos in description and man page.
 +  * Upgrad to Standards-Version 3.9.2 (no changes).
 +
 + -- Roland Rosenfeld <roland at debian.org>  Thu, 29 Dec 2011 15:25:01 +0100
 +
 +libfile-tail-perl (0.99.3-4) unstable; urgency=low
 +
 +  * Use ">> 5" instead of "> 5" in debhelper dependency
 +  * Added debian/README.source (from dpatch package) to explain how dpatch
 +    works.
 +  * Add Homepage to debian/control.
 +  * Upgrade to Standards-Version 3.8.4 (no changes).
 +  * 20_manpage_typo: Fix typo in man page.
 +
 + -- Roland Rosenfeld <roland at debian.org>  Wed, 23 Jun 2010 11:31:30 +0200
 +
 +libfile-tail-perl (0.99.3-3) unstable; urgency=low
 +
 +  * Upgrade debian/rules according to new dh-make-perl
 +    (rules.MakeMaker.noxs), including stuff to remove /usr/lib/perl5 only
 +    if it exists (to avoid problems with perl 5.10.0) (Closes: #467794).
 +
 + -- Roland Rosenfeld <roland at debian.org>  Tue, 26 Feb 2008 20:38:51 +0100
 +
 +libfile-tail-perl (0.99.3-2) unstable; urgency=low
 +
 +  * Add debian/watch file, thanks to Juan Angulo Moreno (Closes: #458612).
 +  * Upgrade to Standards-Version 3.7.3 (no changes).
 +
 + -- Roland Rosenfeld <roland at debian.org>  Sat, 12 Jan 2008 16:32:17 +0100
 +
 +libfile-tail-perl (0.99.3-1) unstable; urgency=low
 +
 +  * New upstream version 0.99.3 (Closes: #329541).
 +  * New maintainer.
 +  * Add select_demo and logwatch to examples directory (Closes: #329256).
 +  * Upgrade to debhelper 5.
 +  * Move perl and libtime-hires-perl to Build-Depends-Indep.
 +  * Create new debian/rules based on dh-make-perl and dpatch instead cdbs.
 +  * Convert 010_pod_changes.patch to 10_pod_fixup.dpatch and merge in
 +    changes of Tail.pm and Tail.pm.debug.
 +  * Remove empty unused usr/lib tree.
 +  * Move from Section: interpreters to Section: perl.
 +  * Depend on ${misc:Depends} instead ${shlibs:Depends}, because this is a
 +    binary-all package.
 +  * Upgrade to Standards-Version 3.7.2.
 +  * Remove README.Debian, because its content is already in copyright.
 +  * Remove debian/dirs, because usr/share is automatically created.
 +  * Cite perl copyright in debian/copyright instead of only pointing to
 +    it.
 +
 + -- Roland Rosenfeld <roland at debian.org>  Sun, 14 Jan 2007 17:47:09 +0100
 +
 +libfile-tail-perl (0.98-5) unstable; urgency=low
 +
 +  * Added cdbs to build depends. (Closes: #252417)
 +
 + -- Scott M. Dier <sdier at debian.org>  Tue,  8 Jun 2004 08:26:38 -0500
 +
 +libfile-tail-perl (0.98-4) unstable; urgency=low
 +
 +  * Converted to cdbs.
 +  * Fixed manpage formatting errors. (Closes: #213810)
 +
 + -- Scott M. Dier <sdier at debian.org>  Tue,  1 Jun 2004 13:42:50 -0500
 +
 +libfile-tail-perl (0.98-3) unstable; urgency=low
 +
 +  * Fixed copyright to have a link to the perl copyright. Closes: #157584
 +
 + -- Scott M. Dier <sdier at debian.org>  Tue, 20 Aug 2002 17:20:30 -0500
 +
 +libfile-tail-perl (0.98-2) unstable; urgency=low
 +
 +  * Forgot to make the Arch: all.
 +
 + -- Scott M. Dier <sdier at debian.org>  Sun,  3 Feb 2002 15:20:31 -0600
 +
 +libfile-tail-perl (0.98-1) unstable; urgency=medium
 +
 +  * New upstream release. Closes: #112951
 +  * Updated packaging semantics. Closes: #95531,#104749,#120296
 +
 + -- Scott M. Dier <sdier at debian.org>  Sun,  3 Feb 2002 13:14:08 -0600
 +
 +libfile-tail-perl (0.91-2) unstable; urgency=low
 +
 +  * repackaged to meet doc & man polices.  closes: #91194, #91557 
 +
 + -- Craig Sanders <cas at taz.net.au>  Sat, 31 Mar 2001 12:24:28 +1000
 +
 +libfile-tail-perl (0.91-1) unstable; urgency=low
 +
 +  * Initial Release
 +
 + -- Craig Sanders <cas at taz.net.au>  Mon,  5 Jul 1999 12:47:08 +1000
diff --cc debian/compat
index 7f8f011,0000000..ec63514
mode 100644,000000..100644
--- a/debian/compat
+++ b/debian/compat
@@@ -1,1 -1,0 +1,1 @@@
- 7
++9
diff --cc debian/control
index 4c9afb0,0000000..bc15af1
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,23 -1,0 +1,23 @@@
 +Source: libfile-tail-perl
 +Section: perl
 +Priority: optional
- Build-Depends: debhelper (>= 7.0.50~)
++Build-Depends: debhelper (>= 9)
 +Build-Depends-Indep: libtime-hires-perl, perl
 +Maintainer: Roland Rosenfeld <roland at debian.org>
- Standards-Version: 3.9.2
++Standards-Version: 3.9.6
 +Homepage: http://search.cpan.org/~mgrabnar/
 +
 +Package: libfile-tail-perl
 +Architecture: all
 +Depends: ${misc:Depends}, ${perl:Depends}, libtime-hires-perl
 +Description: File::Tail perl module
 + The File::Tail module is designed for reading files which
 + are continuously appended to (the name comes from the tail -f
 + directive). Usually such files are logfiles of some description.
 + .
 + The module tries hard not to busy wait on the file, dynamicaly
 + calculating how long it should wait before it pays to try reading the
 + file again.
 + .
 + The module should handle normal log truncations ("close; move; open" or
 + "cat /dev/null >file") transparently, without losing any input.
diff --cc debian/copyright
index 9044e9c,0000000..3950d02
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,35 -1,0 +1,35 @@@
- Format: http://dep.debian.net/deps/dep5/
++Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 +Upstream-Name: File-Tail
 +Upstream-Contact: Matija Grabnar <matija.grabnar at arnes.si>
- Source: http://search.cpan.org/~mgrabnar/File-Tail-0.99.3/
++Source: http://search.cpan.org/~mgrabnar/File-Tail-1.2/
 +
 +Files: *
 +Copyright: Matija Grabnar, matija.grabnar at arnes.si
 +License: GPL-1+ or Artistic
 + All rights reserved. This program is free software; you can
 + redistribute it and/or modify it under the same terms as Perl itself.
 + .
 + And this is the Perl license:
 + . 
 + This program is free software; you can redistribute it and/or modify
 + it under the terms of either:
 + .
 + a) the GNU General Public License as published by the Free Software
 +    Foundation; either version 1, or (at your option) any later
 +    version, or
 + .
 + b) the "Artistic License" which comes with Perl.
 + .
 +    On Debian GNU/Linux systems, the complete text of the GNU General
-     Public License can be found in `/usr/share/common-licenses/GPL' and
++    Public License can be found in `/usr/share/common-licenses/GPL-1' and
 +    the Artistic Licence in `/usr/share/common-licenses/Artistic'.
 +
 +Files: debian/*
 +Copyright: 1999, 2001, Craig Sanders <cas at taz.net.au>
 + 2002, 2004, Scott M. Dier <sdier at debian.org>
-  2007-2011, Roland Rosenfeld <roland at debian.org>
++ 2007-2015, Roland Rosenfeld <roland at debian.org>
 +License: permissive
 + Copying and distribution of this package, with or without
 + modification, are permitted in any medium without royalty
 + provided the copyright notice and this notice are
 + preserved.
diff --cc debian/patches/10_pod_fixup.patch
index 3076197,0000000..4573da5
mode 100644,000000..100644
--- a/debian/patches/10_pod_fixup.patch
+++ b/debian/patches/10_pod_fixup.patch
@@@ -1,163 -1,0 +1,83 @@@
 +Author: Scott M. Dier <sdier at debian.org>
 +Description: Fixup indentation of POD documentation.
 +
- --- a/Tail.pm
- +++ b/Tail.pm
- @@ -604,12 +604,11 @@
-  OR, you could use tie (additional parameters can be passed with the name, or 
-  can be set using $ref):
-  
- -    use File::Tail;
- -    my $ref=tie *FH,"File::Tail",(name=>$name);
- -    while (<FH>) {
- -        print "$_";
- -    }
- -
- +  use File::Tail;
- +  my $ref=tie *FH,"File::Tail",(name=>$name);
- +  while (<FH>) {
- +      print "$_";
- +  }
-  
-  Note that the above script will never exit. If there is nothing being written
-  to the file, it will simply block.
- @@ -720,36 +719,35 @@
-  
-  =item ignore_nonexistant
-  
- -    Do not complain if the file doesn't exist when it is first 
- +Do not complain if the file doesn't exist when it is first
-  opened or when it is to be reopened. (File may be reopened after 
-  resetafter seconds have passed since last data was found.)
-  
-  =item tail
-  
- -    When first started, read and return C<n> lines from the file. 
- +When first started, read and return C<n> lines from the file.
-  If C<n> is zero, start at the end of file. If C<n> is negative, 
-  return the whole file.
-  
- -    Default is C<0>.
- +Default is C<0>.
-  
-  =item reset_tail
-  
- -    Same as tail, but applies after reset. (i.e. after the
- +Same as tail, but applies after reset. (i.e. after the
-  file has been automaticaly closed and reopened). Defaults to
-  C<-1>, i.e. does not skip any information present in the
-  file when it first checks it.
-  
- -   Why would you want it otherwise? I've seen files which
- +Why would you want it otherwise? I've seen files which
-  have been cycled like this:
-  
- -   grep -v lastmonth log >newlog 
- -   mv log archive/lastmonth 
- -   mv newlog log 
- -   kill -HUP logger 
- -
- +  grep -v lastmonth log >newlog
- +  mv log archive/lastmonth
- +  mv newlog log
- +  kill -HUP logger
-  
-  Obviously, if this happens and you have reset_tail set to
- -c<-1>, you will suddenly get a whole bunch of lines - lines
- +C<-1>, you will suddenly get a whole bunch of lines - lines
-  you already saw. So in this case, reset_tail should probably
-  be set to a small positive number or even C<0>.
-  
- @@ -777,9 +775,9 @@
-  reference as the first parameter and other parameters to be passed to 
-  handler subroutine, or one of the words:
-  
- -return  - ignore any error (just put error message in errmsg).
- -warn    - output the error message but continue
- -die     - display error message and exit
- + return  - ignore any error (just put error message in errmsg).
- + warn    - output the error message but continue
- + die     - display error message and exit
-  
-  Default is die.
-  
 +--- a/Tail.pm.debug
 ++++ b/Tail.pm.debug
- @@ -638,12 +638,11 @@
++@@ -643,12 +643,11 @@
 + OR, you could use tie (additional parameters can be passed with the name, or 
 + can be set using $ref):
 + 
 +-    use File::Tail;
 +-    my $ref=tie *FH,"File::Tail",(name=>$name);
 +-    while (<FH>) {
 +-        print "$_";
 +-    }
 +-
 ++  use File::Tail;
 ++  my $ref=tie *FH,"File::Tail",(name=>$name);
 ++  while (<FH>) {
 ++      print "$_";
 ++  }
 + 
 + Note that the above script will never exit. If there is nothing being written
 + to the file, it will simply block.
- @@ -754,36 +753,35 @@
++@@ -759,36 +758,35 @@
 + 
 + =item ignore_nonexistant
 + 
 +-    Do not complain if the file doesn't exist when it is first 
 ++Do not complain if the file doesn't exist when it is first
 + opened or when it is to be reopened. (File may be reopened after 
 + resetafter seconds have passed since last data was found.)
 + 
 + =item tail
 + 
 +-    When first started, read and return C<n> lines from the file. 
 ++When first started, read and return C<n> lines from the file.
 + If C<n> is zero, start at the end of file. If C<n> is negative, 
 + return the whole file.
 + 
 +-    Default is C<0>.
 ++Default is C<0>.
 + 
 + =item reset_tail
 + 
 +-    Same as tail, but applies after reset. (i.e. after the
 ++Same as tail, but applies after reset. (i.e. after the
 + file has been automaticaly closed and reopened). Defaults to
 + C<-1>, i.e. does not skip any information present in the
 + file when it first checks it.
 + 
 +-   Why would you want it otherwise? I've seen files which
 ++Why would you want it otherwise? I've seen files which
 + have been cycled like this:
 + 
 +-   grep -v lastmonth log >newlog 
 +-   mv log archive/lastmonth 
 +-   mv newlog log 
 +-   kill -HUP logger 
 +-
 ++  grep -v lastmonth log >newlog
 ++  mv log archive/lastmonth
 ++  mv newlog log
 ++  kill -HUP logger
 + 
 + Obviously, if this happens and you have reset_tail set to
 +-c<-1>, you will suddenly get a whole bunch of lines - lines
 ++C<-1>, you will suddenly get a whole bunch of lines - lines
 + you already saw. So in this case, reset_tail should probably
 + be set to a small positive number or even C<0>.
 + 
- @@ -811,9 +809,9 @@
++@@ -816,9 +814,9 @@
 + reference as the first parameter and other parameters to be passed to 
 + handler subroutine, or one of the words:
 + 
 +-return  - ignore any error (just put error message in errmsg).
 +-warn    - output the error message but continue
 +-die     - display error message and exit
 ++ return  - ignore any error (just put error message in errmsg).
 ++ warn    - output the error message but continue
 ++ die     - display error message and exit
 + 
 + Default is die.
 + 
diff --cc debian/patches/20_manpage_typo.patch
index 39bc5f5,0000000..f2edc3a
mode 100644,000000..100644
--- a/debian/patches/20_manpage_typo.patch
+++ b/debian/patches/20_manpage_typo.patch
@@@ -1,79 -1,0 +1,41 @@@
 +Author: Roland Rosenfeld <roland at debian.org>
 +Description: Fix typos in man page.
 +
- --- a/Tail.pm
- +++ b/Tail.pm
- @@ -585,7 +585,7 @@
-  
-  =head1 NAME
-  
- -File::Tail - Perl extension for reading from continously updated files
- +File::Tail - Perl extension for reading from continuously updated files
-  
-  =head1 SYNOPSIS
-  
- @@ -626,7 +626,7 @@
-  =head1 DESCRIPTION
-  
-  The primary purpose of File::Tail is reading and analysing log files while
- -they are being written, which is especialy usefull if you are monitoring
- +they are being written, which is especialy useful if you are monitoring
-  the logging process with a tool like Tobias Oetiker's MRTG.
-  
-  The module tries very hard NOT to "busy-wait" on a file that has little 
- @@ -656,7 +656,7 @@
-  
-  =head2 new ([ ARGS ]) 
-  
- -Creates a C<File::Tail>. If it has only one paramter, it is assumed to 
- +Creates a C<File::Tail>. If it has only one parameter, it is assumed to
-  be the filename. If the open fails, the module performs a croak. I
-  am currently looking for a way to set $! and return undef. 
-  
- @@ -734,7 +734,7 @@
-  =item reset_tail
-  
-  Same as tail, but applies after reset. (i.e. after the
- -file has been automaticaly closed and reopened). Defaults to
- +file has been automatically closed and reopened). Defaults to
-  C<-1>, i.e. does not skip any information present in the
-  file when it first checks it.
-  
 +--- a/Tail.pm.debug
 ++++ b/Tail.pm.debug
- @@ -619,7 +619,7 @@
++@@ -624,7 +624,7 @@
 + 
 + =head1 NAME
 + 
 +-File::Tail - Perl extension for reading from continously updated files
 ++File::Tail - Perl extension for reading from continuously updated files
 + 
 + =head1 SYNOPSIS
 + 
- @@ -660,7 +660,7 @@
++@@ -665,7 +665,7 @@
 + =head1 DESCRIPTION
 + 
 + The primary purpose of File::Tail is reading and analysing log files while
 +-they are being written, which is especialy usefull if you are monitoring
 ++they are being written, which is especialy useful if you are monitoring
 + the logging process with a tool like Tobias Oetiker's MRTG.
 + 
 + The module tries very hard NOT to "busy-wait" on a file that has little 
- @@ -690,7 +690,7 @@
++@@ -695,7 +695,7 @@
 + 
 + =head2 new ([ ARGS ]) 
 + 
 +-Creates a C<File::Tail>. If it has only one paramter, it is assumed to 
 ++Creates a C<File::Tail>. If it has only one parameter, it is assumed to
 + be the filename. If the open fails, the module performs a croak. I
 + am currently looking for a way to set $! and return undef. 
 + 
- @@ -768,7 +768,7 @@
++@@ -773,7 +773,7 @@
 + =item reset_tail
 + 
 + Same as tail, but applies after reset. (i.e. after the
 +-file has been automaticaly closed and reopened). Defaults to
 ++file has been automatically closed and reopened). Defaults to
 + C<-1>, i.e. does not skip any information present in the
 + file when it first checks it.
 + 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libfile-tail-perl.git



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