This is an automated email from the git hooks/post-receive script. dom pushed a commit to branch master in repository libgraphviz-perl.
commit b7b407e93a68cfa05d697e629a5b74b2cac8c2d0 Author: Dominic Hargreaves <d...@earth.li> Date: Sat Feb 8 14:46:00 2014 +0000 Imported Upstream version 2.15 --- Build.PL | 68 +++++++++++++++++++++------------------- Changelog.ini | 12 +++++-- CHANGES => Changes | 5 +++ MANIFEST | 2 +- META.json | 32 +++++++++---------- META.yml | 30 +++++++++--------- Makefile.PL | 66 ++++++++++++++++++++------------------ lib/Devel/GraphVizProf.pm | 2 +- lib/GraphViz.pm | 17 +++++----- lib/GraphViz/Data/Grapher.pm | 2 +- lib/GraphViz/No.pm | 2 +- lib/GraphViz/Parse/RecDescent.pm | 2 +- lib/GraphViz/Parse/Yacc.pm | 2 +- lib/GraphViz/Parse/Yapp.pm | 2 +- lib/GraphViz/Regex.pm | 2 +- lib/GraphViz/Small.pm | 2 +- lib/GraphViz/XML.pm | 2 +- t/pod.t | 4 +-- 18 files changed, 139 insertions(+), 115 deletions(-) diff --git a/Build.PL b/Build.PL index 972e2a4..06b0b3e 100644 --- a/Build.PL +++ b/Build.PL @@ -1,3 +1,6 @@ +use strict; +use warnings; + use Module::Build; if (open my $fh, '|dot', ) @@ -11,36 +14,37 @@ else Module::Build -> new ( - module_name => 'GraphViz', - license => 'perl', - dist_abstract => "Interface to AT&T's GraphViz. Deprecated. See GraphViz2", - dist_author => 'Leon Brocard <a...@astray.com>', - build_requires => - { - Test::More => 0.47, - Test::Pod => 1.44, - }, - configure_requires => - { - Module::Build => 0.3800, - }, - requires => - { - Carp => 1.01, - Config => 0, - File::Which => 1.09, - Getopt::Long => 2.34, - IO::Dir => 1.04, - IO::File => 1.10, - IPC::Run => 0.6, - LWP::Simple => 6.00, - Parse::RecDescent => 1.965001, - Pod::Usage => 1.16, - strict => 0, - Time::HiRes => 1.51, - vars => 0, - warnings => 0, - XML::Twig => 3.38, - XML::XPath => 1.13, - }, + module_name => 'GraphViz', + license => 'artistic_2', + dist_abstract => "Interface to AT&T's GraphViz. Deprecated. See GraphViz2", + dist_author => 'Leon Brocard <a...@astray.com>', + build_requires => + { + 'Test::More' => 0.47, +# 'Test::Pod' => 1.45, # Make it optional. See t/pod.t + }, + configure_requires => + { + 'Module::Build' => 0.3800, + }, + requires => + { + 'Carp' => 1.01, + 'Config' => 0, + 'File::Which' => 1.09, + 'Getopt::Long' => 2.34, + 'IO::Dir' => 1.04, + 'IO::File' => 1.10, + 'IPC::Run' => 0.6, + 'lib' => 0, + 'LWP::Simple' => 6.00, + 'Parse::RecDescent' => 1.965001, + 'Pod::Usage' => 1.16, + 'strict' => 0, + 'Time::HiRes' => 1.51, + 'vars' => 0, + 'warnings' => 0, + 'XML::Twig' => 3.38, + 'XML::XPath' => 1.13, + }, ) -> create_build_script(); diff --git a/Changelog.ini b/Changelog.ini index 87d65c7..a6195d3 100644 --- a/Changelog.ini +++ b/Changelog.ini @@ -1,7 +1,15 @@ [Module] Name=GraphViz -Changelog.Creator=Module::Metadata::Changes V 2.04 -Changelog.Parser=Config::IniFiles V 2.78 +Changelog.Creator=Module::Metadata::Changes V 2.05 +Changelog.Parser=Config::IniFiles V 2.82 + +[V 2.15] +Date=2013-11-28T11:23:00 +Comments= <<EOT +- Fix double-quote escaping bug in GraphViz's _attributes() method. See RT#90528. +Many thanx to Smylers for the report. +- Rename CHANGES to Changes as per CPAN::Changes::Spec. +EOT [V 2.14] Date=2012-11-09T16:06:00 diff --git a/CHANGES b/Changes similarity index 98% rename from CHANGES rename to Changes index fcc15ee..d9eb616 100644 --- a/CHANGES +++ b/Changes @@ -1,5 +1,10 @@ Revision history for Perl module GraphViz. +2.15 Thu Nov 28 11:23:00 2013 + - Fix double-quote escaping bug in GraphViz's _attributes() method. See RT#90528. + Many thanx to Smylers for the report. + - Rename CHANGES to Changes as per CPAN::Changes::Spec. + 2.14 Fri Nov 9 16:06:00 2012 - No code changes. - Patch t/foo.t to not assume text appears on specific lines of the output test files. diff --git a/MANIFEST b/MANIFEST index 6fef435..10989b6 100644 --- a/MANIFEST +++ b/MANIFEST @@ -1,6 +1,6 @@ Build.PL Changelog.ini -CHANGES +Changes examples/clusters.pl examples/clusters2.pl examples/directories.pl diff --git a/META.json b/META.json index d698f05..bb2720b 100644 --- a/META.json +++ b/META.json @@ -4,9 +4,9 @@ "Leon Brocard <a...@astray.com>" ], "dynamic_config" : 1, - "generated_by" : "Module::Build version 0.4003, CPAN::Meta::Converter version 2.120630", + "generated_by" : "Module::Build version 0.4005, CPAN::Meta::Converter version 2.131560", "license" : [ - "perl_5" + "artistic_2" ], "meta-spec" : { "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", @@ -16,8 +16,7 @@ "prereqs" : { "build" : { "requires" : { - "Test::More" : "0.47", - "Test::Pod" : "1.44" + "Test::More" : "0.47" } }, "configure" : { @@ -40,6 +39,7 @@ "Time::HiRes" : "1.51", "XML::Twig" : "3.38", "XML::XPath" : "1.13", + "lib" : "0", "strict" : "0", "vars" : "0", "warnings" : "0" @@ -49,50 +49,50 @@ "provides" : { "Devel::GraphVizProf" : { "file" : "lib/Devel/GraphVizProf.pm", - "version" : "2.14" + "version" : "2.15" }, "GraphViz" : { "file" : "lib/GraphViz.pm", - "version" : "2.14" + "version" : "2.15" }, "GraphViz::Data::Grapher" : { "file" : "lib/GraphViz/Data/Grapher.pm", - "version" : "2.14" + "version" : "2.15" }, "GraphViz::No" : { "file" : "lib/GraphViz/No.pm", - "version" : "2.14" + "version" : "2.15" }, "GraphViz::Parse::RecDescent" : { "file" : "lib/GraphViz/Parse/RecDescent.pm", - "version" : "2.14" + "version" : "2.15" }, "GraphViz::Parse::Yacc" : { "file" : "lib/GraphViz/Parse/Yacc.pm", - "version" : "2.14" + "version" : "2.15" }, "GraphViz::Parse::Yapp" : { "file" : "lib/GraphViz/Parse/Yapp.pm", - "version" : "2.14" + "version" : "2.15" }, "GraphViz::Regex" : { "file" : "lib/GraphViz/Regex.pm", - "version" : "2.14" + "version" : "2.15" }, "GraphViz::Small" : { "file" : "lib/GraphViz/Small.pm", - "version" : "2.14" + "version" : "2.15" }, "GraphViz::XML" : { "file" : "lib/GraphViz/XML.pm", - "version" : "2.14" + "version" : "2.15" } }, "release_status" : "stable", "resources" : { "license" : [ - "http://dev.perl.org/licenses/" + "http://www.perlfoundation.org/artistic_license_2_0" ] }, - "version" : "2.14" + "version" : "2.15" } diff --git a/META.yml b/META.yml index ae06d91..0f56b72 100644 --- a/META.yml +++ b/META.yml @@ -4,12 +4,11 @@ author: - 'Leon Brocard <a...@astray.com>' build_requires: Test::More: 0.47 - Test::Pod: 1.44 configure_requires: Module::Build: 0.38 dynamic_config: 1 -generated_by: 'Module::Build version 0.4003, CPAN::Meta::Converter version 2.120630' -license: perl +generated_by: 'Module::Build version 0.4005, CPAN::Meta::Converter version 2.131560' +license: artistic_2 meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html version: 1.4 @@ -17,34 +16,34 @@ name: GraphViz provides: Devel::GraphVizProf: file: lib/Devel/GraphVizProf.pm - version: 2.14 + version: 2.15 GraphViz: file: lib/GraphViz.pm - version: 2.14 + version: 2.15 GraphViz::Data::Grapher: file: lib/GraphViz/Data/Grapher.pm - version: 2.14 + version: 2.15 GraphViz::No: file: lib/GraphViz/No.pm - version: 2.14 + version: 2.15 GraphViz::Parse::RecDescent: file: lib/GraphViz/Parse/RecDescent.pm - version: 2.14 + version: 2.15 GraphViz::Parse::Yacc: file: lib/GraphViz/Parse/Yacc.pm - version: 2.14 + version: 2.15 GraphViz::Parse::Yapp: file: lib/GraphViz/Parse/Yapp.pm - version: 2.14 + version: 2.15 GraphViz::Regex: file: lib/GraphViz/Regex.pm - version: 2.14 + version: 2.15 GraphViz::Small: file: lib/GraphViz/Small.pm - version: 2.14 + version: 2.15 GraphViz::XML: file: lib/GraphViz/XML.pm - version: 2.14 + version: 2.15 requires: Carp: 1.01 Config: 0 @@ -59,9 +58,10 @@ requires: Time::HiRes: 1.51 XML::Twig: 3.38 XML::XPath: 1.13 + lib: 0 strict: 0 vars: 0 warnings: 0 resources: - license: http://dev.perl.org/licenses/ -version: 2.14 + license: http://www.perlfoundation.org/artistic_license_2_0 +version: 2.15 diff --git a/Makefile.PL b/Makefile.PL index 291d43e..3ccbfc6 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -1,3 +1,6 @@ +use strict; +use warnings; + use Config; use ExtUtils::MakeMaker; @@ -13,35 +16,36 @@ else WriteMakefile ( - NAME => 'GraphViz', - VERSION_FROM => 'lib/GraphViz.pm', - LICENSE => 'perl', - AUTHOR => 'Leon Brocard <a...@astray.com>', - ABSTRACT => "Interface to AT&T's GraphViz. Deprecated. See GraphViz2", - PREREQ_PM => - { - Carp => 1.01, - Config => 0, - File::Which => 1.09, - Getopt::Long => 2.34, - IO::Dir => 1.04, - IO::File => 1.10, - IPC::Run => 0.6, - LWP::Simple => 6.00, - Parse::RecDescent => 1.965001, - Pod::Usage => 1.16, - strict => 0, - Test::More => 0.47, - Test::Pod => 1.44, - Time::HiRes => 1.51, - vars => 0, - warnings => 0, - XML::Twig => 3.38, - XML::XPath => 1.13, - }, - dist => - { - COMPRESS => 'gzip -9f', - SUFFIX => 'gz', - }, + NAME => 'GraphViz', + VERSION_FROM => 'lib/GraphViz.pm', + AUTHOR => 'Leon Brocard <a...@astray.com>', + LICENSE => 'artistic_2',, + ABSTRACT => "Interface to AT&T's GraphViz. Deprecated. See GraphViz2", + PREREQ_PM => + { + 'Carp' => 1.01, + 'Config' => 0, + 'File::Which' => 1.09, + 'Getopt::Long' => 2.34, + 'IO::Dir' => 1.04, + 'IO::File' => 1.10, + 'IPC::Run' => 0.6, + 'lib' => 0, + 'LWP::Simple' => 6.00, + 'Parse::RecDescent' => 1.965001, + 'Pod::Usage' => 1.16, + 'strict' => 0, + 'Test::More' => 0.47, +# 'Test::Pod' => 1.45, # Make it optional. See t/pod.t + 'Time::HiRes' => 1.51, + 'vars' => 0, + 'warnings' => 0, + 'XML::Twig' => 3.38, + 'XML::XPath' => 1.13, + }, + dist => + { + COMPRESS => 'gzip -9f', + SUFFIX => 'gz', + }, ); diff --git a/lib/Devel/GraphVizProf.pm b/lib/Devel/GraphVizProf.pm index 78309c9..836f7c9 100644 --- a/lib/Devel/GraphVizProf.pm +++ b/lib/Devel/GraphVizProf.pm @@ -1,6 +1,6 @@ package Devel::GraphVizProf; # To help the CPAN indexer to identify us -our $VERSION = '2.14'; +our $VERSION = '2.15'; package DB; diff --git a/lib/GraphViz.pm b/lib/GraphViz.pm index 0377fb2..f45293f 100644 --- a/lib/GraphViz.pm +++ b/lib/GraphViz.pm @@ -8,7 +8,7 @@ use Carp; use Config; use IPC::Run qw(run binary); -our $VERSION = '2.14'; +our $VERSION = '2.15'; =head1 NAME @@ -1283,13 +1283,16 @@ sub _attributes { next if $key =~ /^_/; next if $key =~ /^(to|from|name|cluster|from_port|to_port)$/; - my $value = $thing->{$key}; - $value =~ s|"|\"|g; - $value = '"' . $value . '"' - unless ( $key eq 'label' && $value =~ /^<</ ); - $value =~ s|\n|\\n|g; + my $value = $thing->{$key} || ''; + + if ( $key ne 'label' || $value !~ /^<</ ) + { + $value =~ s|"|\\"|g; + $value = '"' . $value . '"' + } + $value =~ s|\n|\\n|g; + $value = '""' if ( ($value eq '') && ($value ne '""') ); - $value = '""' if not defined $value; push @attributes, "$key=$value"; } diff --git a/lib/GraphViz/Data/Grapher.pm b/lib/GraphViz/Data/Grapher.pm index 81a662c..cf2b8d3 100755 --- a/lib/GraphViz/Data/Grapher.pm +++ b/lib/GraphViz/Data/Grapher.pm @@ -8,7 +8,7 @@ use lib '../..'; use lib '..'; use GraphViz; -our $VERSION = '2.14'; +our $VERSION = '2.15'; =head1 NAME diff --git a/lib/GraphViz/No.pm b/lib/GraphViz/No.pm index f46bb12..f72fbf5 100644 --- a/lib/GraphViz/No.pm +++ b/lib/GraphViz/No.pm @@ -7,7 +7,7 @@ use vars qw($VERSION @ISA); @ISA = qw(GraphViz); -our $VERSION = '2.14'; +our $VERSION = '2.15'; =head1 NAME diff --git a/lib/GraphViz/Parse/RecDescent.pm b/lib/GraphViz/Parse/RecDescent.pm index 0e282eb..1829ba2 100755 --- a/lib/GraphViz/Parse/RecDescent.pm +++ b/lib/GraphViz/Parse/RecDescent.pm @@ -9,7 +9,7 @@ use lib '..'; use GraphViz; use Parse::RecDescent; -our $VERSION = '2.14'; +our $VERSION = '2.15'; =head1 NAME diff --git a/lib/GraphViz/Parse/Yacc.pm b/lib/GraphViz/Parse/Yacc.pm index f693064..46f5bed 100755 --- a/lib/GraphViz/Parse/Yacc.pm +++ b/lib/GraphViz/Parse/Yacc.pm @@ -8,7 +8,7 @@ use lib '../..'; use lib '..'; use GraphViz; -our $VERSION = '2.14'; +our $VERSION = '2.15'; =head1 NAME diff --git a/lib/GraphViz/Parse/Yapp.pm b/lib/GraphViz/Parse/Yapp.pm index f962437..f61a2de 100755 --- a/lib/GraphViz/Parse/Yapp.pm +++ b/lib/GraphViz/Parse/Yapp.pm @@ -8,7 +8,7 @@ use lib '../..'; use lib '..'; use GraphViz; -our $VERSION = '2.14'; +our $VERSION = '2.15'; =head1 NAME diff --git a/lib/GraphViz/Regex.pm b/lib/GraphViz/Regex.pm index f7d3f91..8087e1c 100644 --- a/lib/GraphViz/Regex.pm +++ b/lib/GraphViz/Regex.pm @@ -12,7 +12,7 @@ use IPC::Run qw(run); # See perldebguts -our $VERSION = '2.14'; +our $VERSION = '2.15'; my $DEBUG = 0; # whether debugging statements are shown diff --git a/lib/GraphViz/Small.pm b/lib/GraphViz/Small.pm index d83efd0..485f06d 100644 --- a/lib/GraphViz/Small.pm +++ b/lib/GraphViz/Small.pm @@ -7,7 +7,7 @@ use vars qw($VERSION @ISA); @ISA = qw(GraphViz); -our $VERSION = '2.14'; +our $VERSION = '2.15'; =head1 NAME diff --git a/lib/GraphViz/XML.pm b/lib/GraphViz/XML.pm index 9d5a66a..a71172f 100644 --- a/lib/GraphViz/XML.pm +++ b/lib/GraphViz/XML.pm @@ -8,7 +8,7 @@ use lib '..'; use GraphViz; use XML::Twig; -our $VERSION = '2.14'; +our $VERSION = '2.15'; =head1 NAME diff --git a/t/pod.t b/t/pod.t index fb0bd13..7a09fd7 100644 --- a/t/pod.t +++ b/t/pod.t @@ -2,6 +2,6 @@ use strict; use warnings; use Test::More; -eval "use Test::Pod 1.14"; -plan skip_all => "Test::Pod 1.14 required for testing POD" if $@; +eval "use Test::Pod 1.45"; +plan skip_all => "Test::Pod 1.45 required for testing POD" if $@; all_pod_files_ok(); -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libgraphviz-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