diff -Nru libfile-rsync-perl-0.48/Changelog libfile-rsync-perl-0.49/Changelog --- libfile-rsync-perl-0.48/Changelog 2015-09-21 21:00:34.000000000 +0000 +++ libfile-rsync-perl-0.49/Changelog 2016-03-10 13:59:12.000000000 +0000 @@ -1,3 +1,12 @@ +Thu Mar 10 07:52:24 CST 2016 ( leakin at japh dot net ) + + * version 0.49: fix infun, broken since 0.46 refactor + + Michal Krupicka ( Michal dot Krupicka at skoda-auto dot cz ) reported + that I broke the the input function (it worked differently from 0.45 + and the documentation) when I converted to using IPC::Run3. This restores + compatability with 0.45. Thanks Michal. + Mon Sep 21 15:58:35 CDT 2015 ( leakin at dfw dot nostrum dot com ) * version 0.48: fix list option parsing diff -Nru libfile-rsync-perl-0.48/debian/changelog libfile-rsync-perl-0.49/debian/changelog --- libfile-rsync-perl-0.48/debian/changelog 2015-10-12 11:13:21.000000000 +0000 +++ libfile-rsync-perl-0.49/debian/changelog 2016-05-22 10:25:56.000000000 +0000 @@ -1,3 +1,21 @@ +libfile-rsync-perl (0.49-1) unstable; urgency=medium + + * Team upload. + + [ Salvatore Bonaccorso ] + * debian/control: Use HTTPS transport protocol for Vcs-Git URI + + [ gregor herrmann ] + * debian/copyright: change Copyright-Format 1.0 URL to HTTPS. + + [ Salvatore Bonaccorso ] + * Imported Upstream version 0.49 + * Update copyright years for upstream files + * Declare compliance with Debian policy 3.9.8 + * Fix spelling errors in File::Rsync manpage + + -- Salvatore Bonaccorso Sun, 22 May 2016 12:25:24 +0200 + libfile-rsync-perl (0.48-3) unstable; urgency=medium * Team upload. diff -Nru libfile-rsync-perl-0.48/debian/control libfile-rsync-perl-0.49/debian/control --- libfile-rsync-perl-0.48/debian/control 2015-10-11 11:08:50.000000000 +0000 +++ libfile-rsync-perl-0.49/debian/control 2016-05-22 10:25:56.000000000 +0000 @@ -10,9 +10,9 @@ Build-Depends-Indep: libipc-run3-perl, rsync, perl -Standards-Version: 3.9.6 +Standards-Version: 3.9.8 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-perl/packages/libfile-rsync-perl.git -Vcs-Git: git://anonscm.debian.org/pkg-perl/packages/libfile-rsync-perl.git +Vcs-Git: https://anonscm.debian.org/git/pkg-perl/packages/libfile-rsync-perl.git Homepage: https://metacpan.org/release/File-Rsync Package: libfile-rsync-perl diff -Nru libfile-rsync-perl-0.48/debian/copyright libfile-rsync-perl-0.49/debian/copyright --- libfile-rsync-perl-0.48/debian/copyright 2015-10-11 11:08:50.000000000 +0000 +++ libfile-rsync-perl-0.49/debian/copyright 2016-05-22 10:25:56.000000000 +0000 @@ -1,10 +1,10 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: File-Rsync Source: https://metacpan.org/release/File-Rsync Upstream-Contact: Lee Eakin Files: * -Copyright: 1999-2014, Lee Eakin +Copyright: 1999-2016, Lee Eakin License: Artistic or GPL-1+ Files: debian/* diff -Nru libfile-rsync-perl-0.48/debian/patches/fix-spelling-error-in-manpage.patch libfile-rsync-perl-0.49/debian/patches/fix-spelling-error-in-manpage.patch --- libfile-rsync-perl-0.48/debian/patches/fix-spelling-error-in-manpage.patch 1970-01-01 00:00:00.000000000 +0000 +++ libfile-rsync-perl-0.49/debian/patches/fix-spelling-error-in-manpage.patch 2016-05-22 10:25:56.000000000 +0000 @@ -0,0 +1,27 @@ +Description: Fix spelling errors in manpage +Origin: vendor +Author: Salvatore Bonaccorso +Last-Update: 2016-05-22 +Forwarded: https://rt.cpan.org/Ticket/Display.html?id=114573 +Bug: https://rt.cpan.org/Ticket/Display.html?id=114573 + +--- a/Rsync.pm ++++ b/Rsync.pm +@@ -165,7 +165,7 @@ They should have the proper single or do + should be split up the way you want them passed to exec. + The purpose of this option is to allow the use of arbitrary options added by + patches, and/or to allow the use of new options in rsync without needing an +-imediate update to the module in addtition to I itself. ++immediate update to the module in addtition to I itself. + + =cut + +@@ -787,7 +787,7 @@ all output to stderr from the last I sends all messages from the remote I process and any error + messages to stderr. + This method's purpose is to make it easier for you to parse that output for diff -Nru libfile-rsync-perl-0.48/debian/patches/series libfile-rsync-perl-0.49/debian/patches/series --- libfile-rsync-perl-0.48/debian/patches/series 2015-10-11 11:08:50.000000000 +0000 +++ libfile-rsync-perl-0.49/debian/patches/series 2016-05-22 10:25:56.000000000 +0000 @@ -1 +1,2 @@ skip-badoption-test-in-autopkgtest.patch +fix-spelling-error-in-manpage.patch diff -Nru libfile-rsync-perl-0.48/META.json libfile-rsync-perl-0.49/META.json --- libfile-rsync-perl-0.48/META.json 2015-09-21 21:03:06.000000000 +0000 +++ libfile-rsync-perl-0.49/META.json 2016-03-10 14:07:07.000000000 +0000 @@ -40,6 +40,6 @@ } }, "release_status" : "stable", - "version" : "0.48", + "version" : "0.49", "x_serialization_backend" : "JSON::PP version 2.27200" } diff -Nru libfile-rsync-perl-0.48/META.yml libfile-rsync-perl-0.49/META.yml --- libfile-rsync-perl-0.48/META.yml 2015-09-21 21:03:06.000000000 +0000 +++ libfile-rsync-perl-0.49/META.yml 2016-03-10 14:07:07.000000000 +0000 @@ -22,5 +22,5 @@ IPC::Run3: '0' Scalar::Util: '0' Test::More: '0' -version: '0.48' -x_serialization_backend: 'CPAN::Meta::YAML version 0.016' +version: '0.49' +x_serialization_backend: 'CPAN::Meta::YAML version 0.018' diff -Nru libfile-rsync-perl-0.48/README libfile-rsync-perl-0.49/README --- libfile-rsync-perl-0.48/README 2015-07-30 14:33:10.000000000 +0000 +++ libfile-rsync-perl-0.49/README 2016-03-10 13:51:11.000000000 +0000 @@ -1,7 +1,7 @@ File-Rsync - A wrapper module for rsync(1) http://rsync.samba.org/rsync/ ******************************************************************************* -Copyright (C) 2000-2015 Lee Eakin. All rights reserved. +Copyright (C) 2000-2016 Lee Eakin. All rights reserved. This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. ******************************************************************************* diff -Nru libfile-rsync-perl-0.48/Rsync.pm libfile-rsync-perl-0.49/Rsync.pm --- libfile-rsync-perl-0.48/Rsync.pm 2015-09-21 20:58:19.000000000 +0000 +++ libfile-rsync-perl-0.49/Rsync.pm 2016-03-09 20:36:13.000000000 +0000 @@ -23,7 +23,7 @@ use strict; use vars qw($VERSION); -$VERSION = '0.48'; +$VERSION = '0.49'; =head1 NAME @@ -686,7 +686,22 @@ my ($cmd, $infun, $outfun, $errfun, $debug) = $self->getcmd(@_); return unless $cmd; warn "exec: @$cmd\n" if $debug; - run3($cmd, $infun, \my $stdout, \my $stderr); + my $input; + if (ref $infun eq 'CODE') { + my $pid = open my $fh, '-|'; + if ($pid) { # parent grabs output + my @in = <$fh>; + close $fh; + chomp @in; + $input = \@in; + } else { # child runs infun + &{$infun}; + exit; + } + } else { + $input = $infun; + } + run3($cmd, $input, \my $stdout, \my $stderr); $self->{_lastcmd} = $cmd; $self->{_realstatus} = $?; $self->{_status} = $? & 127 ? $? & 127 : $? >> 8; diff -Nru libfile-rsync-perl-0.48/test.pl libfile-rsync-perl-0.49/test.pl --- libfile-rsync-perl-0.48/test.pl 2015-09-11 13:34:57.000000000 +0000 +++ libfile-rsync-perl-0.49/test.pl 2016-03-09 16:46:51.000000000 +0000 @@ -155,7 +155,7 @@ my $rs = File::Rsync->new( archive => 1, files_from => '-', - infun => sub { return shift @copy_list }, + infun => sub { print join "\n", @copy_list }, ); my $ok; my $missing;