This is an automated email from the git hooks/post-receive script. gregoa pushed a commit to branch master in repository libfile-libmagic-perl.
commit 688ba50b39aa35dbba5087a4b84e422442abc46f Author: gregor herrmann <gre...@debian.org> Date: Tue May 6 18:38:11 2014 +0200 Imported Upstream version 1.01 --- Changes | 8 ++++++++ LICENSE | 6 +++--- MANIFEST | 1 + META.json | 14 ++++++++------ META.yml | 8 +++++--- Makefile.PL | 41 +++++++++++++++++------------------------ README | 10 +++++----- dist.ini | 7 ++++--- lib/File/LibMagic.pm | 18 ++++++------------ t/release-cpan-changes.t | 12 ++++-------- t/release-pod-syntax.t | 5 ++--- t/release-synopsis.t | 2 +- 12 files changed, 64 insertions(+), 68 deletions(-) diff --git a/Changes b/Changes index 9a5ce66..49bfbcf 100644 --- a/Changes +++ b/Changes @@ -1,3 +1,11 @@ +1.01 2014-05-04 + +- Fixed repository metadata. Reported by Jens Rehsack. RT #89200. + +- A File::LibMagic object would not close one of the handles it might have + opened, leading to leaks. Reported by Alexander Zaitsev. RT #93512. + + 1.00 2013-09-02 - Don't get all excited about this being 1.00. It's just what comes after diff --git a/LICENSE b/LICENSE index 57bc0ef..d7418d7 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -This software is copyright (c) 2013 by Andreas Fitzner, Michael Hendricks, and Dave Rolsky. +This software is copyright (c) 2014 by Andreas Fitzner, Michael Hendricks, and Dave Rolsky. This is free software; you can redistribute it and/or modify it under the same terms as the Perl 5 programming language system itself. @@ -12,7 +12,7 @@ b) the "Artistic License" --- The GNU General Public License, Version 1, February 1989 --- -This software is Copyright (c) 2013 by Andreas Fitzner, Michael Hendricks, and Dave Rolsky. +This software is Copyright (c) 2014 by Andreas Fitzner, Michael Hendricks, and Dave Rolsky. This is free software, licensed under: @@ -272,7 +272,7 @@ That's all there is to it! --- The Artistic License 1.0 --- -This software is Copyright (c) 2013 by Andreas Fitzner, Michael Hendricks, and Dave Rolsky. +This software is Copyright (c) 2014 by Andreas Fitzner, Michael Hendricks, and Dave Rolsky. This is free software, licensed under: diff --git a/MANIFEST b/MANIFEST index fefe59d..205d471 100644 --- a/MANIFEST +++ b/MANIFEST @@ -1,3 +1,4 @@ +# This file was automatically generated by Dist::Zilla::Plugin::Manifest v5.015. Changes INSTALL LICENSE diff --git a/META.json b/META.json index 8b07161..0d00c9f 100644 --- a/META.json +++ b/META.json @@ -6,7 +6,7 @@ "Dave Rolsky <auta...@urth.org>" ], "dynamic_config" : 0, - "generated_by" : "Dist::Zilla version 4.300037, CPAN::Meta::Converter version 2.131560", + "generated_by" : "Dist::Zilla version 5.015, CPAN::Meta::Converter version 2.120921", "license" : [ "perl_5" ], @@ -23,7 +23,6 @@ }, "develop" : { "requires" : { - "Test::CPAN::Changes" : "0.19", "Test::Pod" : "1.41" } }, @@ -53,11 +52,14 @@ }, "repository" : { "type" : "git", - "url" : "git://github.com/maxmind/File-LibMagic.git", - "web" : "https://github.com/maxmind/File-LibMagic" + "url" : "git://git.urth.org/File-LibMagic.git", + "web" : "http://git.urth.org/cgit.cgi/File-LibMagic.git/" } }, - "version" : "1.00", - "x_authority" : "cpan:DROLSKY" + "version" : "1.01", + "x_authority" : "cpan:DROLSKY", + "x_contributors" : [ + "Olaf Alders <o...@wundersolutions.com>" + ] } diff --git a/META.yml b/META.yml index 6f84702..f3eed9c 100644 --- a/META.yml +++ b/META.yml @@ -10,7 +10,7 @@ build_requires: configure_requires: ExtUtils::MakeMaker: 6.30 dynamic_config: 0 -generated_by: 'Dist::Zilla version 4.300037, CPAN::Meta::Converter version 2.131560' +generated_by: 'Dist::Zilla version 5.015, CPAN::Meta::Converter version 2.120921' license: perl meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html @@ -26,6 +26,8 @@ requires: warnings: 0 resources: bugtracker: http://rt.cpan.org/NoAuth/Bugs.html?Dist=File-LibMagic - repository: git://github.com/maxmind/File-LibMagic.git -version: 1.00 + repository: git://git.urth.org/File-LibMagic.git +version: 1.01 x_authority: cpan:DROLSKY +x_contributors: + - 'Olaf Alders <o...@wundersolutions.com>' diff --git a/Makefile.PL b/Makefile.PL index 492fbf7..882f011 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -1,4 +1,5 @@ +# This file was automatically generated by inc::MyMakeMaker v(dev). use strict; use warnings; @@ -41,37 +42,29 @@ my %WriteMakefileArgs = ( "Test::More" => "0.88", "lib" => 0 }, - "VERSION" => "1.00", + "VERSION" => "1.01", "test" => { "TESTS" => "t/*.t" } ); -unless ( eval { ExtUtils::MakeMaker->VERSION(6.63_03) } ) { - my $tr = delete $WriteMakefileArgs{TEST_REQUIRES}; - my $br = $WriteMakefileArgs{BUILD_REQUIRES}; - for my $mod ( keys %$tr ) { - if ( exists $br->{$mod} ) { - $br->{$mod} = $tr->{$mod} if $tr->{$mod} > $br->{$mod}; - } - else { - $br->{$mod} = $tr->{$mod}; - } - } -} +my %FallbackPrereqs = ( + "Carp" => 0, + "Exporter" => 0, + "Test::More" => "0.88", + "XSLoader" => 0, + "base" => 0, + "lib" => 0, + "strict" => 0, + "warnings" => 0 +); -unless ( eval { ExtUtils::MakeMaker->VERSION(6.56) } ) { - my $br = delete $WriteMakefileArgs{BUILD_REQUIRES}; - my $pp = $WriteMakefileArgs{PREREQ_PM}; - for my $mod ( keys %$br ) { - if ( exists $pp->{$mod} ) { - $pp->{$mod} = $br->{$mod} if $br->{$mod} > $pp->{$mod}; - } - else { - $pp->{$mod} = $br->{$mod}; - } - } + +unless ( eval { ExtUtils::MakeMaker->VERSION(6.63_03) } ) { + delete $WriteMakefileArgs{TEST_REQUIRES}; + delete $WriteMakefileArgs{BUILD_REQUIRES}; + $WriteMakefileArgs{PREREQ_PM} = \%FallbackPrereqs; } delete $WriteMakefileArgs{CONFIGURE_REQUIRES} diff --git a/README b/README index 97240bd..c9ff46f 100644 --- a/README +++ b/README @@ -2,7 +2,7 @@ NAME File::LibMagic - Determine MIME types of data or files using libmagic VERSION - version 1.00 + version 1.01 SYNOPSIS use File::LibMagic; @@ -94,7 +94,7 @@ DEPRECATED APIS The "complete" interface This interface is exported by: - use File::LibMagic ':easy'; + use File::LibMagic ':complete'; This interface exports several subroutines: @@ -129,8 +129,8 @@ DEPRECATED APIS Closes the magic handle. EXCEPTIONS - This module can throw an exception if you system runs out of memory when - trying to call "magic_open" internally. + This module can throw an exception if your system runs out of memory + when trying to call "magic_open" internally. SUPPORT Please submit bugs to the CPAN RT system at @@ -168,7 +168,7 @@ AUTHORS * Dave Rolsky <auta...@urth.org> COPYRIGHT AND LICENSE - This software is copyright (c) 2013 by Andreas Fitzner, Michael + This software is copyright (c) 2014 by Andreas Fitzner, Michael Hendricks, and Dave Rolsky. This is free software; you can redistribute it and/or modify it under diff --git a/dist.ini b/dist.ini index c659633..ec2ad6a 100644 --- a/dist.ini +++ b/dist.ini @@ -5,7 +5,7 @@ author = Dave Rolsky <auta...@urth.org> license = Perl_5 copyright_holder = Andreas Fitzner, Michael Hendricks, and Dave Rolsky -version = 1.00 +version = 1.01 [NextRelease] format = %-8v %{yyyy-MM-dd}d @@ -22,6 +22,7 @@ filenames = README [Authority] authority = cpan:DROLSKY +do_munging = 0 [ContributorsFromGit] [CopyReadmeFromBuild] @@ -32,8 +33,8 @@ authority = cpan:DROLSKY [MetaResources] bugtracker.web = http://rt.cpan.org/NoAuth/Bugs.html?Dist=File-LibMagic bugtracker.mailto = bug-file-libma...@rt.cpan.org -repository.url = git://github.com/maxmind/File-LibMagic.git -repository.web = https://github.com/maxmind/File-LibMagic +repository.url = git://git.urth.org/File-LibMagic.git +repository.web = http://git.urth.org/cgit.cgi/File-LibMagic.git/ repository.type = git [SurgicalPodWeaver] diff --git a/lib/File/LibMagic.pm b/lib/File/LibMagic.pm index 877014e..6eddc42 100644 --- a/lib/File/LibMagic.pm +++ b/lib/File/LibMagic.pm @@ -1,11 +1,5 @@ package File::LibMagic; -{ - $File::LibMagic::VERSION = '1.00'; -} -BEGIN { - $File::LibMagic::AUTHORITY = 'cpan:DROLSKY'; -} - +$File::LibMagic::VERSION = '1.01'; use 5.008; use strict; @@ -98,7 +92,7 @@ sub describe_filename { sub _mime_handle { my ($self) = @_; - return $self->{magic_handle} ||= do { + return $self->{mime_handle} ||= do { my $m = magic_open( MAGIC_MIME() ); magic_load( $m, $self->{magic_file} ); $m; @@ -137,7 +131,7 @@ File::LibMagic - Determine MIME types of data or files using libmagic =head1 VERSION -version 1.00 +version 1.01 =head1 SYNOPSIS @@ -242,7 +236,7 @@ Returns the description of a file, just like the C<describe_filename> method. This interface is exported by: - use File::LibMagic ':easy'; + use File::LibMagic ':complete'; This interface exports several subroutines: @@ -280,7 +274,7 @@ Closes the magic handle. =head1 EXCEPTIONS -This module can throw an exception if you system runs out of memory when +This module can throw an exception if your system runs out of memory when trying to call C<magic_open> internally. =head1 SUPPORT @@ -335,7 +329,7 @@ Dave Rolsky <auta...@urth.org> =head1 COPYRIGHT AND LICENSE -This software is copyright (c) 2013 by Andreas Fitzner, Michael Hendricks, and Dave Rolsky. +This software is copyright (c) 2014 by Andreas Fitzner, Michael Hendricks, and Dave Rolsky. This is free software; you can redistribute it and/or modify it under the same terms as the Perl 5 programming language system itself. diff --git a/t/release-cpan-changes.t b/t/release-cpan-changes.t index 214650f..bb5bd1d 100644 --- a/t/release-cpan-changes.t +++ b/t/release-cpan-changes.t @@ -8,12 +8,8 @@ BEGIN { } -use strict; -use warnings; - -use Test::More 0.96 tests => 2; -use_ok('Test::CPAN::Changes'); -subtest 'changes_ok' => sub { - changes_file_ok('Changes'); -}; +use Test::More; +eval 'use Test::CPAN::Changes'; +plan skip_all => 'Test::CPAN::Changes required for this test' if $@; +changes_ok(); done_testing(); diff --git a/t/release-pod-syntax.t b/t/release-pod-syntax.t index d46a955..cdd6a6c 100644 --- a/t/release-pod-syntax.t +++ b/t/release-pod-syntax.t @@ -7,9 +7,8 @@ BEGIN { } } +# This file was automatically generated by Dist::Zilla::Plugin::PodSyntaxTests. use Test::More; - -eval "use Test::Pod 1.41"; -plan skip_all => "Test::Pod 1.41 required for testing POD" if $@; +use Test::Pod 1.41; all_pod_files_ok(); diff --git a/t/release-synopsis.t b/t/release-synopsis.t index 7a83682..8da87a2 100644 --- a/t/release-synopsis.t +++ b/t/release-synopsis.t @@ -13,4 +13,4 @@ use Test::More; eval "use Test::Synopsis"; plan skip_all => "Test::Synopsis required for testing synopses" if $@; -all_synopsis_ok('lib'); +all_synopsis_ok(); -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libfile-libmagic-perl.git _______________________________________________ Pkg-perl-cvs-commits mailing list Pkg-perl-cvs-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits