commit webdot for openSUSE:Factory

Hello community, here is the log from the commit of package webdot for openSUSE:Factory checked in at 2013-01-02 13:02:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/webdot (Old) and /work/SRC/openSUSE:Factory/.webdot.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "webdot", Maintainer is "pth@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/webdot/webdot.changes 2011-09-23 12:50:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.webdot.new/webdot.changes 2013-01-02 13:02:04.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Dec 24 21:59:09 UTC 2012 - p.drouand@gmail.com + +- Update to 2.26 version: + * add support for "truecolor=1" in graphs + * aligned with graphviz-2.26 + +------------------------------------------------------------------- Old: ---- webdot-2.6.tar.bz2 New: ---- webdot-2.26.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ webdot.spec ++++++ --- /var/tmp/diff_new_pack.dp1zsL/_old 2013-01-02 13:02:05.000000000 +0100 +++ /var/tmp/diff_new_pack.dp1zsL/_new 2013-01-02 13:02:05.000000000 +0100 @@ -19,19 +19,23 @@ Name: webdot -BuildRequires: apache2-devel ghostscript-fonts-std ghostscript-library graphviz libapr-util1-devel perl-GD tcl-devel -%define _prefix /usr -Version: 2.6 -Release: 242 +BuildRequires: ghostscript-fonts-std +BuildRequires: apache2-devel +BuildRequires: ghostscript-library +BuildRequires: libapr-util1-devel +BuildRequires: perl-GD tcl-devel +BuildRequires: graphviz +Version: 2.26 +Release: 0 AutoReqProv: on -Requires: tcl graphviz http_daemon ghostscript +Requires: http_daemon +Requires: ghostscript Summary: A CGI graph server script that uses tcldot from graphviz Group: Productivity/Graphics/Visualization/Graph Source: http://www.graphviz.org/pub/graphviz/%{name}-%{version}.tar.bz2 Patch1: rpm-specifics.diff Url: http://www.graphviz.org/ License: BSD-3-Clause -Prefix: %{_prefix} BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: filesystem fileutils @@ -76,7 +80,7 @@ %files %defattr(-,root,root) -%doc COPYING README AUTHORS CHANGES INSTALL +%doc COPYING README AUTHORS CHANGES %attr(755,root,root) %{cgibindir}/webdot %attr(-,root,root) %{htmldir}/webdot/ %attr(700,%{apacheuser},%{apachegroup}) %{cachedir}/ ++++++ webdot-2.6.tar.bz2 -> webdot-2.26.tar.bz2 ++++++ ++++ 4932 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/webdot-2.6/CHANGES new/webdot-2.26/CHANGES --- old/webdot-2.6/CHANGES 2005-08-28 15:34:12.000000000 +0200 +++ new/webdot-2.26/CHANGES 2009-12-11 01:30:06.000000000 +0100 @@ -1,3 +1,10 @@ +Dec 10, 2009 - Release 2.26 (aligned with graphviz-2.26) +June 29, 2009 - Start 2.25 development series (aligned with graphviz-2.25) + - add support for "truecolor=1" in graphs +March 3, 2009 - Release 2.22 (aligned with graphviz-2.22) +November 9, 2007 - Release 2.16 (aligned with graphviz-2.16) +November 27, 2006 - Release 2.10 (aligned with graphviz-2.10) +February 3, 2006 - Release 2.8 (aligned with graphviz-2.8) August 28, 2005 - Release 2.6 (aligned with graphviz-2.6) July 20, 2005 - Release 2.4 (aligned with graphviz-2.4) - fixes for graphquest @@ -21,7 +28,7 @@ June 7, 2002 - Release 1.8.5 - allow encoded QUERY_STRINGS to be passed through to the graph server Specifically, "%3f" is required to represent the "?" - (non encoded QUERY_STRINGS are used to passed coordinates to + (non encoded QUERY_STRINGS are used to pass coordinates to server-side image maps.) - use <iframe> trick from http://richardinfo.com/svg/iframetest.html to avoid Mozilla-1.0 crash with SVG embedding diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/webdot-2.6/Makefile new/webdot-2.26/Makefile --- old/webdot-2.6/Makefile 2005-08-28 15:34:12.000000000 +0200 +++ new/webdot-2.26/Makefile 2009-12-11 01:30:06.000000000 +0100 @@ -33,12 +33,14 @@ LOCALHOSTONLY=1 # version number for webdot-*.tar.gz -VERSION=2.6 -TOP_DIR=/tmp/webdot-20050828.1247.cg-export -BUILD_DIR=/tmp/webdot-20050828.1247.cg-export +VERSION=2.26 +TOP_DIR=/home/gviz/tmp/gviz/webdot +BUILD_DIR=/home/gviz/tmp/gviz/webdot ############################################################### +.PHONY: all genfiles install uninstall distdir dist clean + all: genfiles genfiles: @@ -75,7 +77,7 @@ mkdir -p $(distdir)/cgi-bin $(distdir)/config $(distdir)/html.in mkdir -p $(distdir)/html/webdot/graphs/directed $(distdir)/html/webdot/graphs/undirected cp AUTHORS CHANGES COPYING INSTALL README $(distdir)/ - cp configure.in configure Makefile.in Makefile webdot.spec.in webdot.spec $(distdir)/ + cp configure.ac configure Makefile.in Makefile webdot.spec.in webdot.spec $(distdir)/ cp genindex.tcl linktut.tcl scaffold.tcl $(distdir)/ cp config/config.guess config/config.sub config/install-sh $(distdir)/config/ cp cgi-bin/webdot $(distdir)/cgi-bin/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/webdot-2.6/cgi-bin/webdot new/webdot-2.26/cgi-bin/webdot --- old/webdot-2.6/cgi-bin/webdot 2005-08-28 15:34:12.000000000 +0200 +++ new/webdot-2.26/cgi-bin/webdot 2009-12-11 01:30:06.000000000 +0100 @@ -8,10 +8,11 @@ ########################################################################### # configuration data # -# At the top of this file should be some installation dependent code like: +# At the top of this file, or overridden by values in a file name webdot.config, +# should be some installation dependent code like: # -# #!/usr/bin/tclsh8.3 -# set LIBTCLDOT /usr/lib/graphviz/libtcldot.so.0.0.0 +# #!/usr/bin/tclsh +# set LIBTCLDOT /usr/lib/graphviz/tcl/libtcldot.so # set CACHE_ROOT /var/cache/webdot # set GS /usr/bin/gs # set PS2EPSI /usr/bin/ps2epsi @@ -33,7 +34,7 @@ #} # signature that is hyperlinked to help -# comment out the next line if you do't want a signature +# comment out the next line if you don't want a signature set SIGNATURE "Graph by WebDot" # allow user to persistently modify configuration through rpm upgrades @@ -44,17 +45,17 @@ ########################################################################### # various data definitions - these should not require adjustment -# define the set of mime.types that we can convert graphs to +# define the set of MIME types that we can convert graphs to array set MIME { cmap "text/plain" cmapx "text/plain" - dot "text/x-graphviz" + dot "text/vnd.graphviz" epsi "application/postscript" fig "application/x-fig" gif "image/gif" gq "text/html" gqpng "image/png" - gv "application/x-graphviz" + gv "text/vnd.graphviz" hpgl "application/x-hpgl" html "text/html" imap "text/plain" @@ -67,7 +68,7 @@ pic "application/x-pic" png "image/png" ps "application/postscript" - ps2 "application/postscript" + ps2 "application/postscript" src "text/plain" svg "image/svg+xml" svgz "image/svg+xml" @@ -76,15 +77,14 @@ txt "text/plain" vrml "x-world/x-vrml" vtx "application/x-vtx" + xdot "text/vnd.graphviz" } # timeout for network operations (webdot::get_url) set TIMEOUT 5000 -# latest mtime of LIBTCLDOT and this script -set t1 [file mtime $LIBTCLDOT] -set t2 [file mtime $argv0] -set SELFMTIME [expr $t1>$t2?$t1:$t2] +# mtime of this script +set SELFMTIME [file mtime $argv0] # filename of webdot tclet preamble (capture here before any cd's) set TCLET [pwd]/webdot.tclet @@ -105,7 +105,7 @@ exit } -# propogate error to top +# propagate error to top proc error {m} { return -code error $m } @@ -146,6 +146,20 @@ } ########################################################################### +# webdot::load_tcldot +# +# for speed, try to load library directly if LIBTCLDOT was set +# +proc webdot::load_tcldot {} { + global LIBTCLDOT + if {! [info exists LIBTCLDOT] || [catch {load $LIBTCLDOT}]} { + if {[catch {package require Tcldot} err]} { + error $err + } + } +} + +########################################################################### # webdot::get_url # # get file from a url, using previously cached copy if still good @@ -154,7 +168,7 @@ # file_cache_dir directory in cache for the src and products # LastModified time string # Expires time string -# ContentType mime string +# ContentType MIME string # proc webdot::get_url {url no_cache} { global CACHE_ROOT TIMEOUT LOCALHOSTONLY env @@ -356,13 +370,9 @@ # webdot::read_graph # proc webdot::read_graph {src} { - global LIBTCLDOT - # we're going to need the Tcldot extension to process the graph if {! [string length [info command dotread]]} { - if {[catch {load $LIBTCLDOT} err]} { - error $err - } + webdot::load_tcldot } # read in source file from cache @@ -371,7 +381,7 @@ } fconfigure $f -encoding utf-8 if {[catch {dotread $f} g]} { - error "Invalid graph source: $g\nThere may be more details in the WebDot server's error_log,\nor check the graph file by running through dot (or neato or twopi or fdp or circo) locally." + error "Invalid graph source: $g\nThere may be more details in the WebDot server's error_log,\nor check the graph file by running through dot (or neato or twopi or fdp or sfdp or circo) locally." } close $f return $g @@ -391,7 +401,7 @@ error $res } foreach {file_cache_dir LastModified Expires ContentType} $res {break} - # some types (e.g. vrml) result in mutiple files, so cd to target directory + # some types (e.g. vrml) result in multiple files, so cd to target directory cd $file_cache_dir if {[catch {webdot::make_product $url $type $engine $viewport $no_cache} err]} { error $err @@ -425,7 +435,7 @@ error $res } foreach {file_cache_dir LastModified Expires ContentType} $res {break} - # some types (e.g. vrml) result in mutiple files, so cd to target directory + # some types (e.g. vrml) result in multiple files, so cd to target directory cd $file_cache_dir # generate svg if {[catch {webdot::make_product $url $type $engine $viewport $no_cache} err]} { @@ -598,10 +608,17 @@ if {[catch {$g layout [string tolower $engine]} err]} { error "Graph layout error: $err" } + if {[catch {$g queryattr truecolor} truecolor]} { + set truecolor 0 + } foreach {sizex sizey} [webdot::get_image_size $g] {break} - set gd [gd create $sizex $sizey] + if {$truecolor} { + set gd [gd createTrueColor $sizex $sizey] + } { + set gd [gd create $sizex $sizey] + } - # Antialising against transparent background doesn't work well + # Antialiasing against transparent background doesn't work well # if actual background is not near white. Need alpha channel. #set transparent [gd color new $gd 254 254 254] #gd color transparent $gd $transparent @@ -628,7 +645,7 @@ gd tile $gd [gd createFromGIF $bgf] } default { - error "unsupported mime type for background in=mage: $ContentType" + error "unsupported MIME type for background image: $ContentType" } } close $bgf @@ -669,7 +686,7 @@ } err]} { # try to output an error message if {! [string length [info command gd]]} { - # a bitmap is expected, but if that wom't work then a stderr message + # a bitmap is expected, but if that won't work then a stderr message error $err } # write the error message to a bitmap @@ -692,7 +709,7 @@ } close $f_out } - dot { + dot - xdot { set g [webdot::read_graph src] webdot::fix_graph_urls $g $serverport $dirname if {[catch {open $cachename w} f_out]} { @@ -701,7 +718,7 @@ if {[catch {$g layout [string tolower $engine]} err]} { error "Graph layout error: $err" } - $g write $f_out dot + $g write $f_out $type close $f_out $g delete } @@ -845,7 +862,7 @@ if {[string equal $Z {}]} { # initial zoom set Z 125 - # inital position with viewport centered over graph + # initial position with viewport centered over graph foreach {llx lly urx ury} [lindex [$g queryattributes bb] 0] {break} set x [expr {int($urx / 2)}] set y [expr {int($ury / 2)}] @@ -876,6 +893,7 @@ # write graphquest page with pan & zoom controls, map, and img reference puts $f_out "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\"> <html><head> + <title>GraphQuest</title> </head><body> @@ -936,6 +954,7 @@ puts "Content-Type: text/html\n <html> <head> + <title>WebDot Help Page</title> </head> @@ -944,7 +963,7 @@ webdot::make_client_map $url $type $engine $viewport 0 0 new - set all_engines {DOT NEATO TWOPI FDP CIRCO} + set all_engines {DOT NEATO TWOPI FDP SFDP CIRCO} set this_engine [string toupper $engine] set ix [lsearch $all_engines $this_engine] @@ -1046,9 +1065,7 @@ if {[string equal $path /blue.png] || [string equal $path /green.png]} { set png [string trim $path /] if {! [file exists $CACHE_ROOT/$png]} { - if {[catch {load $LIBTCLDOT} err]} { - error $err - } + webdot::load_tcldot # create blue.png and green.png for navigation and zoom bars set gd [gd create 10 10] set blue [gd color new $gd 0 0 255] @@ -1151,7 +1168,7 @@ } } -# nasty hack to workaround bugs in Apache/2.0.36 and later +# nasty hack to work around bugs in Apache/2.0.36 and later set wd [file tail $argv0] set s $env(SCRIPT_NAME) set SCRIPT_NAME [string range $s 0 [expr {[string first $wd $s]-1}]]$wd @@ -1211,7 +1228,7 @@ } foreach {file_cache_dir LastModified Expires ContentType} $res {break} -# some types (e.g. vrml) result in mutiple files, so cd to target directory +# some types (e.g. vrml) result in multiple files, so cd to target directory cd $file_cache_dir # deal with html pages containing tags @@ -1225,7 +1242,7 @@ || [string equal $ContentType $MIME(gv)] || [string equal $srctype gv] || [string equal $srctype dot])} { - toperror "Unrecognized mimetype for graph: $ContentType\nand unrecognized file extension: $srctype" + toperror "Unrecognized MIME type for graph: $ContentType\nand unrecognized file extension: $srctype" } # Support for client-side caching @@ -1288,7 +1305,7 @@ # send output header switch -- $type { - gv - dot - png - gif - jpeg - mif - ps - ps2 - epsi - pdf - hpgl - pic - pcl - vrml - vtx - fig - svg - svgz - src - imap - cmap - gq - gqpng { + gv - dot - xdot - png - gif - jpeg - mif - ps - ps2 - epsi - pdf - hpgl - pic - pcl - vrml - vtx - fig - svg - svgz - src - imap - cmap - gq - gqpng { puts [join $header \n] } tcl { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/webdot-2.6/configure.ac new/webdot-2.26/configure.ac --- old/webdot-2.6/configure.ac 1970-01-01 01:00:00.000000000 +0100 +++ new/webdot-2.26/configure.ac 2009-12-11 01:30:06.000000000 +0100 @@ -0,0 +1,34 @@ +# Process this file with autoconf to produce a configure script +AC_INIT(webdot, 2.26) +AC_CONFIG_SRCDIR([configure.ac]) +AC_CONFIG_AUX_DIR(config) + +# Checks for system type +AC_CANONICAL_TARGET + +AC_DEFINE_UNQUOTED(BUILDDATE,"`date -u`",[Date (usually date of extraction from CVS).]) +BUILDDATE="`date -u`" +AC_SUBST(BUILDDATE) + +AC_PREFIX_DEFAULT([/usr/local]) +if test "x${prefix}" = "xNONE"; then + prefix=${ac_default_prefix} + AC_SUBST(prefix) +fi + +# checks for programs +AC_PROG_INSTALL +AC_PROG_LN_S + +BUILD_DIR=`pwd` +cd ${srcdir} +TOP_DIR=`pwd` +cd ${BUILD_DIR} + +AC_SUBST(TOP_DIR) +AC_SUBST(BUILD_DIR) + +# Generate Makefiles +AC_OUTPUT(Makefile + webdot.spec + ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/webdot-2.6/configure.in new/webdot-2.26/configure.in --- old/webdot-2.6/configure.in 2005-08-28 15:34:12.000000000 +0200 +++ new/webdot-2.26/configure.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,34 +0,0 @@ -# Process this file with autoconf to produce a configure script -AC_INIT(webdot, 2.6) -AC_CONFIG_SRCDIR([configure.in]) -AC_CONFIG_AUX_DIR(config) - -# Checks for system type -AC_CANONICAL_TARGET - -AC_DEFINE_UNQUOTED(BUILDDATE,"`date -u`",[Date (usually date of extraction from CVS).]) -BUILDDATE="`date -u`" -AC_SUBST(BUILDDATE) - -AC_PREFIX_DEFAULT([/usr/local]) -if test "x${prefix}" = "xNONE"; then - prefix=${ac_default_prefix} - AC_SUBST(prefix) -fi - -# checks for programs -AC_PROG_INSTALL -AC_PROG_LN_S - -BUILD_DIR=`pwd` -cd ${srcdir} -TOP_DIR=`pwd` -cd ${BUILD_DIR} - -AC_SUBST(TOP_DIR) -AC_SUBST(BUILD_DIR) - -# Generate Makefiles -AC_OUTPUT(Makefile - webdot.spec - ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/webdot-2.6/html/webdot/a->c.html new/webdot-2.26/html/webdot/a->c.html --- old/webdot-2.6/html/webdot/a->c.html 2005-08-28 15:34:12.000000000 +0200 +++ new/webdot-2.26/html/webdot/a->c.html 1970-01-01 01:00:00.000000000 +0100 @@ -1,9 +0,0 @@ -<html> -<head> -<title>This is the page referenced from edge "a->c"</title> -<link rel="shortcut icon" href="/webdot/icon.png"> -</head> -<body bgcolor=white> -<h1>This is the page referenced from edge "a->c"</h1> -</body> -</html> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/webdot-2.6/html/webdot/a->d.html new/webdot-2.26/html/webdot/a->d.html --- old/webdot-2.6/html/webdot/a->d.html 2005-08-28 15:34:12.000000000 +0200 +++ new/webdot-2.26/html/webdot/a->d.html 1970-01-01 01:00:00.000000000 +0100 @@ -1,9 +0,0 @@ -<html> -<head> -<title>This is the page referenced from edge "a->d"</title> -<link rel="shortcut icon" href="/webdot/icon.png"> -</head> -<body bgcolor=white> -<h1>This is the page referenced from edge "a->d"</h1> -</body> -</html> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/webdot-2.6/html/webdot/b->d.html new/webdot-2.26/html/webdot/b->d.html --- old/webdot-2.6/html/webdot/b->d.html 2005-08-28 15:34:12.000000000 +0200 +++ new/webdot-2.26/html/webdot/b->d.html 1970-01-01 01:00:00.000000000 +0100 @@ -1,9 +0,0 @@ -<html> -<head> -<title>This is the page referenced from edge "b->d"</title> -<link rel="shortcut icon" href="/webdot/icon.png"> -</head> -<body bgcolor=white> -<h1>This is the page referenced from edge "b->d"</h1> -</body> -</html> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/webdot-2.6/html/webdot/basic.dot new/webdot-2.26/html/webdot/basic.dot --- old/webdot-2.6/html/webdot/basic.dot 2005-08-28 15:34:12.000000000 +0200 +++ new/webdot-2.26/html/webdot/basic.dot 2009-12-11 01:30:06.000000000 +0100 @@ -1,5 +1,5 @@ graph G { - a -- b -- c -- d - b -- e -- d + a -- b -- c -- d + b -- e -- d } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/webdot-2.6/html/webdot/basic.html new/webdot-2.26/html/webdot/basic.html --- old/webdot-2.6/html/webdot/basic.html 2005-08-28 15:34:12.000000000 +0200 +++ new/webdot-2.26/html/webdot/basic.html 2009-12-11 01:30:06.000000000 +0100 @@ -1,6 +1,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html> <head> +<meta name="robots" content="noindex,nofollow"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <link rel="shortcut icon" href="/webdot/icon.png"> <title>WebDot Tutorial: Basic graph creation</title> @@ -15,8 +16,8 @@ Given a description of a graph in the dot language, for example this graph: <table border="1"><tr><td><pre> graph G { - a -- b -- c -- d - b -- e -- d + a -- b -- c -- d + b -- e -- d } </pre></td></tr></table> in a file that can be served by your web server, in this case: @@ -44,7 +45,7 @@ </tr><tr> <td>.neato</td><td>The layout engine<br>(can be either: ".dot", ".neato", or ".twopi")</td> </tr><tr> -<td><b>.png</b></td><td>The output format<br>(other bitmap formats are: ".gif" and ".jpg")</td> +<td><b>.png</b></td><td>The output format<br>(other bitmap formats are: ".gif")</td> </tr></table> </body> </html> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/webdot-2.6/html/webdot/basicpublic.html new/webdot-2.26/html/webdot/basicpublic.html --- old/webdot-2.6/html/webdot/basicpublic.html 2005-08-28 15:34:12.000000000 +0200 +++ new/webdot-2.26/html/webdot/basicpublic.html 2009-12-11 01:30:06.000000000 +0100 @@ -1,6 +1,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html> <head> +<meta name="robots" content="noindex,nofollow"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <link rel="shortcut icon" href="/webdot/icon.png"> <title>WebDot Tutorial: Basic graph creation - public WebDot server</title> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/webdot-2.6/html/webdot/c->d.html new/webdot-2.26/html/webdot/c->d.html --- old/webdot-2.6/html/webdot/c->d.html 2005-08-28 15:34:12.000000000 +0200 +++ new/webdot-2.26/html/webdot/c->d.html 1970-01-01 01:00:00.000000000 +0100 @@ -1,9 +0,0 @@ -<html> -<head> -<title>This is the page referenced from edge "c->d"</title> -<link rel="shortcut icon" href="/webdot/icon.png"> -</head> -<body bgcolor=white> -<h1>This is the page referenced from edge "c->d"</h1> -</body> -</html> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/webdot-2.6/html/webdot/clientmap.dot new/webdot-2.26/html/webdot/clientmap.dot --- old/webdot-2.6/html/webdot/clientmap.dot 2005-08-28 15:34:12.000000000 +0200 +++ new/webdot-2.26/html/webdot/clientmap.dot 2009-12-11 01:30:06.000000000 +0100 @@ -1,5 +1,5 @@ graph G { - node [URL="\N.html" label="" tooltip="\N" width=0.3 height=0.3 style=filled fillcolor=lightblue pencolor=black] - a -- b -- c; b -- d; + node [URL="\N.html" label="" tooltip="\N" width=0.3 height=0.3 style=filled fillcolor=lightblue pencolor=black] + a -- b -- c; b -- d; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/webdot-2.6/html/webdot/clientmap.html new/webdot-2.26/html/webdot/clientmap.html --- old/webdot-2.6/html/webdot/clientmap.html 2005-08-28 15:34:12.000000000 +0200 +++ new/webdot-2.26/html/webdot/clientmap.html 2009-12-11 01:30:06.000000000 +0100 @@ -1,6 +1,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html> <head> +<meta name="robots" content="noindex,nofollow"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <link rel="shortcut icon" href="/webdot/icon.png"> <title>WebDot Tutorial: Client-side maps</title> @@ -19,8 +20,8 @@ For example, clientmap.dot contains: <table border="1"><tr><td><pre> graph G { - node [URL="\N.html" label="" tooltip="\N" width=0.3 height=0.3 style=filled fillcolor=lightblue pencolor=black] - a -- b -- c; b -- d; + node [URL="\N.html" label="" tooltip="\N" width=0.3 height=0.3 style=filled fillcolor=lightblue pencolor=black] + a -- b -- c; b -- d; } </pre></td></tr></table> and the source of this page contains (for the graph on the right): @@ -39,9 +40,9 @@ <area shape="rect" href="http://localhost/webdot/d.html" title="d" alt="" coords="135,7,164,36" target="new"> </map> <img src="/cgi-bin/webdot/http://localhost/cgi-bin/webdot/webdot/clientmap.dot.neato.png" - width="235" height="240" border="0" - usemap="#webdot0" - alt="Graph by WebDot"> + width="235" height="240" border="0" + usemap="#webdot0" + alt="Graph by WebDot"> </pre></td></tr></table> <p> The advantages of this mode of WebDot are the much simpler authoring and diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/webdot-2.6/html/webdot/graphquest.dot new/webdot-2.26/html/webdot/graphquest.dot --- old/webdot-2.6/html/webdot/graphquest.dot 2005-08-28 15:34:12.000000000 +0200 +++ new/webdot-2.26/html/webdot/graphquest.dot 2009-12-11 01:30:06.000000000 +0100 @@ -1,5 +1,5 @@ graph G { - node [URL="\N.html" target="new" label="" tooltip="Node \N" width=0.3 height=0.3 style=filled fillcolor=lightblue pencolor=black] - a -- b -- c -- d -- e; f -- g -- c -- h -- i; j -- k -- c; + node [URL="\N.html" target="new" label="" tooltip="Node \N" width=0.3 height=0.3 style=filled fillcolor=lightblue pencolor=black] + a -- b -- c -- d -- e; f -- g -- c -- h -- i; j -- k -- c; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/webdot-2.6/html/webdot/graphquest.html new/webdot-2.26/html/webdot/graphquest.html --- old/webdot-2.6/html/webdot/graphquest.html 2005-08-28 15:34:12.000000000 +0200 +++ new/webdot-2.26/html/webdot/graphquest.html 2009-12-11 01:30:06.000000000 +0100 @@ -1,6 +1,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html> <head> +<meta name="robots" content="noindex,nofollow"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <link rel="shortcut icon" href="/webdot/icon.png"> <title>WebDot Tutorial: GraphQuest - pan & zoom & client-side maps</title> @@ -26,8 +27,8 @@ For example, graphquest.dot contains: <table border="1"><tr><td><pre> graph G { - node [URL="\N.html" target="new" label="" tooltip="Node \N" width=0.3 height=0.3 style=filled fillcolor=lightblue pencolor=black] - a -- b -- c -- d -- e; f -- g -- c -- h -- i; j -- k -- c; + node [URL="\N.html" target="new" label="" tooltip="Node \N" width=0.3 height=0.3 style=filled fillcolor=lightblue pencolor=black] + a -- b -- c -- d -- e; f -- g -- c -- h -- i; j -- k -- c; } </pre></td></tr></table> and the source of this page contains (for the graph above): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/webdot-2.6/html/webdot/hedges.dot new/webdot-2.26/html/webdot/hedges.dot --- old/webdot-2.6/html/webdot/hedges.dot 2005-08-28 15:34:12.000000000 +0200 +++ new/webdot-2.26/html/webdot/hedges.dot 2009-12-11 01:30:06.000000000 +0100 @@ -1,7 +1,7 @@ digraph G { - graph [URL="default.html"] - node [URL="\N.html"] - a -> b -> c - a -> c [URL="\E.html", label="\E"] + graph [URL="default.html"] + node [URL="\N.html"] + a -> b -> c + a -> c [URL="\E.html", label="\E"] } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/webdot-2.6/html/webdot/hedges.html new/webdot-2.26/html/webdot/hedges.html --- old/webdot-2.6/html/webdot/hedges.html 2005-08-28 15:34:12.000000000 +0200 +++ new/webdot-2.26/html/webdot/hedges.html 2009-12-11 01:30:06.000000000 +0100 @@ -1,6 +1,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html> <head> +<meta name="robots" content="noindex,nofollow"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <link rel="shortcut icon" href="/webdot/icon.png"> <title>WebDot Tutorial: Clickable edges</title> @@ -21,10 +22,10 @@ URL is attached to it. <table border="1"><tr><td><pre> digraph G { - graph [URL="default.html"] - node [URL="\N.html"] - a -> b -> c - a -> c [URL="\E.html", label="\E"] + graph [URL="default.html"] + node [URL="\N.html"] + a -> b -> c + a -> c [URL="\E.html", label="\E"] } </pre></td></tr></table> <p> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/webdot-2.6/html/webdot/hnodes.dot new/webdot-2.26/html/webdot/hnodes.dot --- old/webdot-2.6/html/webdot/hnodes.dot 2005-08-28 15:34:12.000000000 +0200 +++ new/webdot-2.26/html/webdot/hnodes.dot 2009-12-11 01:30:06.000000000 +0100 @@ -1,9 +1,9 @@ digraph G { - graph [URL="default.html"] - a [URL="a.html"] - b [URL="b.html"] - c [URL="c.html"] - a -> b -> c - a -> c + graph [URL="default.html"] + a [URL="a.html"] + b [URL="b.html"] + c [URL="c.html"] + a -> b -> c + a -> c } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/webdot-2.6/html/webdot/hnodes.html new/webdot-2.26/html/webdot/hnodes.html --- old/webdot-2.6/html/webdot/hnodes.html 2005-08-28 15:34:12.000000000 +0200 +++ new/webdot-2.26/html/webdot/hnodes.html 2009-12-11 01:30:06.000000000 +0100 @@ -1,6 +1,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html> <head> +<meta name="robots" content="noindex,nofollow"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <link rel="shortcut icon" href="/webdot/icon.png"> <title>WebDot Tutorial: Clickable nodes</title> @@ -17,12 +18,12 @@ A graph can contain URLs so that the nodes and background are clickable, e.g.: <table border="1"><tr><td><pre> digraph G { - graph [URL="default.html"] - a [URL="a.html"] - b [URL="b.html"] - c [URL="c.html"] - a -> b -> c - a -> c + graph [URL="default.html"] + a [URL="a.html"] + b [URL="b.html"] + c [URL="c.html"] + a -> b -> c + a -> c } </pre></td></tr></table> <p> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/webdot-2.6/html/webdot/index.html new/webdot-2.26/html/webdot/index.html --- old/webdot-2.6/html/webdot/index.html 2005-08-28 15:34:12.000000000 +0200 +++ new/webdot-2.26/html/webdot/index.html 2009-12-11 01:30:06.000000000 +0100 @@ -1,5 +1,6 @@ <html> <head> +<meta name="robots" content="noindex,nofollow"> <title>WebDot Home Page</title> <link rel="shortcut icon" href="/webdot/icon.png"> </head> @@ -28,7 +29,7 @@ <h2>What does it need to run?</h2> WebDot requires: <a href="http://www.graphviz.org/">graphviz-tcl</a> and a web server (an httpd) such as <a href="http://httpd.apache.org/">Apache</a>. -WebDot has been developed and tested primarily on RedHat 7.x thuough Fedora systems. +WebDot has been developed and tested primarily on Fedora systems. <p> <table> <tr> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/webdot-2.6/html/webdot/svgembed.dot new/webdot-2.26/html/webdot/svgembed.dot --- old/webdot-2.6/html/webdot/svgembed.dot 2005-08-28 15:34:12.000000000 +0200 +++ new/webdot-2.26/html/webdot/svgembed.dot 2009-12-11 01:30:06.000000000 +0100 @@ -1,7 +1,7 @@ digraph G { - node [URL="\N.html"] - edge [URL="\E.html"] - a -> b -> c - a -> c + node [URL="\N.html"] + edge [URL="\E.html"] + a -> b -> c + a -> c } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/webdot-2.6/html/webdot/svgembed.html new/webdot-2.26/html/webdot/svgembed.html --- old/webdot-2.6/html/webdot/svgembed.html 2005-08-28 15:34:12.000000000 +0200 +++ new/webdot-2.26/html/webdot/svgembed.html 2009-12-11 01:30:06.000000000 +0100 @@ -1,6 +1,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html> <head> +<meta name="robots" content="noindex,nofollow"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <link rel="shortcut icon" href="/webdot/icon.png"> <title>WebDot Tutorial: Embedded SVG graph</title> @@ -29,10 +30,10 @@ For example this graph: <table border="1"><tr><td><pre> digraph G { - node [URL="\N.html"] - edge [URL="\E.html"] - a -> b -> c - a -> c + node [URL="\N.html"] + edge [URL="\E.html"] + a -> b -> c + a -> c } </pre></td></tr></table> <p> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/webdot-2.6/html/webdot/svginline.dot new/webdot-2.26/html/webdot/svginline.dot --- old/webdot-2.6/html/webdot/svginline.dot 2005-08-28 15:34:12.000000000 +0200 +++ new/webdot-2.26/html/webdot/svginline.dot 2009-12-11 01:30:06.000000000 +0100 @@ -1,5 +1,5 @@ graph G { - node [URL="/webdot/\N.html"] - a -- b -- c; b -- d; + node [URL="/webdot/\N.html"] + a -- b -- c; b -- d; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/webdot-2.6/html/webdot/svginline.html new/webdot-2.26/html/webdot/svginline.html --- old/webdot-2.6/html/webdot/svginline.html 2005-08-28 15:34:12.000000000 +0200 +++ new/webdot-2.26/html/webdot/svginline.html 2009-12-11 01:30:06.000000000 +0100 @@ -1,6 +1,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html> <head> +<meta name="robots" content="noindex,nofollow"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <link rel="shortcut icon" href="/webdot/icon.png"> <title>WebDot Tutorial: Inline SVG graphs</title> @@ -19,8 +20,8 @@ For example, svginline.dot contains: <table border="1"><tr><td><pre> graph G { - node [URL="/webdot/\N.html"] - a -- b -- c; b -- d; + node [URL="/webdot/\N.html"] + a -- b -- c; b -- d; } </pre></td></tr></table> and the source of this page contains: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/webdot-2.6/html/webdot/tclembed.dot new/webdot-2.26/html/webdot/tclembed.dot --- old/webdot-2.6/html/webdot/tclembed.dot 2005-08-28 15:34:12.000000000 +0200 +++ new/webdot-2.26/html/webdot/tclembed.dot 2009-12-11 01:30:06.000000000 +0100 @@ -1,6 +1,6 @@ digraph G { - node [URL="\N.html"] - edge [URL="\E.html"] - {a b c} -> d + node [URL="\N.html"] + edge [URL="\E.html"] + {a b c} -> d } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/webdot-2.6/html/webdot/tclembed.html new/webdot-2.26/html/webdot/tclembed.html --- old/webdot-2.6/html/webdot/tclembed.html 2005-08-28 15:34:12.000000000 +0200 +++ new/webdot-2.26/html/webdot/tclembed.html 2009-12-11 01:30:06.000000000 +0100 @@ -1,6 +1,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html> <head> +<meta name="robots" content="noindex,nofollow"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <link rel="shortcut icon" href="/webdot/icon.png"> <title>WebDot Tutorial: Graphs in Tclets</title> @@ -17,9 +18,9 @@ For example, tclembed.dot contains: <table border="1"><tr><td><pre> digraph G { - node [URL="\N.html"] - edge [URL="\E.html"] - {a b c} -> d + node [URL="\N.html"] + edge [URL="\E.html"] + {a b c} -> d } </pre></td></tr></table> and the source of this page contains (for the Tclet which should be displayed below): @@ -31,7 +32,7 @@ tag is replaced by: <table border="1"><tr><td><pre> <embed src="/cgi-bin/webdot/http://127.0.0.1/cgi-bin/webdot/webdot/tclembed.dot.neato.tcl" - width="600" height="400"> + width="600" height="400"> Graph in Tclet </embed> </pre></td></tr></table> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/webdot-2.6/html.in/basic.dot.in new/webdot-2.26/html.in/basic.dot.in --- old/webdot-2.6/html.in/basic.dot.in 2005-08-28 15:34:12.000000000 +0200 +++ new/webdot-2.26/html.in/basic.dot.in 2009-12-11 01:30:06.000000000 +0100 @@ -1,4 +1,4 @@ graph G { - a -- b -- c -- d - b -- e -- d + a -- b -- c -- d + b -- e -- d } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/webdot-2.6/html.in/basic.html.in new/webdot-2.26/html.in/basic.html.in --- old/webdot-2.6/html.in/basic.html.in 2005-08-28 15:34:12.000000000 +0200 +++ new/webdot-2.26/html.in/basic.html.in 2009-12-11 01:30:06.000000000 +0100 @@ -28,5 +28,5 @@ </tr><tr> <td>.neato</td><td>The layout engine<br>(can be either: ".dot", ".neato", or ".twopi")</td> </tr><tr> -<td><b>.png</b></td><td>The output format<br>(other bitmap formats are: ".gif" and ".jpg")</td> +<td><b>.png</b></td><td>The output format<br>(other bitmap formats are: ".gif")</td> </tr></table> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/webdot-2.6/html.in/clientmap.dot.in new/webdot-2.26/html.in/clientmap.dot.in --- old/webdot-2.6/html.in/clientmap.dot.in 2005-08-28 15:34:12.000000000 +0200 +++ new/webdot-2.26/html.in/clientmap.dot.in 2009-12-11 01:30:06.000000000 +0100 @@ -1,4 +1,4 @@ graph G { - node [URL="\N.html" label="" tooltip="\N" width=0.3 height=0.3 style=filled fillcolor=lightblue pencolor=black] - a -- b -- c; b -- d; + node [URL="\N.html" label="" tooltip="\N" width=0.3 height=0.3 style=filled fillcolor=lightblue pencolor=black] + a -- b -- c; b -- d; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/webdot-2.6/html.in/clientmap.html.in new/webdot-2.26/html.in/clientmap.html.in --- old/webdot-2.6/html.in/clientmap.html.in 2005-08-28 15:34:12.000000000 +0200 +++ new/webdot-2.26/html.in/clientmap.html.in 2009-12-11 01:30:06.000000000 +0100 @@ -23,9 +23,9 @@ <area shape="rect" href="http://localhost/webdot/d.html" title="d" alt="" coords="135,7,164,36" target="new"> </map> <img src="/cgi-bin/webdot/http://localhost/cgi-bin/webdot/webdot/clientmap.dot.neato.png" - width="235" height="240" border="0" - usemap="#webdot0" - alt="Graph by WebDot"> + width="235" height="240" border="0" + usemap="#webdot0" + alt="Graph by WebDot"> </pre></td></tr></table> <p> The advantages of this mode of WebDot are the much simpler authoring and diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/webdot-2.6/html.in/graphquest.dot.in new/webdot-2.26/html.in/graphquest.dot.in --- old/webdot-2.6/html.in/graphquest.dot.in 2005-08-28 15:34:12.000000000 +0200 +++ new/webdot-2.26/html.in/graphquest.dot.in 2009-12-11 01:30:06.000000000 +0100 @@ -1,4 +1,4 @@ graph G { - node [URL="\N.html" target="new" label="" tooltip="Node \N" width=0.3 height=0.3 style=filled fillcolor=lightblue pencolor=black] - a -- b -- c -- d -- e; f -- g -- c -- h -- i; j -- k -- c; + node [URL="\N.html" target="new" label="" tooltip="Node \N" width=0.3 height=0.3 style=filled fillcolor=lightblue pencolor=black] + a -- b -- c -- d -- e; f -- g -- c -- h -- i; j -- k -- c; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/webdot-2.6/html.in/hedges.dot.in new/webdot-2.26/html.in/hedges.dot.in --- old/webdot-2.6/html.in/hedges.dot.in 2005-08-28 15:34:12.000000000 +0200 +++ new/webdot-2.26/html.in/hedges.dot.in 2009-12-11 01:30:06.000000000 +0100 @@ -1,6 +1,6 @@ digraph G { - graph [URL="default.html"] - node [URL="\N.html"] - a -> b -> c - a -> c [URL="\E.html", label="\E"] + graph [URL="default.html"] + node [URL="\N.html"] + a -> b -> c + a -> c [URL="\E.html", label="\E"] } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/webdot-2.6/html.in/hnodes.dot.in new/webdot-2.26/html.in/hnodes.dot.in --- old/webdot-2.6/html.in/hnodes.dot.in 2005-08-28 15:34:12.000000000 +0200 +++ new/webdot-2.26/html.in/hnodes.dot.in 2009-12-11 01:30:06.000000000 +0100 @@ -1,8 +1,8 @@ digraph G { - graph [URL="default.html"] - a [URL="a.html"] - b [URL="b.html"] - c [URL="c.html"] - a -> b -> c - a -> c + graph [URL="default.html"] + a [URL="a.html"] + b [URL="b.html"] + c [URL="c.html"] + a -> b -> c + a -> c } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/webdot-2.6/html.in/index.html.in new/webdot-2.26/html.in/index.html.in --- old/webdot-2.6/html.in/index.html.in 2005-08-28 15:34:12.000000000 +0200 +++ new/webdot-2.26/html.in/index.html.in 2009-12-11 01:30:06.000000000 +0100 @@ -1,5 +1,6 @@ <html> <head> +<meta name="robots" content="noindex,nofollow"> <title>WebDot Home Page</title> <link rel="shortcut icon" href="$HTMLBASE/icon.png"> </head> @@ -28,7 +29,7 @@ <h2>What does it need to run?</h2> WebDot requires: <a href="http://www.graphviz.org/">graphviz-tcl</a> and a web server (an httpd) such as <a href="http://httpd.apache.org/">Apache</a>. -WebDot has been developed and tested primarily on RedHat 7.x thuough Fedora systems. +WebDot has been developed and tested primarily on Fedora systems. <p> <table> <tr> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/webdot-2.6/html.in/svgembed.dot.in new/webdot-2.26/html.in/svgembed.dot.in --- old/webdot-2.6/html.in/svgembed.dot.in 2005-08-28 15:34:12.000000000 +0200 +++ new/webdot-2.26/html.in/svgembed.dot.in 2009-12-11 01:30:06.000000000 +0100 @@ -1,6 +1,6 @@ digraph G { - node [URL="\N.html"] - edge [URL="\E.html"] - a -> b -> c - a -> c + node [URL="\N.html"] + edge [URL="\E.html"] + a -> b -> c + a -> c } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/webdot-2.6/html.in/svginline.dot.in new/webdot-2.26/html.in/svginline.dot.in --- old/webdot-2.6/html.in/svginline.dot.in 2005-08-28 15:34:12.000000000 +0200 +++ new/webdot-2.26/html.in/svginline.dot.in 2009-12-11 01:30:06.000000000 +0100 @@ -1,4 +1,4 @@ graph G { - node [URL="$HTMLBASE/\N.html"] - a -- b -- c; b -- d; + node [URL="$HTMLBASE/\N.html"] + a -- b -- c; b -- d; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/webdot-2.6/html.in/tclembed.dot.in new/webdot-2.26/html.in/tclembed.dot.in --- old/webdot-2.6/html.in/tclembed.dot.in 2005-08-28 15:34:12.000000000 +0200 +++ new/webdot-2.26/html.in/tclembed.dot.in 2009-12-11 01:30:06.000000000 +0100 @@ -1,5 +1,5 @@ digraph G { - node [URL="\N.html"] - edge [URL="\E.html"] - {a b c} -> d + node [URL="\N.html"] + edge [URL="\E.html"] + {a b c} -> d } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/webdot-2.6/html.in/tclembed.html.in new/webdot-2.26/html.in/tclembed.html.in --- old/webdot-2.6/html.in/tclembed.html.in 2005-08-28 15:34:12.000000000 +0200 +++ new/webdot-2.26/html.in/tclembed.html.in 2009-12-11 01:30:06.000000000 +0100 @@ -14,7 +14,7 @@ tag is replaced by: <table border="1"><tr><td><pre> <embed src="$CGIBASE/http://127.0.0.1$BASE/$SELF.dot.neato.tcl" - width="600" height="400"> + width="600" height="400"> Graph in Tclet </embed> </pre></td></tr></table> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/webdot-2.6/linktut.tcl new/webdot-2.26/linktut.tcl --- old/webdot-2.6/linktut.tcl 2005-08-28 15:34:12.000000000 +0200 +++ new/webdot-2.26/linktut.tcl 2009-12-11 01:30:06.000000000 +0100 @@ -27,6 +27,7 @@ set header {<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html> <head> +<meta name="robots" content="noindex,nofollow"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <link rel="shortcut icon" href="$HTMLBASE/icon.png"> <title>WebDot Tutorial: $TITLE</title> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/webdot-2.6/webdot.spec new/webdot-2.26/webdot.spec --- old/webdot-2.6/webdot.spec 2005-08-28 15:34:12.000000000 +0200 +++ new/webdot-2.26/webdot.spec 2009-12-11 01:30:06.000000000 +0100 @@ -1,13 +1,19 @@ # webdot.spec. Generated from webdot.spec.in by configure. Name: webdot -Version: 2.6 -Release: 1 +Summary: A CGI graph server script that uses tcldot from graphviz-tcl. +Version: 2.26 + +%define truerelease 1 +%{?distroagnostic: %define release %{truerelease}} +%{!?distroagnostic: %define release %{truerelease}%{?dist}} + +Release: %{?release} + Group: Applications/Graphics License: BSD-style URL: http://www.graphviz.org/ -Summary: A CGI graph server script that uses tcldot from graphviz-tcl. -Requires: graphviz-tcl >= 2.3 ghostscript tcl >= 8.4 httpd +Requires: graphviz-tcl >= 2.9 graphviz-gd ghostscript tcl >= 8.4 httpd Source: http://www.graphviz.org/pub/graphviz/%{name}-%{version}.tar.gz BuildArchitectures: noarch BuildRoot: %{_tmppath}/%{name}-root @@ -29,7 +35,7 @@ %define cachedir /var/cache/webdot %define tclshbin %(rpm -ql tcl | grep '/tclsh$') -%define tcldotlib %(rpm -ql graphviz-tcl | grep '/libtcldot.so.0.0.0$') +%define libtcldot %(rpm -ql graphviz-tcl | grep '/libtcldot.so.0.0.0$') %define gsbin %(which gs) %define ps2epsibin %(which ps2epsi) @@ -51,10 +57,10 @@ %post cat > %{cgibindir}/webdot.new << '__EOF__' #!%{tclshbin} -set LIBTCLDOT %{tcldotlib} -set CACHE_ROOT %{cachedir} -set GS %{gsbin} -set PS2EPSI %{ps2epsibin} +set LIBTCLDOT "%{libtcldot}" +set CACHE_ROOT "%{cachedir}" +set GS "%{gsbin}" +set PS2EPSI "%{ps2epsibin}" set LOCALHOSTONLY 1 __EOF__ cat %{cgibindir}/webdot >> %{cgibindir}/webdot.new diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/webdot-2.6/webdot.spec.in new/webdot-2.26/webdot.spec.in --- old/webdot-2.6/webdot.spec.in 2005-08-28 15:34:12.000000000 +0200 +++ new/webdot-2.26/webdot.spec.in 2009-12-11 01:30:06.000000000 +0100 @@ -1,13 +1,19 @@ # @configure_input@ Name: webdot +Summary: A CGI graph server script that uses tcldot from graphviz-tcl. Version: @PACKAGE_VERSION@ -Release: 1 + +%define truerelease 1 +%{?distroagnostic: %define release %{truerelease}} +%{!?distroagnostic: %define release %{truerelease}%{?dist}} + +Release: %{?release} + Group: Applications/Graphics License: BSD-style URL: http://www.graphviz.org/ -Summary: A CGI graph server script that uses tcldot from graphviz-tcl. -Requires: graphviz-tcl >= 2.3 ghostscript tcl >= 8.4 httpd +Requires: graphviz-tcl >= 2.9 graphviz-gd ghostscript tcl >= 8.4 httpd Source: http://www.graphviz.org/pub/graphviz/%{name}-%{version}.tar.gz BuildArchitectures: noarch BuildRoot: %{_tmppath}/%{name}-root @@ -29,7 +35,7 @@ %define cachedir /var/cache/webdot %define tclshbin %(rpm -ql tcl | grep '/tclsh$') -%define tcldotlib %(rpm -ql graphviz-tcl | grep '/libtcldot.so.0.0.0$') +%define libtcldot %(rpm -ql graphviz-tcl | grep '/libtcldot.so.0.0.0$') %define gsbin %(which gs) %define ps2epsibin %(which ps2epsi) @@ -51,10 +57,10 @@ %post cat > %{cgibindir}/webdot.new << '__EOF__' #!%{tclshbin} -set LIBTCLDOT %{tcldotlib} -set CACHE_ROOT %{cachedir} -set GS %{gsbin} -set PS2EPSI %{ps2epsibin} +set LIBTCLDOT "%{libtcldot}" +set CACHE_ROOT "%{cachedir}" +set GS "%{gsbin}" +set PS2EPSI "%{ps2epsibin}" set LOCALHOSTONLY 1 __EOF__ cat %{cgibindir}/webdot >> %{cgibindir}/webdot.new -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org