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 b143dd88790cd927294f6896661627899852b34b Author: Roland Rosenfeld <[email protected]> Date: Thu Dec 29 15:25:01 2011 +0100 Imported Debian patch 0.99.3-5 --- debian/README.source | 31 -------- debian/changelog | 14 ++++ debian/compat | 2 +- debian/control | 10 +-- debian/copyright | 70 +++++++++--------- debian/{docs => libfile-tail-perl.docs} | 0 debian/{examples => libfile-tail-perl.examples} | 0 debian/patches/00list | 2 - .../{10_pod_fixup.dpatch => 10_pod_fixup.patch} | 42 +++++------ ...0_manpage_typo.dpatch => 20_manpage_typo.patch} | 40 ++++++---- debian/patches/series | 2 + debian/rules | 85 +--------------------- debian/source/format | 1 + 13 files changed, 105 insertions(+), 194 deletions(-) diff --git a/debian/README.source b/debian/README.source deleted file mode 100644 index 264b9b9..0000000 --- a/debian/README.source +++ /dev/null @@ -1,31 +0,0 @@ -This package uses dpatch to manage all modifications to the upstream -source. Changes are stored in the source package as diffs in -debian/patches and applied during the build. - -To get the fully patched source after unpacking the source package, cd -to the root level of the source package and run: - - debian/rules patch - -Removing a patch is as simple as removing its entry from the -debian/patches/00list file, and please also remove the patch file -itself. - -Creating a new patch is done with "dpatch-edit-patch patch XX_patchname" -where you should replace XX with a new number and patchname with a -descriptive shortname of the patch. You can then simply edit all the -files your patch wants to edit, and then simply "exit 0" from the shell -to actually create the patch file. - -To tweak an already existing patch, call "dpatch-edit-patch XX_patchname" -and replace XX_patchname with the actual filename from debian/patches -you want to use. - -To clean up afterwards again, "debian/rules unpatch" will do the -work for you - or you can of course choose to call -"fakeroot debian/rules clean" all together. - ---- - -original text by Gerfried Fuchs, edited by Junichi Uekawa <[email protected]> -10 Aug 2008. diff --git a/debian/changelog b/debian/changelog index 1a4e3b8..e907471 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +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 <[email protected]> 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 diff --git a/debian/compat b/debian/compat index 7ed6ff8..7f8f011 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -5 +7 diff --git a/debian/control b/debian/control index c2cfa41..4c9afb0 100644 --- a/debian/control +++ b/debian/control @@ -1,18 +1,18 @@ Source: libfile-tail-perl Section: perl Priority: optional +Build-Depends: debhelper (>= 7.0.50~) +Build-Depends-Indep: libtime-hires-perl, perl Maintainer: Roland Rosenfeld <[email protected]> -Build-Depends: debhelper (>> 5), dpatch -Build-Depends-Indep: perl (>= 5.6.0-16), libtime-hires-perl -Standards-Version: 3.8.4 +Standards-Version: 3.9.2 Homepage: http://search.cpan.org/~mgrabnar/ Package: libfile-tail-perl Architecture: all -Depends: ${perl:Depends}, ${misc:Depends}, libtime-hires-perl +Depends: ${misc:Depends}, ${perl:Depends}, libtime-hires-perl Description: File::Tail perl module The File::Tail module is designed for reading files which - are continously appended to (the name comes from the tail -f + 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 diff --git a/debian/copyright b/debian/copyright index 7521a5b..9044e9c 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,35 +1,35 @@ -This package was initially debianized by Craig Sanders <[email protected]> -and after this maintained several years by Scott M. Dier <[email protected]>. -Current maintainer is Roland Rosenfeld <[email protected]>. - - -It was downloaded from -http://www.cpan.org/authors/id/M/MG/MGRABNAR/File-Tail-0.99.3.tar.gz - -Upstream Author: Matija Grabnar <[email protected]> - -Copyright: - -Copyright (c) 1997,1998,1999 Matija Grabnar. - -All rights reserved. This program is free software; you can -redistribute it and/or modify it under the same terms as Perl itself. - -The Perl copyright is as follows: - -Copyright: - - Copyright 1989-2001, Larry Wall All rights reserved. - - 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 -the Artistic Licence in `/usr/share/common-licenses/Artistic'. +Format: http://dep.debian.net/deps/dep5/ +Upstream-Name: File-Tail +Upstream-Contact: Matija Grabnar <[email protected]> +Source: http://search.cpan.org/~mgrabnar/File-Tail-0.99.3/ + +Files: * +Copyright: Matija Grabnar, [email protected] +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 + the Artistic Licence in `/usr/share/common-licenses/Artistic'. + +Files: debian/* +Copyright: 1999, 2001, Craig Sanders <[email protected]> + 2002, 2004, Scott M. Dier <[email protected]> + 2007-2011, Roland Rosenfeld <[email protected]> +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 --git a/debian/docs b/debian/libfile-tail-perl.docs similarity index 100% rename from debian/docs rename to debian/libfile-tail-perl.docs diff --git a/debian/examples b/debian/libfile-tail-perl.examples similarity index 100% rename from debian/examples rename to debian/libfile-tail-perl.examples diff --git a/debian/patches/00list b/debian/patches/00list deleted file mode 100644 index d4fbf06..0000000 --- a/debian/patches/00list +++ /dev/null @@ -1,2 +0,0 @@ -10_pod_fixup.dpatch -20_manpage_typo.dpatch diff --git a/debian/patches/10_pod_fixup.dpatch b/debian/patches/10_pod_fixup.patch similarity index 82% rename from debian/patches/10_pod_fixup.dpatch rename to debian/patches/10_pod_fixup.patch index df7ebf4..3076197 100644 --- a/debian/patches/10_pod_fixup.dpatch +++ b/debian/patches/10_pod_fixup.patch @@ -1,13 +1,8 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 10_pod_fixup.dpatch by Scott M. Dier <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Fixup indentation of POD documentation. +Author: Scott M. Dier <[email protected]> +Description: Fixup indentation of POD documentation. -@DPATCH@ -diff -urNad libfile-tail-perl~/Tail.pm libfile-tail-perl/Tail.pm ---- libfile-tail-perl~/Tail.pm -+++ libfile-tail-perl/Tail.pm +--- 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): @@ -31,14 +26,14 @@ diff -urNad libfile-tail-perl~/Tail.pm libfile-tail-perl/Tail.pm =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 ++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. ++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. @@ -62,10 +57,10 @@ diff -urNad libfile-tail-perl~/Tail.pm libfile-tail-perl/Tail.pm - mv newlog log - kill -HUP logger - -+ 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 @@ -86,9 +81,8 @@ diff -urNad libfile-tail-perl~/Tail.pm libfile-tail-perl/Tail.pm Default is die. -diff -urNad libfile-tail-perl~/Tail.pm.debug libfile-tail-perl/Tail.pm.debug ---- libfile-tail-perl~/Tail.pm.debug -+++ libfile-tail-perl/Tail.pm.debug +--- a/Tail.pm.debug ++++ b/Tail.pm.debug @@ -638,12 +638,11 @@ OR, you could use tie (additional parameters can be passed with the name, or can be set using $ref): @@ -112,14 +106,14 @@ diff -urNad libfile-tail-perl~/Tail.pm.debug libfile-tail-perl/Tail.pm.debug =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 ++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. ++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. @@ -143,10 +137,10 @@ diff -urNad libfile-tail-perl~/Tail.pm.debug libfile-tail-perl/Tail.pm.debug - mv newlog log - kill -HUP logger - -+ 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 diff --git a/debian/patches/20_manpage_typo.dpatch b/debian/patches/20_manpage_typo.patch similarity index 78% rename from debian/patches/20_manpage_typo.dpatch rename to debian/patches/20_manpage_typo.patch index 4788263..39bc5f5 100644 --- a/debian/patches/20_manpage_typo.dpatch +++ b/debian/patches/20_manpage_typo.patch @@ -1,13 +1,17 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 20_manpage_typo.dpatch by Roland Rosenfeld <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Fix typo in man page. +Author: Roland Rosenfeld <[email protected]> +Description: Fix typos in man page. -@DPATCH@ -diff -urNad libfile-tail-perl~/Tail.pm libfile-tail-perl/Tail.pm ---- libfile-tail-perl~/Tail.pm -+++ libfile-tail-perl/Tail.pm +--- 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 @@ -22,7 +26,7 @@ diff -urNad libfile-tail-perl~/Tail.pm libfile-tail-perl/Tail.pm =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 ++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. @@ -35,9 +39,17 @@ diff -urNad libfile-tail-perl~/Tail.pm libfile-tail-perl/Tail.pm C<-1>, i.e. does not skip any information present in the file when it first checks it. -diff -urNad libfile-tail-perl~/Tail.pm.debug libfile-tail-perl/Tail.pm.debug ---- libfile-tail-perl~/Tail.pm.debug -+++ libfile-tail-perl/Tail.pm.debug +--- a/Tail.pm.debug ++++ b/Tail.pm.debug +@@ -619,7 +619,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 @@ =head1 DESCRIPTION @@ -52,7 +64,7 @@ diff -urNad libfile-tail-perl~/Tail.pm.debug libfile-tail-perl/Tail.pm.debug =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 ++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. diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..ab0d024 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,2 @@ +10_pod_fixup.patch +20_manpage_typo.patch diff --git a/debian/rules b/debian/rules index 77e35cb..24fe9ba 100755 --- a/debian/rules +++ b/debian/rules @@ -1,86 +1,7 @@ #!/usr/bin/make -f -# -# (c) 2007-2008 Roland Rosenfeld <[email protected]> -# -# This debian/rules file was intially created using dh-make-perl by -# Marc Brockschmidt <[email protected]> for the Debian Perl Group -# (http://pkg-perl.alioth.debian.org/) but may be used freely wherever -# it is useful. - # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +#export DH_OPTIONS=-v -# If set to a true value then MakeMaker's prompt function will -# always return the default without waiting for user input. -export PERL_MM_USE_DEFAULT=1 - -# Include dpatch stuff. -include /usr/share/dpatch/dpatch.make - -PACKAGE=$(shell dh_listpackages) - -ifndef PERL -PERL = /usr/bin/perl -endif - -TMP =$(CURDIR)/debian/$(PACKAGE) - -build: build-stamp -build-stamp: patch-stamp - dh_testdir - - $(PERL) Makefile.PL INSTALLDIRS=vendor - $(MAKE) - $(MAKE) test - - touch $@ - -clean: clean1 unpatch -clean1: - dh_testdir - dh_testroot - - dh_clean build-stamp install-stamp - - # Add commands to clean up after the build process here - [ ! -f Makefile ] || $(MAKE) realclean - -install: install-stamp -install-stamp: build-stamp - dh_testdir - dh_testroot - dh_clean -k - - $(MAKE) install DESTDIR=$(TMP) PREFIX=/usr - -# As this is a architecture independent package, we are not -# supposed to install stuff to /usr/lib. MakeMaker creates -# the dirs, we delete them from the deb: - [ ! -d $(TMP)/usr/lib/perl5 ] \ - || rmdir --ignore-fail-on-non-empty --parents --verbose \ - $(TMP)/usr/lib/perl5 - - touch $@ - -binary-arch: -# We have nothing to do here for an architecture-independent package - -binary-indep: build install - dh_testdir - dh_testroot - dh_installexamples - dh_installdocs README - dh_installchangelogs Changes - dh_perl - dh_compress - dh_fixperms - dh_installdeb - dh_gencontrol - dh_md5sums - dh_builddeb - -source diff: - @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary patch unpatch clean1 +%: + dh $@ diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libfile-tail-perl.git _______________________________________________ Pkg-perl-cvs-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits
