This is an automated email from the git hooks/post-receive script. dom pushed a commit to branch master in repository libgraphviz-perl.
commit 0e76a3222beca5802a1afd257c573f20a391da2b Author: Dominic Hargreaves <[email protected]> Date: Sun Apr 21 00:01:42 2013 +0100 Imported Upstream version 2.14 --- Build.PL | 6 +++--- CHANGES | 20 ++++++++++++++++++++ Changelog.ini | 34 ++++++++++++++++++++++++++++++++-- META.json | 30 +++++++++++++++--------------- META.yml | 30 +++++++++++++++--------------- Makefile.PL | 6 +++--- lib/Devel/GraphVizProf.pm | 2 +- lib/GraphViz.pm | 36 ++++++++++++++++++++++++++++++++++-- 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/foo.t | 18 +++++++++--------- 17 files changed, 140 insertions(+), 58 deletions(-) diff --git a/Build.PL b/Build.PL index 4367d93..972e2a4 100644 --- a/Build.PL +++ b/Build.PL @@ -36,10 +36,10 @@ Module::Build -> new LWP::Simple => 6.00, Parse::RecDescent => 1.965001, Pod::Usage => 1.16, - strict => 1.03, + strict => 0, Time::HiRes => 1.51, - vars => 1.01, - warnings => 1.03, + vars => 0, + warnings => 0, XML::Twig => 3.38, XML::XPath => 1.13, }, diff --git a/CHANGES b/CHANGES index 8ea9d3b..fcc15ee 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,25 @@ Revision history for Perl module GraphViz. +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. + +2.13 Fri Nov 9 08:27:00 2012 + - No code changes. + - Re-package distro because users get errors during testing. See RT#80709. + Since I had this same error during my testing, I assume the uploaded version contains un-patched + code. The errors are not in GraphViz, they are in the test code which has hard-coded line numbers + where it looks for strings in the output. The output has been reformatted recently, and no longer + matches those assumptions. See t/foo.t for details. Note: I did not write those tests :-). + +2.12 Thu Nov 8 12:38:00 2012 + - No code changes. + - For pre-reqs such as strict, warnings, etc, which ship with Perl, set the version # to 0. + Reported as RT#80663 by Father Chrysostomos for Tree::DAG_Node. + +2.11 Tue Sep 18 08:22:00 2012 + - Add VDX as an output format. + 2.10 Mon Mar 26 10:11:00 2012 - Accept a patch kindly supplied by Alexander Kriegisch, to change handling of the rankdir attribute. The valid values are BT, LR, RL or TB, or their lower-case equivalents. diff --git a/Changelog.ini b/Changelog.ini index d3554c8..87d65c7 100644 --- a/Changelog.ini +++ b/Changelog.ini @@ -1,7 +1,37 @@ [Module] Name=GraphViz -Changelog.Creator=Module::Metadata::Changes V 2.03 -Changelog.Parser=Config::IniFiles V 2.68 +Changelog.Creator=Module::Metadata::Changes V 2.04 +Changelog.Parser=Config::IniFiles V 2.78 + +[V 2.14] +Date=2012-11-09T16:06:00 +Comments= <<EOT +- No code changes. +- Patch t/foo.t to not assume text appears on specific lines of the output test files. +EOT + +[V 2.13] +Date=2012-11-09T08:27:00 +Comments= <<EOT +- No code changes. +- Re-package distro because users get errors during testing. See RT#80709. +Since I had this same error during my testing, I assume the uploaded version contains un-patched +code. The errors are not in GraphViz, they are in the test code which has hard-coded line numbers +where it looks for strings in the output. The output has been reformatted recently, and no longer +matches those assumptions. See t/foo.t for details. Note: I did not write those tests :-). +EOT + +[V 2.12] +Date=2012-11-08T12:38:00 +Comments= <<EOT +- No code changes. +- For pre-reqs such as strict, warnings, etc, which ship with Perl, set the version # to 0. +Reported as RT#80663 by Father Chrysostomos for Tree::DAG_Node. +EOT + +[V 2.11] +Date=2012-09-18T08:22:00 +Comments=- Add VDX as an output format. [V 2.10] Date=2012-03-26T10:11:00 diff --git a/META.json b/META.json index 687cd94..d698f05 100644 --- a/META.json +++ b/META.json @@ -4,7 +4,7 @@ "Leon Brocard <[email protected]>" ], "dynamic_config" : 1, - "generated_by" : "Module::Build version 0.4, CPAN::Meta::Converter version 2.120630", + "generated_by" : "Module::Build version 0.4003, CPAN::Meta::Converter version 2.120630", "license" : [ "perl_5" ], @@ -40,52 +40,52 @@ "Time::HiRes" : "1.51", "XML::Twig" : "3.38", "XML::XPath" : "1.13", - "strict" : "1.03", - "vars" : "1.01", - "warnings" : "1.03" + "strict" : "0", + "vars" : "0", + "warnings" : "0" } } }, "provides" : { "Devel::GraphVizProf" : { "file" : "lib/Devel/GraphVizProf.pm", - "version" : "2.10" + "version" : "2.14" }, "GraphViz" : { "file" : "lib/GraphViz.pm", - "version" : "2.10" + "version" : "2.14" }, "GraphViz::Data::Grapher" : { "file" : "lib/GraphViz/Data/Grapher.pm", - "version" : "2.10" + "version" : "2.14" }, "GraphViz::No" : { "file" : "lib/GraphViz/No.pm", - "version" : "2.10" + "version" : "2.14" }, "GraphViz::Parse::RecDescent" : { "file" : "lib/GraphViz/Parse/RecDescent.pm", - "version" : "2.10" + "version" : "2.14" }, "GraphViz::Parse::Yacc" : { "file" : "lib/GraphViz/Parse/Yacc.pm", - "version" : "2.10" + "version" : "2.14" }, "GraphViz::Parse::Yapp" : { "file" : "lib/GraphViz/Parse/Yapp.pm", - "version" : "2.10" + "version" : "2.14" }, "GraphViz::Regex" : { "file" : "lib/GraphViz/Regex.pm", - "version" : "2.10" + "version" : "2.14" }, "GraphViz::Small" : { "file" : "lib/GraphViz/Small.pm", - "version" : "2.10" + "version" : "2.14" }, "GraphViz::XML" : { "file" : "lib/GraphViz/XML.pm", - "version" : "2.10" + "version" : "2.14" } }, "release_status" : "stable", @@ -94,5 +94,5 @@ "http://dev.perl.org/licenses/"; ] }, - "version" : "2.10" + "version" : "2.14" } diff --git a/META.yml b/META.yml index c833db5..ae06d91 100644 --- a/META.yml +++ b/META.yml @@ -8,7 +8,7 @@ build_requires: configure_requires: Module::Build: 0.38 dynamic_config: 1 -generated_by: 'Module::Build version 0.4, CPAN::Meta::Converter version 2.120630' +generated_by: 'Module::Build version 0.4003, CPAN::Meta::Converter version 2.120630' license: perl meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html @@ -17,34 +17,34 @@ name: GraphViz provides: Devel::GraphVizProf: file: lib/Devel/GraphVizProf.pm - version: 2.10 + version: 2.14 GraphViz: file: lib/GraphViz.pm - version: 2.10 + version: 2.14 GraphViz::Data::Grapher: file: lib/GraphViz/Data/Grapher.pm - version: 2.10 + version: 2.14 GraphViz::No: file: lib/GraphViz/No.pm - version: 2.10 + version: 2.14 GraphViz::Parse::RecDescent: file: lib/GraphViz/Parse/RecDescent.pm - version: 2.10 + version: 2.14 GraphViz::Parse::Yacc: file: lib/GraphViz/Parse/Yacc.pm - version: 2.10 + version: 2.14 GraphViz::Parse::Yapp: file: lib/GraphViz/Parse/Yapp.pm - version: 2.10 + version: 2.14 GraphViz::Regex: file: lib/GraphViz/Regex.pm - version: 2.10 + version: 2.14 GraphViz::Small: file: lib/GraphViz/Small.pm - version: 2.10 + version: 2.14 GraphViz::XML: file: lib/GraphViz/XML.pm - version: 2.10 + version: 2.14 requires: Carp: 1.01 Config: 0 @@ -59,9 +59,9 @@ requires: Time::HiRes: 1.51 XML::Twig: 3.38 XML::XPath: 1.13 - strict: 1.03 - vars: 1.01 - warnings: 1.03 + strict: 0 + vars: 0 + warnings: 0 resources: license: http://dev.perl.org/licenses/ -version: 2.10 +version: 2.14 diff --git a/Makefile.PL b/Makefile.PL index 7b82446..291d43e 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -30,12 +30,12 @@ WriteMakefile LWP::Simple => 6.00, Parse::RecDescent => 1.965001, Pod::Usage => 1.16, - strict => 1.03, + strict => 0, Test::More => 0.47, Test::Pod => 1.44, Time::HiRes => 1.51, - vars => 1.01, - warnings => 1.03, + vars => 0, + warnings => 0, XML::Twig => 3.38, XML::XPath => 1.13, }, diff --git a/lib/Devel/GraphVizProf.pm b/lib/Devel/GraphVizProf.pm index 41b9a91..78309c9 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.10'; +our $VERSION = '2.14'; package DB; diff --git a/lib/GraphViz.pm b/lib/GraphViz.pm index 1d70d5c..0377fb2 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.10'; +our $VERSION = '2.14'; =head1 NAME @@ -955,6 +955,12 @@ image map format file. print $g->as_imap; +=item as_vdx + +Returns a string which contains a VDX-format (Microsoft Visio) file. + + print $g->as_vdx; + =item as_vrml Returns a string which contains a layed-out VRML-format file. @@ -1021,7 +1027,7 @@ sub AUTOLOAD { } if ( $name - =~ /^as_(ps|hpgl|pcl|mif|pic|gd|gd2|gif|jpeg|png|wbmp|cmapx?|ismap|imap|vrml|vtx|mp|fig|svgz?|dot|canon|plain)$/ + =~ /^as_(ps|hpgl|pcl|mif|pic|gd|gd2|gif|jpeg|png|wbmp|cmapx?|ismap|imap|vdx|vrml|vtx|mp|fig|svgz?|dot|canon|plain)$/ ) { my $data = $self->_as_generic( '-T' . $1, $self->_as_debug, $output ); @@ -1294,6 +1300,32 @@ sub _attributes { } } +=head1 FAQ + +=head2 Why do I get error messages like the following? + + Error: <stdin>:1: syntax error near line 1 + context: digraph >>> Graph <<< { + +Graphviz reserves some words as keywords, meaning they can't be used as an ID, e.g. for the name of the graph. +So, don't do this: + + strict graph graph{...} + strict graph Graph{...} + strict graph strict{...} + etc... + +Likewise for non-strict graphs, and digraphs. You can however add double-quotes around such reserved words: + + strict graph "graph"{...} + +Even better, use a more meaningful name for your graph... + +The keywords are: node, edge, graph, digraph, subgraph and strict. Compass points are not keywords. + +See L<keywords|http://www.graphviz.org/content/dot-language> in the discussion of the syntax of DOT +for details. + =head1 NOTES Older versions of GraphViz used a slightly different syntax for node diff --git a/lib/GraphViz/Data/Grapher.pm b/lib/GraphViz/Data/Grapher.pm index 1acf2bc..81a662c 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.10'; +our $VERSION = '2.14'; =head1 NAME diff --git a/lib/GraphViz/No.pm b/lib/GraphViz/No.pm index 26f57fe..f46bb12 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.10'; +our $VERSION = '2.14'; =head1 NAME diff --git a/lib/GraphViz/Parse/RecDescent.pm b/lib/GraphViz/Parse/RecDescent.pm index 3a2d237..0e282eb 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.10'; +our $VERSION = '2.14'; =head1 NAME diff --git a/lib/GraphViz/Parse/Yacc.pm b/lib/GraphViz/Parse/Yacc.pm index 5485563..f693064 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.10'; +our $VERSION = '2.14'; =head1 NAME diff --git a/lib/GraphViz/Parse/Yapp.pm b/lib/GraphViz/Parse/Yapp.pm index 465e853..f962437 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.10'; +our $VERSION = '2.14'; =head1 NAME diff --git a/lib/GraphViz/Regex.pm b/lib/GraphViz/Regex.pm index 3c26271..f7d3f91 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.10'; +our $VERSION = '2.14'; my $DEBUG = 0; # whether debugging statements are shown diff --git a/lib/GraphViz/Small.pm b/lib/GraphViz/Small.pm index 71fff51..d83efd0 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.10'; +our $VERSION = '2.14'; =head1 NAME diff --git a/lib/GraphViz/XML.pm b/lib/GraphViz/XML.pm index a190d6a..9d5a66a 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.10'; +our $VERSION = '2.14'; =head1 NAME diff --git a/t/foo.t b/t/foo.t index 3288ba2..7e28c1e 100644 --- a/t/foo.t +++ b/t/foo.t @@ -83,8 +83,8 @@ sub check_result { my @result = @_; my $expect = <<'EOF'; -Expected something like: - +Expected something like (except for the line spacing :-(. Hence the join...): + digraph test { node [ label = "\N" ]; graph [bb= "0,0,66,38"]; @@ -92,11 +92,11 @@ digraph test { } EOF - # have to use regexes cause the output includes numbers that may - # change each time - like( $result[0], qr/^digraph test {/ ); - like( $result[1], qr/^\s+graph \[ratio=fill\];/ ); - like( $result[2], qr/^\s*node\s*\[\s*label\s*=\s*"\\N"\s*\];\s*/ ); - like( $result[3], qr/^\s*graph\s*\[bb=.*/ ); - like( $result[4], qr/^\s*node1\s*\[label=London.*\];/ ); + my($result) = join(' ', @result); + + like( $result, qr/digraph test {/ ); + like( $result, qr/\s*graph\s*\[bb=.*/ ); + like( $result, qr/.+ratio=fill/ ); + like( $result, qr/\s*node\s*\[\s*label\s*=\s*"\\N"\s*\];\s*/ ); + like( $result, qr/.+label=London,/ ); } -- 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 [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits
