diff -Nru libgit-pureperl-perl-0.52/CHANGES libgit-pureperl-perl-0.53/CHANGES --- libgit-pureperl-perl-0.52/CHANGES 2016-06-11 20:23:05.000000000 +0000 +++ libgit-pureperl-perl-0.53/CHANGES 2016-09-19 15:13:23.000000000 +0000 @@ -1,5 +1,9 @@ Revision history for Perl module Git::PurePerl: +0.53 Mon 19 Sep 2016 16:12:45 BST + - Add support for creating merge commits to Git::PurePerl::Object::Commit + (Philippe Bruhat (BooK)) + 0.52 Sat Jun 11 22:22:04 CEST 2016 - fix 'Can't redeclare "my" in "my" ...' error in 5.24 (gregor herrmann) diff -Nru libgit-pureperl-perl-0.52/debian/changelog libgit-pureperl-perl-0.53/debian/changelog --- libgit-pureperl-perl-0.52/debian/changelog 2016-07-21 21:24:21.000000000 +0000 +++ libgit-pureperl-perl-0.53/debian/changelog 2016-10-29 18:33:34.000000000 +0000 @@ -1,3 +1,11 @@ +libgit-pureperl-perl (0.53-1) unstable; urgency=medium + + * Team upload. + * Import upstream version 0.53. + * Disable DNS queries during package build. + + -- gregor herrmann Sat, 29 Oct 2016 20:33:34 +0200 + libgit-pureperl-perl (0.52-1) unstable; urgency=medium * Team upload. diff -Nru libgit-pureperl-perl-0.52/debian/rules libgit-pureperl-perl-0.53/debian/rules --- libgit-pureperl-perl-0.52/debian/rules 2016-07-21 21:24:21.000000000 +0000 +++ libgit-pureperl-perl-0.53/debian/rules 2016-10-29 18:33:34.000000000 +0000 @@ -2,3 +2,6 @@ %: dh $@ + +override_dh_auto_test: + RES_OPTIONS=attempts:0 dh_auto_test diff -Nru libgit-pureperl-perl-0.52/inc/Module/Install/Base.pm libgit-pureperl-perl-0.53/inc/Module/Install/Base.pm --- libgit-pureperl-perl-0.52/inc/Module/Install/Base.pm 2016-06-11 20:24:30.000000000 +0000 +++ libgit-pureperl-perl-0.53/inc/Module/Install/Base.pm 2016-09-19 15:13:38.000000000 +0000 @@ -4,7 +4,7 @@ use strict 'vars'; use vars qw{$VERSION}; BEGIN { - $VERSION = '1.06'; + $VERSION = '1.16'; } # Suspend handler for "redefined" warnings diff -Nru libgit-pureperl-perl-0.52/inc/Module/Install/Can.pm libgit-pureperl-perl-0.53/inc/Module/Install/Can.pm --- libgit-pureperl-perl-0.52/inc/Module/Install/Can.pm 2016-06-11 20:24:30.000000000 +0000 +++ libgit-pureperl-perl-0.53/inc/Module/Install/Can.pm 2016-09-19 15:13:38.000000000 +0000 @@ -8,7 +8,7 @@ use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '1.06'; + $VERSION = '1.16'; @ISA = 'Module::Install::Base'; $ISCORE = 1; } diff -Nru libgit-pureperl-perl-0.52/inc/Module/Install/Fetch.pm libgit-pureperl-perl-0.53/inc/Module/Install/Fetch.pm --- libgit-pureperl-perl-0.52/inc/Module/Install/Fetch.pm 2016-06-11 20:24:30.000000000 +0000 +++ libgit-pureperl-perl-0.53/inc/Module/Install/Fetch.pm 2016-09-19 15:13:38.000000000 +0000 @@ -6,7 +6,7 @@ use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '1.06'; + $VERSION = '1.16'; @ISA = 'Module::Install::Base'; $ISCORE = 1; } diff -Nru libgit-pureperl-perl-0.52/inc/Module/Install/Makefile.pm libgit-pureperl-perl-0.53/inc/Module/Install/Makefile.pm --- libgit-pureperl-perl-0.52/inc/Module/Install/Makefile.pm 2016-06-11 20:24:30.000000000 +0000 +++ libgit-pureperl-perl-0.53/inc/Module/Install/Makefile.pm 2016-09-19 15:13:38.000000000 +0000 @@ -8,7 +8,7 @@ use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '1.06'; + $VERSION = '1.16'; @ISA = 'Module::Install::Base'; $ISCORE = 1; } @@ -133,7 +133,7 @@ return $args; } -# For mm args that take multiple space-seperated args, +# For mm args that take multiple space-separated args, # append an argument to the current list. sub makemaker_append { my $self = shift; diff -Nru libgit-pureperl-perl-0.52/inc/Module/Install/Metadata.pm libgit-pureperl-perl-0.53/inc/Module/Install/Metadata.pm --- libgit-pureperl-perl-0.52/inc/Module/Install/Metadata.pm 2016-06-11 20:24:30.000000000 +0000 +++ libgit-pureperl-perl-0.53/inc/Module/Install/Metadata.pm 2016-09-19 15:13:38.000000000 +0000 @@ -6,7 +6,7 @@ use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '1.06'; + $VERSION = '1.16'; @ISA = 'Module::Install::Base'; $ISCORE = 1; } @@ -347,7 +347,7 @@ ^ \s* package \s* ([\w:]+) - \s* ; + [\s|;]* /ixms ) { my ($name, $module_name) = ($1, $1); @@ -705,7 +705,7 @@ my @yaml = Parse::CPAN::Meta::LoadFile('META.yml'); my $meta = $yaml[0]; - # Overwrite the non-configure dependency hashs + # Overwrite the non-configure dependency hashes delete $meta->{requires}; delete $meta->{build_requires}; delete $meta->{recommends}; diff -Nru libgit-pureperl-perl-0.52/inc/Module/Install/Win32.pm libgit-pureperl-perl-0.53/inc/Module/Install/Win32.pm --- libgit-pureperl-perl-0.52/inc/Module/Install/Win32.pm 2016-06-11 20:24:30.000000000 +0000 +++ libgit-pureperl-perl-0.53/inc/Module/Install/Win32.pm 2016-09-19 15:13:38.000000000 +0000 @@ -6,7 +6,7 @@ use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '1.06'; + $VERSION = '1.16'; @ISA = 'Module::Install::Base'; $ISCORE = 1; } diff -Nru libgit-pureperl-perl-0.52/inc/Module/Install/WriteAll.pm libgit-pureperl-perl-0.53/inc/Module/Install/WriteAll.pm --- libgit-pureperl-perl-0.52/inc/Module/Install/WriteAll.pm 2016-06-11 20:24:30.000000000 +0000 +++ libgit-pureperl-perl-0.53/inc/Module/Install/WriteAll.pm 2016-09-19 15:13:38.000000000 +0000 @@ -6,7 +6,7 @@ use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '1.06'; + $VERSION = '1.16'; @ISA = qw{Module::Install::Base}; $ISCORE = 1; } diff -Nru libgit-pureperl-perl-0.52/inc/Module/Install.pm libgit-pureperl-perl-0.53/inc/Module/Install.pm --- libgit-pureperl-perl-0.52/inc/Module/Install.pm 2016-06-11 20:24:28.000000000 +0000 +++ libgit-pureperl-perl-0.53/inc/Module/Install.pm 2016-09-19 15:13:38.000000000 +0000 @@ -17,7 +17,7 @@ # 3. The ./inc/ version of Module::Install loads # } -use 5.005; +use 5.006; use strict 'vars'; use Cwd (); use File::Find (); @@ -31,7 +31,7 @@ # This is not enforced yet, but will be some time in the next few # releases once we can make sure it won't clash with custom # Module::Install extensions. - $VERSION = '1.06'; + $VERSION = '1.16'; # Storage for the pseudo-singleton $MAIN = undef; @@ -156,10 +156,10 @@ sub autoload { my $self = shift; my $who = $self->_caller; - my $cwd = Cwd::cwd(); + my $cwd = Cwd::getcwd(); my $sym = "${who}::AUTOLOAD"; $sym->{$cwd} = sub { - my $pwd = Cwd::cwd(); + my $pwd = Cwd::getcwd(); if ( my $code = $sym->{$pwd} ) { # Delegate back to parent dirs goto &$code unless $cwd eq $pwd; @@ -239,7 +239,7 @@ # ignore the prefix on extension modules built from top level. my $base_path = Cwd::abs_path($FindBin::Bin); - unless ( Cwd::abs_path(Cwd::cwd()) eq $base_path ) { + unless ( Cwd::abs_path(Cwd::getcwd()) eq $base_path ) { delete $args{prefix}; } return $args{_self} if $args{_self}; @@ -338,7 +338,7 @@ if ( $subpath eq lc($subpath) || $subpath eq uc($subpath) ) { my $content = Module::Install::_read($subpath . '.pm'); my $in_pod = 0; - foreach ( split //, $content ) { + foreach ( split /\n/, $content ) { $in_pod = 1 if /^=\w/; $in_pod = 0 if /^=cut/; next if ($in_pod || /^=cut/); # skip pod text @@ -378,6 +378,7 @@ sub _read { local *FH; open( FH, '<', $_[0] ) or die "open($_[0]): $!"; + binmode FH; my $string = do { local $/; }; close FH or die "close($_[0]): $!"; return $string; @@ -386,6 +387,7 @@ sub _read { local *FH; open( FH, "< $_[0]" ) or die "open($_[0]): $!"; + binmode FH; my $string = do { local $/; }; close FH or die "close($_[0]): $!"; return $string; @@ -416,6 +418,7 @@ sub _write { local *FH; open( FH, '>', $_[0] ) or die "open($_[0]): $!"; + binmode FH; foreach ( 1 .. $#_ ) { print FH $_[$_] or die "print($_[0]): $!"; } @@ -425,6 +428,7 @@ sub _write { local *FH; open( FH, "> $_[0]" ) or die "open($_[0]): $!"; + binmode FH; foreach ( 1 .. $#_ ) { print FH $_[$_] or die "print($_[0]): $!"; } @@ -434,7 +438,7 @@ # _version is for processing module versions (eg, 1.03_05) not # Perl versions (eg, 5.8.1). -sub _version ($) { +sub _version { my $s = shift || 0; my $d =()= $s =~ /(\.)/g; if ( $d >= 2 ) { @@ -450,12 +454,12 @@ return $l + 0; } -sub _cmp ($$) { +sub _cmp { _version($_[1]) <=> _version($_[2]); } # Cloned from Params::Util::_CLASS -sub _CLASS ($) { +sub _CLASS { ( defined $_[0] and diff -Nru libgit-pureperl-perl-0.52/lib/Git/PurePerl/NewObject/Commit.pm libgit-pureperl-perl-0.53/lib/Git/PurePerl/NewObject/Commit.pm --- libgit-pureperl-perl-0.52/lib/Git/PurePerl/NewObject/Commit.pm 2013-08-26 11:24:05.000000000 +0000 +++ libgit-pureperl-perl-0.53/lib/Git/PurePerl/NewObject/Commit.pm 2016-09-19 13:38:59.000000000 +0000 @@ -10,7 +10,7 @@ has 'kind' => ( is => 'ro', isa => 'ObjectKind', required => 1, default => 'commit' ); has 'tree' => ( is => 'rw', isa => 'Str', required => 1 ); -has 'parent' => ( is => 'rw', isa => 'Str', required => 0 ); +has 'parent' => ( is => 'rw', isa => 'Str|ArrayRef[Str]', required => 0 ); has 'author' => ( is => 'rw', isa => 'Git::PurePerl::Actor', required => 1 ); has 'authored_time' => ( is => 'rw', isa => 'DateTime', required => 1 ); has 'committer' => @@ -23,7 +23,14 @@ my $content; $content .= 'tree ' . $self->tree . "\n"; - $content .= 'parent ' . $self->parent . "\n" if $self->parent; + if ( my $parent = $self->parent ) { + if ( ref $parent ) { + $content .= "parent $_\n" for @$parent; + } + else { + $content .= "parent $parent\n"; + } + } $content .= "author " . $self->author->name . ' <' diff -Nru libgit-pureperl-perl-0.52/lib/Git/PurePerl.pm libgit-pureperl-perl-0.53/lib/Git/PurePerl.pm --- libgit-pureperl-perl-0.52/lib/Git/PurePerl.pm 2016-06-11 20:23:57.000000000 +0000 +++ libgit-pureperl-perl-0.53/lib/Git/PurePerl.pm 2016-09-19 15:13:33.000000000 +0000 @@ -37,7 +37,7 @@ use Path::Class; use namespace::autoclean; -our $VERSION = '0.52'; +our $VERSION = '0.53'; $VERSION = eval $VERSION; has 'directory' => ( diff -Nru libgit-pureperl-perl-0.52/MANIFEST libgit-pureperl-perl-0.53/MANIFEST --- libgit-pureperl-perl-0.52/MANIFEST 2014-01-25 13:53:15.000000000 +0000 +++ libgit-pureperl-perl-0.53/MANIFEST 2016-09-19 15:13:40.000000000 +0000 @@ -36,8 +36,11 @@ Makefile.PL MANIFEST This list of files META.yml +MYMETA.json +MYMETA.yml README t/00_setup.t +t/checkout/file.txt t/encoding.t t/init.t t/protocol.t diff -Nru libgit-pureperl-perl-0.52/META.yml libgit-pureperl-perl-0.53/META.yml --- libgit-pureperl-perl-0.52/META.yml 2016-06-11 20:24:32.000000000 +0000 +++ libgit-pureperl-perl-0.53/META.yml 2016-09-19 15:13:38.000000000 +0000 @@ -5,13 +5,13 @@ - 'Leon Brocard ' build_requires: ExtUtils::MakeMaker: 6.36 - Test::More: 0.88 - Test::utf8: 0.02 + Test::More: '0.88' + Test::utf8: '0.02' configure_requires: ExtUtils::MakeMaker: 6.36 distribution_type: module dynamic_config: 1 -generated_by: 'Module::Install version 1.06' +generated_by: 'Module::Install version 1.16' license: perl meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html @@ -37,4 +37,4 @@ resources: license: http://dev.perl.org/licenses/ repository: git://github.com/broquaint/git-pureperl.git -version: 0.52 +version: '0.53' diff -Nru libgit-pureperl-perl-0.52/MYMETA.json libgit-pureperl-perl-0.53/MYMETA.json --- libgit-pureperl-perl-0.52/MYMETA.json 1970-01-01 00:00:00.000000000 +0000 +++ libgit-pureperl-perl-0.53/MYMETA.json 2016-09-19 15:13:43.000000000 +0000 @@ -0,0 +1,65 @@ +{ + "abstract" : "A Pure Perl interface to Git repositories", + "author" : [ + "Leon Brocard ", + "Leon Brocard " + ], + "dynamic_config" : 0, + "generated_by" : "Module::Install version 1.16, CPAN::Meta::Converter version 2.150005", + "license" : [ + "perl_5" + ], + "meta-spec" : { + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", + "version" : "2" + }, + "name" : "Git-PurePerl", + "no_index" : { + "directory" : [ + "inc", + "t" + ] + }, + "prereqs" : { + "build" : { + "requires" : { + "ExtUtils::MakeMaker" : "6.36", + "Test::More" : "0.88", + "Test::utf8" : "0.02" + } + }, + "configure" : { + "requires" : { + "ExtUtils::MakeMaker" : "0" + } + }, + "runtime" : { + "requires" : { + "Archive::Extract" : "0", + "Compress::Raw::Zlib" : "0", + "Compress::Zlib" : "0", + "Config::GitLike" : "0", + "Data::Stream::Bulk" : "0", + "DateTime" : "0", + "File::Find::Rule" : "0", + "IO::Digest" : "0", + "Moose" : "0", + "MooseX::StrictConstructor" : "0", + "MooseX::Types::Path::Class" : "0", + "namespace::autoclean" : "0" + } + } + }, + "release_status" : "stable", + "resources" : { + "license" : [ + "http://dev.perl.org/licenses/" + ], + "repository" : { + "type" : "git", + "url" : "git://github.com/broquaint/git-pureperl.git" + } + }, + "version" : "0.53", + "x_serialization_backend" : "JSON::PP version 2.27300" +} diff -Nru libgit-pureperl-perl-0.52/MYMETA.yml libgit-pureperl-perl-0.53/MYMETA.yml --- libgit-pureperl-perl-0.52/MYMETA.yml 1970-01-01 00:00:00.000000000 +0000 +++ libgit-pureperl-perl-0.53/MYMETA.yml 2016-09-19 15:13:38.000000000 +0000 @@ -0,0 +1,36 @@ +--- +abstract: 'A Pure Perl interface to Git repositories' +author: + - 'Leon Brocard , Leon Brocard ' +build_requires: + ExtUtils::MakeMaker: '6.36' + Test::More: '0.88' + Test::utf8: '0.02' +configure_requires: + ExtUtils::MakeMaker: '0' +dynamic_config: 0 +generated_by: 'ExtUtils::MakeMaker version 7.1001, CPAN::Meta::Converter version 2.150005' +license: perl +meta-spec: + url: http://module-build.sourceforge.net/META-spec-v1.4.html + version: '1.4' +name: Git-PurePerl +no_index: + directory: + - t + - inc +requires: + Archive::Extract: '0' + Compress::Raw::Zlib: '0' + Compress::Zlib: '0' + Config::GitLike: '0' + Data::Stream::Bulk: '0' + DateTime: '0' + File::Find::Rule: '0' + IO::Digest: '0' + Moose: '0' + MooseX::StrictConstructor: '0' + MooseX::Types::Path::Class: '0' + namespace::autoclean: '0' +version: '0.53' +x_serialization_backend: 'CPAN::Meta::YAML version 0.018' diff -Nru libgit-pureperl-perl-0.52/t/checkout/file.txt libgit-pureperl-perl-0.53/t/checkout/file.txt --- libgit-pureperl-perl-0.52/t/checkout/file.txt 1970-01-01 00:00:00.000000000 +0000 +++ libgit-pureperl-perl-0.53/t/checkout/file.txt 2016-09-19 14:37:19.000000000 +0000 @@ -0,0 +1,2 @@ +hello world! +hello world, again