1 --- libphp-jpgraph-1.5.2.orig/debian/changelog
2 +++ libphp-jpgraph-1.5.2/debian/changelog
4 +libphp-jpgraph (1.5.2-12) unstable; urgency=low
6 + * Add support for free LIBERATION fonts
7 + and depends on ttf-liberation (Thanks to Alain Peyrat) or non free
8 + alternate ttf-mscorefonts-installer (Closes: #490037)
9 + * Claim support for php5 and remove php4 depends in control
10 + file (Closes: #524172)
11 + * Changed section from web to php
13 + -- Christian Bayle <bayle@debian.org> Sun, 26 Apr 2009 23:46:16 +0200
15 +libphp-jpgraph (1.5.2-11+u1) unstable; urgency=low
17 + * Non-maintainer upload.
18 + * Applied patch that prevented PHP5 compile time generated warning
19 + "Non-static method called statically" to appear on screen and corrupts
20 + the output of graphics. The usual error_reporting and display_errors
21 + had no effect as a custom error handler was installed by the library.
24 + -- Christian Hammers <ch@debian.org> Sat, 10 Jan 2009 00:10:30 +0100
26 +libphp-jpgraph (1.5.2-11) unstable; urgency=low
28 + * Added support for php5(-gd), reviewed all example that seems to work
29 + (Closes: #424795) affected by php4-removal
31 + -- Christian Bayle <bayle@debian.org> Wed, 23 May 2007 01:24:50 +0200
33 +libphp-jpgraph (1.5.2-10.1) unstable; urgency=low
35 + * Non-Maintainer upload with maintainer consent.
37 + * Apply patch to make $gd2 global really global (Closes: #354637).
39 + * Bring out-of-sync debhelper version in sync to level 5.
40 + * Install upstream Changelog.
41 + * Update FSF address in debian/copyright.
42 + * Checked for policy version 3.7.2.
44 + -- Thijs Kinkhorst <thijs@debian.org> Wed, 5 Jul 2006 16:51:18 +0200
46 +libphp-jpgraph (1.5.2-10) unstable; urgency=low
48 + * msttcorefonts dir changed (in package msttcorefonts)
49 + from /usr/share/fonts/truetype/ to /usr/share/fonts/truetype/msttcorefonts/
52 + -- Christian Bayle <bayle@debian.org> Thu, 7 Oct 2004 21:24:42 +0200
54 +libphp-jpgraph (1.5.2-9) unstable; urgency=low
56 + * Applied a patch proposed by Guillaume Smet that add a fake
57 + SetMargin method and a doing nothing ExplodeSlice method, to make this
58 + make work better with gforge package.
59 + * Finnaly commented the fake SetMargin
61 + -- Christian Bayle <bayle@debian.org> Mon, 13 Sep 2004 22:34:42 +0200
63 +libphp-jpgraph (1.5.2-8) unstable; urgency=low
65 + * Changed dependancy on php4-gd2 with php4-gd (Closes: #257999)
66 + * I explain in copyright file why I don't upgrade to new QPLed + non
67 + commercial use clause upstream version, this is not DFSG compliant (Closes: #258104)
69 + -- Christian Bayle <bayle@debian.org> Wed, 1 Sep 2004 22:58:59 +0200
71 +libphp-jpgraph (1.5.2-7) unstable; urgency=low
73 + * Added alternate depend on libapache2-mod-php4 to support apache2
76 + -- Christian Bayle <bayle@debian.org> Fri, 25 Jun 2004 09:52:29 +0200
78 +libphp-jpgraph (1.5.2-6) stable; urgency=low
82 + -- Christian Bayle <bayle@debian.org> Thu, 15 Apr 2004 11:22:26 +0200
84 +libphp-jpgraph (1.5.2-5) unstable; urgency=low
86 + * Changed dependancy on php4-gd for php4-gd2
87 + * Changed density in jpgraph_gantt.php as suggested by Joseph Miller (joff)
89 + -- Christian Bayle <bayle@debian.org> Thu, 15 Apr 2004 11:20:58 +0200
91 +libphp-jpgraph (1.5.2-4) stable; urgency=low
95 + -- Christian Bayle <bayle@debian.org> Sat, 27 Mar 2004 17:45:25 +0100
97 +libphp-jpgraph (1.5.2-3) unstable; urgency=low
99 + * New First upload (closes #173601) ITP
100 + * This package was released by Luis Bustamante <luferbu@debian.org>
101 + * Luis who allowed me to upload the package will maintain the package
102 + when he will have more time to work on it.
103 + * For some licensing reason it was probably rejected
104 + * This is the packaging of and older GPLed release
105 + * I changed cache and ttf path in ./src/jpgraph_dir.php
106 + * I disabled caching in ./src/jpgraph.php
107 + * I corrected imagefilledelipse broken function
108 + * I corrected path in examples
109 + * I corrected font names
110 + * I added gantt->SetMargin function needed by gforge package
112 + -- Christian Bayle <bayle@debian.org> Thu, 19 Feb 2004 23:50:14 +0100
114 --- libphp-jpgraph-1.5.2.orig/debian/libphp-jpgraph.dirs
115 +++ libphp-jpgraph-1.5.2/debian/libphp-jpgraph.dirs
120 --- libphp-jpgraph-1.5.2.orig/debian/compat
121 +++ libphp-jpgraph-1.5.2/debian/compat
124 --- libphp-jpgraph-1.5.2.orig/debian/copyright
125 +++ libphp-jpgraph-1.5.2/debian/copyright
127 +This package was debianized by Luis Bustamante <luferbu@fluidsignal.com> on
128 +Thu, 19 Dec 2002 13:48:02 -0500.
129 +For licensing reasons only GPLed 1.5.2 is now packaged by Christian Bayle
132 +To be clear for those that would ask why I don't upload the new 1.17 QPLed
133 +version. You can read on the home page:
135 +"JpGraph is released under a dual license. QPL 1.0 (Qt Free Licensee) For
136 +non-commercial, open-source and educational use and JpGraph Professional
137 +License for commercial use."
138 +This is not compliant with DFSG #6
139 +"The license must not restrict anyone from making use of the program in a
140 +specific field of endeavor. For example, it may not restrict the program from
141 +being used in a business, or from being used for genetic research."
143 +It was downloaded from:
144 +http://www.aditus.nu/jpgraph/downloads/jpgraph-1.5.2.tar.gz
146 +Upstream Author: Johan Persson <jpgraph@aditus.nu>
147 +Copyright (C) 2001 Johan Persson
150 + This program is free software; you can redistribute it and/or modify
151 + it under the terms of the GNU General Public License as published by
152 + the Free Software Foundation; either version 2 of the License, or
153 + (at your option) any later version.
155 + This program is distributed in the hope that it will be useful,
156 + but WITHOUT ANY WARRANTY; without even the implied warranty of
157 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
158 + GNU General Public License for more details.
160 + You should have received a copy of the GNU General Public License with
161 + the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL-2;
162 + if not, write to the Free Software Foundation, Inc., 51 Franklin Street,
163 + Fifth Floor, Boston, MA 02110-1301, USA
164 --- libphp-jpgraph-1.5.2.orig/debian/rules
165 +++ libphp-jpgraph-1.5.2/debian/rules
168 +# rules for libphp-jpgraph package
169 +# by Luis Bustamante (luferbu@fluidsignal.com)
185 +binary: binary-indep
187 +binary-arch: install
189 +binary-indep: install
193 + dh_installexamples -plibphp-jpgraph-examples src/Examples/*
194 + chmod 644 $(CURDIR)/debian/libphp-jpgraph-examples/usr/share/doc/libphp-jpgraph-examples/examples/*
195 + dh_installchangelogs src/Changelog
201 --- libphp-jpgraph-1.5.2.orig/debian/install
202 +++ libphp-jpgraph-1.5.2/debian/install
204 +src/*.php /usr/share/jpgraph
205 --- libphp-jpgraph-1.5.2.orig/debian/libphp-jpgraph.docs
206 +++ libphp-jpgraph-1.5.2/debian/libphp-jpgraph.docs
209 --- libphp-jpgraph-1.5.2.orig/debian/control
210 +++ libphp-jpgraph-1.5.2/debian/control
212 +Source: libphp-jpgraph
215 +Maintainer: Christian Bayle <bayle@debian.org>
216 +Build-Depends: debhelper (>= 5)
217 +Standards-Version: 3.8.1.0
219 +Package: libphp-jpgraph
221 +Depends: libapache2-mod-php5 | php5 | php5-cgi, php5-gd, ttf-liberation | ttf-mscorefonts-installer
222 +Description: Object oriented graph library for php5
223 + JpGraph is an object oriented class library for php5. JpGraph makes
224 + it easy to draw both "quick and dirty" graphs with a minimum of code
225 + and complex professional graphs which requires a very fine grain
226 + control. JpGraph is equally well suited for both scientific and
227 + business type of graphs. Though claimed as non php5 works perfectly
228 + for all samples with php5. This is the last GPLed version,
229 + more recent version are non DFSG complianti (See copyright file).
231 +Package: libphp-jpgraph-examples
233 +Depends: libphp-jpgraph
234 +Description: Object oriented graph library for php5 (examples)
235 + JpGraph is an object oriented class library for php5. JpGraph makes
236 + it easy to draw both "quick and dirty" graphs with a minimum of code
237 + and complex professional graphs which requires a very fine grain
238 + control. JpGraph is equally well suited for both scientific and
239 + business type of graphs. Though claimed as non php5 works perfectly
240 + for all samples with php5. This is the last GPLed version,
241 + more recent version are non DFSG complianti (See copyright file).
243 + This package contains examples for using JpGraph library.
245 --- libphp-jpgraph-1.5.2.orig/src/jpgraph_gantt.php
246 +++ libphp-jpgraph-1.5.2/src/jpgraph_gantt.php
247 @@ -1157,9 +1157,9 @@
248 $this->iCaptionMargin=$aMarg;
251 - function GetLineNbr() {
254 +// function GetLineNbr() {
258 function GetAbsHeight($aImg) {
260 @@ -1189,7 +1189,7 @@
261 $this->iProgress = $aProg;
264 - function SetPattern($aPattern,$aColor="blue",$aDensity=98) {
265 + function SetPattern($aPattern,$aColor="blue",$aDensity=100) {
266 $this->iPattern = $aPattern;
267 $this->iColor = $aColor;
268 $this->iDensity = $aDensity;
269 --- libphp-jpgraph-1.5.2.orig/src/jpgraph_dir.php
270 +++ libphp-jpgraph-1.5.2/src/jpgraph_dir.php
272 //------------------------------------------------------------------
273 // The full absolute name of directory to be used as a cache. This directory MUST
274 // be readable and writable for PHP. Must end with '/'
275 -DEFINE("CACHE_DIR","/tmp/jpgraph_cache/");
276 +DEFINE("CACHE_DIR","/var/cache/jpgraph/");
278 // The URL relative name where the cache can be found, i.e
279 // under what HTTP directory can the cache be found. Normally
281 DEFINE("APACHE_CACHE_DIR","/jpgraph_cache/");
283 // Directory for TTF fonts. Must end with '/'
284 -DEFINE("TTF_DIR","/usr/local/fonts/ttf/");
285 +DEFINE("TTF_DIR","/usr/share/fonts/truetype/msttcorefonts/");
287 +// Add Free liberation font as suggested by Alain Peyrat
288 +DEFINE("LIBERATION_DIR","/usr/share/fonts/truetype/ttf-liberation/");
291 --- libphp-jpgraph-1.5.2.orig/src/jpgraph.php
292 +++ libphp-jpgraph-1.5.2/src/jpgraph.php
294 // regenerate the image. Note that even if reading the cache is
295 // disabled the cached will still be updated with the newly generated
296 // image. Set also "USE_CACHE" below.
297 -DEFINE("READ_CACHE",true);
298 +//DEFINE("READ_CACHE",true);
299 +DEFINE("READ_CACHE",false);
301 // Should the cache be used at all? By setting this to false no
302 // files will be generated in the cache directory.
304 // false will still create the image in the cache directory
305 // just not use it. By setting USE_CACHE=false no files will even
306 // be generated in the cache directory.
307 -DEFINE("USE_CACHE",true);
308 +//DEFINE("USE_CACHE",true);
309 +DEFINE("USE_CACHE",false);
311 // If the color palette is full should JpGraph try to allocate
312 // the closest match? If you plan on using background image or
314 DEFINE("FF_COMIC",14);
315 DEFINE("FF_ARIAL",15);
316 DEFINE("FF_BOOK",16);
317 +DEFINE("FF_LIBERATION_SANS",17);
320 DEFINE("FS_NORMAL",1);
321 @@ -244,18 +247,20 @@
324 if( isset($GLOBALS['php_errormsg']) ) {
325 - JpGraphError::Raise("<b>General PHP error:</b><br>".$GLOBALS['php_errormsg']);
326 + // Disabled by Debian to prevent showing PHP5 warnings
327 + // ("Non-static method called statically")
328 + // JpGraphError::Raise("<b>General PHP error:</b><br>".$GLOBALS['php_errormsg']);
332 // Check what version of the GD library is being used
334 if(function_exists('imagecopyresampled') ) {
336 + $GLOBALS['gd2'] = true;
337 $copyfunc = "imagecopyresampled";
338 } elseif(function_exists('imagecopyresized')) {
339 $copyfunc = "imagecopyresized";
341 + $GLOBALS['gd2'] = false;
344 JpGraphError::Raise("<b>JpGraph Error:</b> Your PHP installation does not
345 @@ -280,10 +285,10 @@
347 elseif( $supported & IMG_JPG )
349 - if( !isset($HTTP_SERVER_VARS['PHP_SELF']) )
350 + if( !isset($_SERVER['PHP_SELF']) )
351 JpGraphError::Raise("<b>JpGraph Error:</b> Can't access PHP_SELF, PHP global variable. You can't run PHP from command line
352 if you want to use the 'auto' naming of cache or image files.");
353 - $fname=basename($HTTP_SERVER_VARS['PHP_SELF']);
354 + $fname=basename($_SERVER['PHP_SELF']);
355 // Replace the ".php" extension with the image format extension
356 return substr($fname,0,strlen($fname)-4).".".$img_format;
362 + // OW : fake method to have reporting working
363 + //function SetMargin($x1, $x2, $x3, $x4) {
367 // Should the grid be in front or back of the plot?
368 function SetGridDepth($aDepth) {
369 $this->grid_depth=$aDepth;
371 // Specify a background image
372 function SetBackgroundImage($aFileName,$aBgType=BKIMG_FILLPLOT,$aImgFormat="png") {
374 +/* CB Not any more bugging
376 if( $GLOBALS["gd2"] && !USE_TRUECOLOR ) {
377 JpGraphError::Raise("<b>JpGraph Error:</b>You are using GD 2.x and are
378 trying to use a background images on a non truecolor image. <br>
380 using any truetype fonts with truecolor images will result in very
381 poor quality fonts.");
385 $this->background_image = $aFileName;
386 $this->background_image_type=$aBgType;
387 @@ -1064,6 +1077,10 @@
388 $this->img->Rectangle(0,0,$this->img->width-1,$this->img->height-1);
391 + // Set Margin by Christian Bayle
392 + function SetMargin($lm,$rm,$tm,$bm) {
393 + $this->img->SetMargin($lm,$rm,$tm,$bm);
398 @@ -1078,13 +1095,14 @@
400 // Base file names for available fonts
401 $this->font_fam=array(
402 - FF_COURIER => TTF_DIR."courier",
403 - FF_VERDANA => TTF_DIR."verdana",
404 - FF_TIMES => TTF_DIR."times",
405 - FF_HANDWRT => TTF_DIR."handwriting",
406 - FF_COMIC => TTF_DIR."comic",
407 - FF_ARIAL => TTF_DIR."arial",
408 - FF_BOOK => TTF_DIR."bookant");
409 + FF_COURIER => TTF_DIR."Courier_New",
410 + FF_VERDANA => TTF_DIR."Verdana",
411 + FF_TIMES => TTF_DIR."Times",
412 + FF_HANDWRT => TTF_DIR."Handwriting",
413 + FF_COMIC => TTF_DIR."Comic",
414 + FF_ARIAL => TTF_DIR."Arial",
415 + FF_BOOK => TTF_DIR."Bookant",
416 + FF_LIBERATION_SANS => LIBERATION_DIR."LiberationSans-Regular");
420 @@ -1096,11 +1114,11 @@
424 - case FS_BOLD: $f .= "bd";
425 + case FS_BOLD: $f .= "_Bold";
427 - case FS_ITALIC: $f .= "i";
428 + case FS_ITALIC: $f .= "_Italic";
430 - case FS_BOLDIT: $f .= "bi";
431 + case FS_BOLDIT: $f .= "_Bold_Italic";
434 JpGraphError::Raise("<b>JpGraph Error:</b> Unknown TTF Style.");
435 @@ -3183,7 +3201,7 @@
439 - elseif($this->font_family >= FF_COURIER && $this->font_family <= FF_BOOK) { // TTF font
440 + elseif($this->font_family >= FF_COURIER && $this->font_family <= FF_LIBERATION_SANS) { // TTF font
441 $file = $this->ttf->File($this->font_family,$this->font_style);
443 $bbox=ImageTTFBBox($this->font_size,$angle,$file,$txt);
444 @@ -3208,7 +3226,7 @@
448 - JpGraphError::Raise("<b>JpGraph Error:</b> Unknown font font family specification. ");
449 + JpGraphError::Raise("<b>JpGraph Error:</b> Unknown font family specification: ". $this->font_family);
452 function SetMargin($lm,$rm,$tm,$bm) {
453 @@ -3490,7 +3508,16 @@
456 function FilledCircle($xc,$yc,$r) {
457 - imagefilledellipse($this->img,$xc,$yc,2*$r,2*$r,$this->current_color);
458 + if( $GLOBALS['gd2'] ) {
459 + imagefilledellipse($this->img,$xc,$yc,2*$r,2*$r,$this->current_color);
462 + for( $i=1; $i < 2*$r; $i += 2 ) {
463 + $this->Arc($xc,$yc,$i,$i,0,360);
464 + $this->Arc($xc,$yc,$i+1,$i,0,360);
465 + $this->Arc($xc,$yc,$i+1,$i+1,0,360);
470 // Linear Color InterPolation
471 --- libphp-jpgraph-1.5.2.orig/src/jpgraph_pie3d.php
472 +++ libphp-jpgraph-1.5.2/src/jpgraph_pie3d.php
476 function ExplodeSlice($e) {
477 - JpGraphError::Raise("JpGraph Error: Exploding slices are not (yet) implemented for 3d pies graphs.");
478 + //JpGraphError::Raise("JpGraph Error: Exploding slices are not (yet) implemented for 3d pies graphs.");
479 //$this->explode_slice=$e;
482 --- libphp-jpgraph-1.5.2.orig/src/Examples/example1.1.php
483 +++ libphp-jpgraph-1.5.2/src/Examples/example1.1.php
486 -include ("../jpgraph.php");
\r
487 -include ("../jpgraph_line.php");
\r
488 +include ("/usr/share/jpgraph/jpgraph.php");
\r
489 +include ("/usr/share/jpgraph/jpgraph_line.php");
\r
491 -$ydata = array(11,11,11);
\r
492 +$ydata = array(11,11,11,12,12,12);
\r
494 // Create the graph.
\r
495 $graph = new Graph(350,250,"auto");
\r
496 --- libphp-jpgraph-1.5.2.orig/src/Examples/example4.php
497 +++ libphp-jpgraph-1.5.2/src/Examples/example4.php
500 -include ("../jpgraph.php");
501 -include ("../jpgraph_line.php");
502 +include ("/usr/share/jpgraph/jpgraph.php");
503 +include ("/usr/share/jpgraph/jpgraph_line.php");
505 $ydata = array(11,3,8,12,5,1,9,13,5,7);
506 $ydata2 = array(1,19,15,7,22,14,5,9,21,13);
507 --- libphp-jpgraph-1.5.2.orig/src/Examples/spiderex2.php
508 +++ libphp-jpgraph-1.5.2/src/Examples/spiderex2.php
511 - include ("../jpgraph.php");
512 - include ("../jpgraph_spider.php");
513 + include ("/usr/share/jpgraph/jpgraph.php");
514 + include ("/usr/share/jpgraph/jpgraph_spider.php");
517 $data = array(55,80,46,71,95);
518 --- libphp-jpgraph-1.5.2.orig/src/Examples/linegrace.php
519 +++ libphp-jpgraph-1.5.2/src/Examples/linegrace.php
522 -include ("../jpgraph.php");
523 -include ("../jpgraph_line.php");
524 +include ("/usr/share/jpgraph/jpgraph.php");
525 +include ("/usr/share/jpgraph/jpgraph_line.php");
527 $datay = array(0.2980,0.3039,0.3020,0.3027,0.3015);
528 $graph = new Graph(300,200);
529 --- libphp-jpgraph-1.5.2.orig/src/Examples/bargradex5.php
530 +++ libphp-jpgraph-1.5.2/src/Examples/bargradex5.php
533 // Example for use of JpGraph,
\r
534 // ljp, 01/03/01 19:44
\r
535 -include ("../jpgraph.php");
\r
536 -include ("../jpgraph_bar.php");
\r
537 -include ("../jpgraph_line.php");
\r
538 +include ("/usr/share/jpgraph/jpgraph.php");
\r
539 +include ("/usr/share/jpgraph/jpgraph_bar.php");
\r
540 +include ("/usr/share/jpgraph/jpgraph_line.php");
\r
542 // We need some data
\r
543 $datay=array(0.3031,0.3044,0.3049,0.3040,0.3024,0.3047);
\r
544 --- libphp-jpgraph-1.5.2.orig/src/Examples/scatterex2.php
545 +++ libphp-jpgraph-1.5.2/src/Examples/scatterex2.php
548 -include ("../jpgraph.php");
549 -include ("../jpgraph_scatter.php");
550 +include ("/usr/share/jpgraph/jpgraph.php");
551 +include ("/usr/share/jpgraph/jpgraph_scatter.php");
553 $datax = array(3.5,3.7,3,4,6.2,6,3.5,8,14,8,11.1,13.7);
554 $datay = array(20,22,12,13,17,20,16,19,30,31,40,43);
555 --- libphp-jpgraph-1.5.2.orig/src/Examples/example9.php
556 +++ libphp-jpgraph-1.5.2/src/Examples/example9.php
559 -include ("../jpgraph.php");
560 -include ("../jpgraph_log.php");
561 -include ("../jpgraph_line.php");
562 +include ("/usr/share/jpgraph/jpgraph.php");
563 +include ("/usr/share/jpgraph/jpgraph_log.php");
564 +include ("/usr/share/jpgraph/jpgraph_line.php");
567 $ydata = array(11,3,8,12,5,1,9,13,5,7);
568 --- libphp-jpgraph-1.5.2.orig/src/Examples/impulsex3.php
569 +++ libphp-jpgraph-1.5.2/src/Examples/impulsex3.php
572 -include ("../jpgraph.php");
573 -include ("../jpgraph_scatter.php");
574 +include ("/usr/share/jpgraph/jpgraph.php");
575 +include ("/usr/share/jpgraph/jpgraph_scatter.php");
579 --- libphp-jpgraph-1.5.2.orig/src/Examples/staticbandbarex3.php
580 +++ libphp-jpgraph-1.5.2/src/Examples/staticbandbarex3.php
583 -include ("../jpgraph.php");
584 -include ("../jpgraph_bar.php");
585 +include ("/usr/share/jpgraph/jpgraph.php");
586 +include ("/usr/share/jpgraph/jpgraph_bar.php");
588 $datay=array(12,0,-19,-7,17,-6);
590 --- libphp-jpgraph-1.5.2.orig/src/Examples/impulsex2.php
591 +++ libphp-jpgraph-1.5.2/src/Examples/impulsex2.php
594 -include ("../jpgraph.php");
595 -include ("../jpgraph_scatter.php");
596 +include ("/usr/share/jpgraph/jpgraph.php");
597 +include ("/usr/share/jpgraph/jpgraph_scatter.php");
599 $datay = array(20,22,12,13,17,20,16,19,30,31,40,43);
600 $graph = new Graph(300,200,"auto");
601 --- libphp-jpgraph-1.5.2.orig/src/Examples/example19.php
602 +++ libphp-jpgraph-1.5.2/src/Examples/example19.php
605 -include ("../jpgraph.php");
\r
606 -include ("../jpgraph_bar.php");
\r
607 +include ("/usr/share/jpgraph/jpgraph.php");
\r
608 +include ("/usr/share/jpgraph/jpgraph_bar.php");
\r
610 $datay=array(12,8,19,3,10,5);
\r
612 --- libphp-jpgraph-1.5.2.orig/src/Examples/negbarvalueex01.php
613 +++ libphp-jpgraph-1.5.2/src/Examples/negbarvalueex01.php
616 -include ("../jpgraph.php");
617 -include ("../jpgraph_bar.php");
618 +include ("/usr/share/jpgraph/jpgraph.php");
619 +include ("/usr/share/jpgraph/jpgraph_bar.php");
621 $datay=array(12,0,-19,-7,17,-6);
623 --- libphp-jpgraph-1.5.2.orig/src/Examples/pieex1.php
624 +++ libphp-jpgraph-1.5.2/src/Examples/pieex1.php
627 -include ("../jpgraph.php");
628 -include ("../jpgraph_pie.php");
629 +include ("/usr/share/jpgraph/jpgraph.php");
630 +include ("/usr/share/jpgraph/jpgraph_pie.php");
633 $data = array(113,5,160,3,15,10,1);
634 --- libphp-jpgraph-1.5.2.orig/src/Examples/backgroundex01.php
635 +++ libphp-jpgraph-1.5.2/src/Examples/backgroundex01.php
638 -include ("../jpgraph.php");
639 -include ("../jpgraph_line.php");
640 +include ("/usr/share/jpgraph/jpgraph.php");
641 +include ("/usr/share/jpgraph/jpgraph_line.php");
644 $datay = array(28,19,18,23,12,11);
645 --- libphp-jpgraph-1.5.2.orig/src/Examples/pieex3.php
646 +++ libphp-jpgraph-1.5.2/src/Examples/pieex3.php
649 -include ("../jpgraph.php");
\r
650 -include ("../jpgraph_pie.php");
\r
651 +include ("/usr/share/jpgraph/jpgraph.php");
\r
652 +include ("/usr/share/jpgraph/jpgraph_pie.php");
\r
655 $data = array(40,21,17,14,23);
\r
656 --- libphp-jpgraph-1.5.2.orig/src/Examples/linegraceex.php
657 +++ libphp-jpgraph-1.5.2/src/Examples/linegraceex.php
660 -include ("../jpgraph.php");
661 -include ("../jpgraph_line.php");
662 +include ("/usr/share/jpgraph/jpgraph.php");
663 +include ("/usr/share/jpgraph/jpgraph_line.php");
665 $datay = array(0.2980,0.3039,0.3020,0.3027,0.3015);
667 --- libphp-jpgraph-1.5.2.orig/src/Examples/example3.1.php
668 +++ libphp-jpgraph-1.5.2/src/Examples/example3.1.php
671 -include ("../jpgraph.php");
\r
672 -include ("../jpgraph_line.php");
\r
673 +include ("/usr/share/jpgraph/jpgraph.php");
\r
674 +include ("/usr/share/jpgraph/jpgraph_line.php");
\r
676 $ydata = array(11,3,8,12,5,1,9,13,5,7);
\r
678 --- libphp-jpgraph-1.5.2.orig/src/Examples/pie3d_csimex1.php
679 +++ libphp-jpgraph-1.5.2/src/Examples/pie3d_csimex1.php
682 -include ("../jpgraph.php");
683 -include ("../jpgraph_pie.php");
684 -include ("../jpgraph_pie3d.php");
685 +include ("/usr/share/jpgraph/jpgraph.php");
686 +include ("/usr/share/jpgraph/jpgraph_pie.php");
687 +include ("/usr/share/jpgraph/jpgraph_pie3d.php");
690 $data = array(40,21,17,27,23);
691 --- libphp-jpgraph-1.5.2.orig/src/Examples/pieex5.php
692 +++ libphp-jpgraph-1.5.2/src/Examples/pieex5.php
695 -include ("../jpgraph.php");
\r
696 -include ("../jpgraph_pie.php");
\r
697 +include ("/usr/share/jpgraph/jpgraph.php");
\r
698 +include ("/usr/share/jpgraph/jpgraph_pie.php");
\r
700 $data = array(40,60,21,33);
\r
702 --- libphp-jpgraph-1.5.2.orig/src/Examples/bargradex2.php
703 +++ libphp-jpgraph-1.5.2/src/Examples/bargradex2.php
706 // Example for use of JpGraph,
\r
707 // ljp, 01/03/01 20:32
\r
708 -include ("../jpgraph.php");
\r
709 -include ("../jpgraph_bar.php");
\r
710 +include ("/usr/share/jpgraph/jpgraph.php");
\r
711 +include ("/usr/share/jpgraph/jpgraph_bar.php");
\r
713 // We need some data
\r
714 $datay=array(-0.13,0.25,-0.21,0.35,0.31,0.04);
\r
715 --- libphp-jpgraph-1.5.2.orig/src/Examples/nullvalueex01.php
716 +++ libphp-jpgraph-1.5.2/src/Examples/nullvalueex01.php
719 -include ("../jpgraph.php");
720 -include ("../jpgraph_line.php");
721 +include ("/usr/share/jpgraph/jpgraph.php");
722 +include ("/usr/share/jpgraph/jpgraph_line.php");
725 $datax = array("2001-04-01","2001-04-02","2001-04-03",
726 --- libphp-jpgraph-1.5.2.orig/src/Examples/scatterex1.php
727 +++ libphp-jpgraph-1.5.2/src/Examples/scatterex1.php
730 -include ("../jpgraph.php");
731 -include ("../jpgraph_scatter.php");
732 +include ("/usr/share/jpgraph/jpgraph.php");
733 +include ("/usr/share/jpgraph/jpgraph_scatter.php");
735 $datax = array(3.5,3.7,3,4,6.2,6,3.5,8,14,8,11.1,13.7);
736 $datay = array(20,22,12,13,17,20,16,19,30,31,40,43);
737 --- libphp-jpgraph-1.5.2.orig/src/Examples/exampleex9.php
738 +++ libphp-jpgraph-1.5.2/src/Examples/exampleex9.php
741 -include ("../jpgraph.php");
\r
742 -include ("../jpgraph_log.php");
\r
743 -include ("../jpgraph_line.php");
\r
744 +include ("/usr/share/jpgraph/jpgraph.php");
\r
745 +include ("/usr/share/jpgraph/jpgraph_log.php");
\r
746 +include ("/usr/share/jpgraph/jpgraph_line.php");
\r
749 $ydata = array(11,3,8,12,5,1,9,13,5,7);
\r
750 --- libphp-jpgraph-1.5.2.orig/src/Examples/example18.php
751 +++ libphp-jpgraph-1.5.2/src/Examples/example18.php
754 -include ("../jpgraph.php");
\r
755 -include ("../jpgraph_bar.php");
\r
756 +include ("/usr/share/jpgraph/jpgraph.php");
\r
757 +include ("/usr/share/jpgraph/jpgraph_bar.php");
\r
759 $datay=array(12,8,19,3,10,5);
\r
761 --- libphp-jpgraph-1.5.2.orig/src/Examples/staticbandbarex1.php
762 +++ libphp-jpgraph-1.5.2/src/Examples/staticbandbarex1.php
765 -include ("../jpgraph.php");
766 -include ("../jpgraph_bar.php");
767 +include ("/usr/share/jpgraph/jpgraph.php");
768 +include ("/usr/share/jpgraph/jpgraph_bar.php");
770 $datay=array(12,0,-19,-7,17,-6);
772 --- libphp-jpgraph-1.5.2.orig/src/Examples/example6.php
773 +++ libphp-jpgraph-1.5.2/src/Examples/example6.php
776 -include ("../jpgraph.php");
777 -include ("../jpgraph_line.php");
778 +include ("/usr/share/jpgraph/jpgraph.php");
779 +include ("/usr/share/jpgraph/jpgraph_line.php");
781 $ydata = array(11,3,8,12,5,1,9,13,5,7);
782 $y2data = array(354,200,265,99,111,91,198,225,293,251);
783 --- libphp-jpgraph-1.5.2.orig/src/Examples/staticbandbarex4.php
784 +++ libphp-jpgraph-1.5.2/src/Examples/staticbandbarex4.php
787 -include ("../jpgraph.php");
788 -include ("../jpgraph_bar.php");
789 +include ("/usr/share/jpgraph/jpgraph.php");
790 +include ("/usr/share/jpgraph/jpgraph_bar.php");
792 $datay=array(12,0,-19,-7,17,-6);
794 --- libphp-jpgraph-1.5.2.orig/src/Examples/ganttex30.php
795 +++ libphp-jpgraph-1.5.2/src/Examples/ganttex30.php
799 // $Id: ganttex30.php,v 1.2 2001/12/22 17:27:47 ljp Exp $
800 -include ("../jpgraph.php");
801 -include ("../jpgraph_gantt.php");
802 +include ("/usr/share/jpgraph/jpgraph.php");
803 +include ("/usr/share/jpgraph/jpgraph_gantt.php");
805 // Standard calls to create a new graph
806 $graph = new GanttGraph(-1,-1,"auto");
807 --- libphp-jpgraph-1.5.2.orig/src/Examples/example20.php
808 +++ libphp-jpgraph-1.5.2/src/Examples/example20.php
811 -include ("../jpgraph.php");
\r
812 -include ("../jpgraph_bar.php");
\r
813 +include ("/usr/share/jpgraph/jpgraph.php");
\r
814 +include ("/usr/share/jpgraph/jpgraph_bar.php");
\r
816 $datay=array(12,8,19,3,10,5);
\r
818 --- libphp-jpgraph-1.5.2.orig/src/Examples/text-example1.php
819 +++ libphp-jpgraph-1.5.2/src/Examples/text-example1.php
822 -include ("../jpgraph.php");
823 -include ("../jpgraph_canvas.php");
824 +include ("/usr/share/jpgraph/jpgraph.php");
825 +include ("/usr/share/jpgraph/jpgraph_canvas.php");
828 $graph = new CanvasGraph(350,200,"auto");
829 --- libphp-jpgraph-1.5.2.orig/src/Examples/example16.3.php
830 +++ libphp-jpgraph-1.5.2/src/Examples/example16.3.php
833 -include ("../jpgraph.php");
\r
834 -include ("../jpgraph_line.php");
\r
835 -include ("../jpgraph_error.php");
\r
836 -include ("../jpgraph_bar.php");
\r
837 +include ("/usr/share/jpgraph/jpgraph.php");
\r
838 +include ("/usr/share/jpgraph/jpgraph_line.php");
\r
839 +include ("/usr/share/jpgraph/jpgraph_error.php");
\r
840 +include ("/usr/share/jpgraph/jpgraph_bar.php");
\r
842 $l1datay = array(11,9,2,4,3,13,17);
\r
843 $l2datay = array(23,12,5,19,17,10,15);
\r
844 --- libphp-jpgraph-1.5.2.orig/src/Examples/example14.php
845 +++ libphp-jpgraph-1.5.2/src/Examples/example14.php
848 -include ("../jpgraph.php");
\r
849 -include ("../jpgraph_error.php");
\r
850 +include ("/usr/share/jpgraph/jpgraph.php");
\r
851 +include ("/usr/share/jpgraph/jpgraph_error.php");
\r
853 $errdatay = array(11,9,2,4,19,26,13,19,7,12);
\r
854 $datax=array("Jan","Feb","Mar","Apr","May");
\r
855 --- libphp-jpgraph-1.5.2.orig/src/Examples/example3.2.php
856 +++ libphp-jpgraph-1.5.2/src/Examples/example3.2.php
859 -include ("../jpgraph.php");
\r
860 -include ("../jpgraph_line.php");
\r
861 +include ("/usr/share/jpgraph/jpgraph.php");
\r
862 +include ("/usr/share/jpgraph/jpgraph_line.php");
\r
864 $ydata = array(11,3,8,12,5,1,9,13,5,7);
\r
866 --- libphp-jpgraph-1.5.2.orig/src/Examples/example21.php
867 +++ libphp-jpgraph-1.5.2/src/Examples/example21.php
870 -include ("../jpgraph.php");
871 -include ("../jpgraph_bar.php");
872 +include ("/usr/share/jpgraph/jpgraph.php");
873 +include ("/usr/share/jpgraph/jpgraph_bar.php");
875 $data1y=array(12,8,19,3,10,5);
876 $data2y=array(8,2,11,7,14,4);
877 --- libphp-jpgraph-1.5.2.orig/src/Examples/example16.2.php
878 +++ libphp-jpgraph-1.5.2/src/Examples/example16.2.php
881 -include ("../jpgraph.php");
\r
882 -include ("../jpgraph_line.php");
\r
883 -include ("../jpgraph_bar.php");
\r
884 +include ("/usr/share/jpgraph/jpgraph.php");
\r
885 +include ("/usr/share/jpgraph/jpgraph_line.php");
\r
886 +include ("/usr/share/jpgraph/jpgraph_bar.php");
\r
888 $l1datay = array(11,9,2,4,3,13,17);
\r
889 $l2datay = array(23,12,5,19,17,10,15);
\r
890 --- libphp-jpgraph-1.5.2.orig/src/Examples/example2.5.php
891 +++ libphp-jpgraph-1.5.2/src/Examples/example2.5.php
894 -include ("../jpgraph.php");
\r
895 -include ("../jpgraph_line.php");
\r
896 +include ("/usr/share/jpgraph/jpgraph.php");
\r
897 +include ("/usr/share/jpgraph/jpgraph_line.php");
\r
899 $ydata = array(11,-3,-8,7,5,-1,9,13,5,-7);
\r
901 --- libphp-jpgraph-1.5.2.orig/src/Examples/spiderex6.php
902 +++ libphp-jpgraph-1.5.2/src/Examples/spiderex6.php
905 - include ("../jpgraph.php");
906 - include ("../jpgraph_spider.php");
907 + include ("/usr/share/jpgraph/jpgraph.php");
908 + include ("/usr/share/jpgraph/jpgraph_spider.php");
911 $data = array(55,80,46,21,95);
912 --- libphp-jpgraph-1.5.2.orig/src/Examples/centeredlineex01.php
913 +++ libphp-jpgraph-1.5.2/src/Examples/centeredlineex01.php
916 -include ("../jpgraph.php");
\r
917 -include ("../jpgraph_line.php");
\r
918 -include ("../jpgraph_error.php");
\r
919 +include ("/usr/share/jpgraph/jpgraph.php");
\r
920 +include ("/usr/share/jpgraph/jpgraph_line.php");
\r
921 +include ("/usr/share/jpgraph/jpgraph_error.php");
\r
924 //$datax = array(3.5,3.7,3,4,6.2,6,3.5,8,14,8,11.1,13.7);
\r
925 --- libphp-jpgraph-1.5.2.orig/src/Examples/example23.php
926 +++ libphp-jpgraph-1.5.2/src/Examples/example23.php
929 -include ("../jpgraph.php");
\r
930 -include ("../jpgraph_bar.php");
\r
931 +include ("/usr/share/jpgraph/jpgraph.php");
\r
932 +include ("/usr/share/jpgraph/jpgraph_bar.php");
\r
934 $data1y=array(12,8,19,3,10,5);
\r
935 $data2y=array(8,2,11,7,14,4);
\r
936 --- libphp-jpgraph-1.5.2.orig/src/Examples/pieex4.php
937 +++ libphp-jpgraph-1.5.2/src/Examples/pieex4.php
940 -include ("../jpgraph.php");
\r
941 -include ("../jpgraph_pie.php");
\r
942 +include ("/usr/share/jpgraph/jpgraph.php");
\r
943 +include ("/usr/share/jpgraph/jpgraph_pie.php");
\r
945 $data = array(40,60,21,33);
\r
947 --- libphp-jpgraph-1.5.2.orig/src/Examples/example5.php
948 +++ libphp-jpgraph-1.5.2/src/Examples/example5.php
951 -include ("../jpgraph.php");
952 -include ("../jpgraph_line.php");
953 +include ("/usr/share/jpgraph/jpgraph.php");
954 +include ("/usr/share/jpgraph/jpgraph_line.php");
956 $ydata = array(11,3,8,12,5,1,9,13,5,7);
957 $y2data = array(354,200,265,99,111,91,198,225,293,251);
958 --- libphp-jpgraph-1.5.2.orig/src/Examples/spiderex6.1.php
959 +++ libphp-jpgraph-1.5.2/src/Examples/spiderex6.1.php
962 - include ("../jpgraph.php");
963 - include ("../jpgraph_spider.php");
964 + include ("/usr/share/jpgraph/jpgraph.php");
965 + include ("/usr/share/jpgraph/jpgraph_spider.php");
968 $data = array(55,80,46,21,95);
969 --- libphp-jpgraph-1.5.2.orig/src/Examples/example7.php
970 +++ libphp-jpgraph-1.5.2/src/Examples/example7.php
973 -include ("../jpgraph.php");
974 -include ("../jpgraph_log.php");
975 -include ("../jpgraph_line.php");
976 +include ("/usr/share/jpgraph/jpgraph.php");
977 +include ("/usr/share/jpgraph/jpgraph_log.php");
978 +include ("/usr/share/jpgraph/jpgraph_line.php");
980 $ydata = array(11,3,8,12,5,1,9,13,5,7);
981 $y2data = array(354,200,265,99,111,91,198,225,293,251);
982 --- libphp-jpgraph-1.5.2.orig/src/Examples/spiderex4.php
983 +++ libphp-jpgraph-1.5.2/src/Examples/spiderex4.php
986 - include ("../jpgraph.php");
987 - include ("../jpgraph_spider.php");
988 + include ("/usr/share/jpgraph/jpgraph.php");
989 + include ("/usr/share/jpgraph/jpgraph_spider.php");
992 $data = array(55,80,46,21,95);
993 --- libphp-jpgraph-1.5.2.orig/src/Examples/example13.php
994 +++ libphp-jpgraph-1.5.2/src/Examples/example13.php
997 -include ("../jpgraph.php");
\r
998 -include ("../jpgraph_error.php");
\r
999 +include ("/usr/share/jpgraph/jpgraph.php");
\r
1000 +include ("/usr/share/jpgraph/jpgraph_error.php");
\r
1002 $errdatay = array(11,9,2,4,19,26,13,19,7,12);
\r
1003 $datax=array("Jan","Feb","Mar","Apr","May");
\r
1004 --- libphp-jpgraph-1.5.2.orig/src/Examples/example22.php
1005 +++ libphp-jpgraph-1.5.2/src/Examples/example22.php
1008 -include ("../jpgraph.php");
\r
1009 -include ("../jpgraph_bar.php");
\r
1010 +include ("/usr/share/jpgraph/jpgraph.php");
\r
1011 +include ("/usr/share/jpgraph/jpgraph_bar.php");
\r
1013 $data1y=array(12,8,19,3,10,5);
\r
1014 $data2y=array(8,2,11,7,14,4);
\r
1015 --- libphp-jpgraph-1.5.2.orig/src/Examples/spiderlogex1.php
1016 +++ libphp-jpgraph-1.5.2/src/Examples/spiderlogex1.php
1019 -include ("../jpgraph.php");
1020 -include ("../jpgraph_log.php");
1021 -include ("../jpgraph_spider.php");
1022 +include ("/usr/share/jpgraph/jpgraph.php");
1023 +include ("/usr/share/jpgraph/jpgraph_log.php");
1024 +include ("/usr/share/jpgraph/jpgraph_spider.php");
1026 // Some data to plot
1027 $data = array(242,58,1500,12,1397,810,373);
1028 --- libphp-jpgraph-1.5.2.orig/src/Examples/example16.1.php
1029 +++ libphp-jpgraph-1.5.2/src/Examples/example16.1.php
1032 -include ("../jpgraph.php");
\r
1033 -include ("../jpgraph_line.php");
\r
1034 -include ("../jpgraph_error.php");
\r
1035 -include ("../jpgraph_bar.php");
\r
1036 +include ("/usr/share/jpgraph/jpgraph.php");
\r
1037 +include ("/usr/share/jpgraph/jpgraph_line.php");
\r
1038 +include ("/usr/share/jpgraph/jpgraph_error.php");
\r
1039 +include ("/usr/share/jpgraph/jpgraph_bar.php");
\r
1041 $l1datay = array(11,9,2,4,3,13,17);
\r
1042 $l2datay = array(23,12,5,19,17,10,15);
\r
1043 --- libphp-jpgraph-1.5.2.orig/src/Examples/bargradex4.php
1044 +++ libphp-jpgraph-1.5.2/src/Examples/bargradex4.php
1047 // Example for use of JpGraph,
\r
1048 // ljp, 01/03/01 19:44
\r
1049 -include ("../jpgraph.php");
\r
1050 -include ("../jpgraph_bar.php");
\r
1051 +include ("/usr/share/jpgraph/jpgraph.php");
\r
1052 +include ("/usr/share/jpgraph/jpgraph_bar.php");
\r
1054 // We need some data
\r
1055 $datay=array(0.3031,0.3044,0.3049,0.3040,0.3024,0.3047);
\r
1056 --- libphp-jpgraph-1.5.2.orig/src/Examples/pieex2.php
1057 +++ libphp-jpgraph-1.5.2/src/Examples/pieex2.php
1060 -include ("../jpgraph.php");
\r
1061 -include ("../jpgraph_pie.php");
\r
1062 +include ("/usr/share/jpgraph/jpgraph.php");
\r
1063 +include ("/usr/share/jpgraph/jpgraph_pie.php");
\r
1066 $data = array(40,21,17,14,23);
\r
1067 --- libphp-jpgraph-1.5.2.orig/src/Examples/rotateex1.php
1068 +++ libphp-jpgraph-1.5.2/src/Examples/rotateex1.php
1071 -include ("../jpgraph.php");
1072 -include ("../jpgraph_line.php");
1073 +include ("/usr/share/jpgraph/jpgraph.php");
1074 +include ("/usr/share/jpgraph/jpgraph_line.php");
1076 $ydata = array(11,3,8,12,5,1,9,13,5,7);
1077 $y2data = array(354,200,265,99,111,91,198,225,293,251);
1078 --- libphp-jpgraph-1.5.2.orig/src/Examples/filledlineex01.php
1079 +++ libphp-jpgraph-1.5.2/src/Examples/filledlineex01.php
1082 -include ("../jpgraph.php");
\r
1083 -include ("../jpgraph_line.php");
\r
1084 +include ("/usr/share/jpgraph/jpgraph.php");
\r
1085 +include ("/usr/share/jpgraph/jpgraph_line.php");
\r
1087 $datay = array(1.23,1.9,1.6,3.1,3.4,2.8,2.1,1.9);
\r
1088 $graph = new Graph(300,200,"auto");
\r
1089 --- libphp-jpgraph-1.5.2.orig/src/Examples/spiderex1.php
1090 +++ libphp-jpgraph-1.5.2/src/Examples/spiderex1.php
1093 - include ("../jpgraph.php");
1094 - include ("../jpgraph_spider.php");
1095 + include ("/usr/share/jpgraph/jpgraph.php");
1096 + include ("/usr/share/jpgraph/jpgraph_spider.php");
1098 // Some data to plot
1099 $data = array(55,80,46,71,95);
1100 --- libphp-jpgraph-1.5.2.orig/src/Examples/bar_csimex2.php
1101 +++ libphp-jpgraph-1.5.2/src/Examples/bar_csimex2.php
1104 -include ("../jpgraph.php");
1105 -include ("../jpgraph_bar.php");
1106 +include ("/usr/share/jpgraph/jpgraph.php");
1107 +include ("/usr/share/jpgraph/jpgraph_bar.php");
1109 $data1y=array(12,8,19,3,10,5);
1110 $data2y=array(8,2,12,7,14,4);
1111 --- libphp-jpgraph-1.5.2.orig/src/Examples/staticlinebarex1.php
1112 +++ libphp-jpgraph-1.5.2/src/Examples/staticlinebarex1.php
1115 -include ("../jpgraph.php");
1116 -include ("../jpgraph_bar.php");
1117 +include ("/usr/share/jpgraph/jpgraph.php");
1118 +include ("/usr/share/jpgraph/jpgraph_bar.php");
1120 $datay=array(12,0,-19,-7,17,-6);
1122 --- libphp-jpgraph-1.5.2.orig/src/Examples/linebarex1.php
1123 +++ libphp-jpgraph-1.5.2/src/Examples/linebarex1.php
1126 -include ("../jpgraph.php");
\r
1127 -include ("../jpgraph_line.php");
\r
1128 -include ("../jpgraph_bar.php");
\r
1129 +include ("/usr/share/jpgraph/jpgraph.php");
\r
1130 +include ("/usr/share/jpgraph/jpgraph_line.php");
\r
1131 +include ("/usr/share/jpgraph/jpgraph_bar.php");
\r
1134 "Jan","Feb","Mar","Apr","Maj","Jun","Jul","Aug","Sep","Okt","Nov","Dec");
\r
1135 --- libphp-jpgraph-1.5.2.orig/src/Examples/staticbandbarex6.php
1136 +++ libphp-jpgraph-1.5.2/src/Examples/staticbandbarex6.php
1139 -include ("../jpgraph.php");
1140 -include ("../jpgraph_bar.php");
1141 +include ("/usr/share/jpgraph/jpgraph.php");
1142 +include ("/usr/share/jpgraph/jpgraph_bar.php");
1144 $datay=array(12,0,-19,-7,17,-6);
1146 --- libphp-jpgraph-1.5.2.orig/src/Examples/example1.2.php
1147 +++ libphp-jpgraph-1.5.2/src/Examples/example1.2.php
1150 -include ("../jpgraph.php");
\r
1151 -include ("../jpgraph_line.php");
\r
1152 +include ("/usr/share/jpgraph/jpgraph.php");
\r
1153 +include ("/usr/share/jpgraph/jpgraph_line.php");
\r
1155 $ydata = array(11,3,8,12,5,1,9,13,5,7);
\r
1157 --- libphp-jpgraph-1.5.2.orig/src/Examples/backgroundex03.php
1158 +++ libphp-jpgraph-1.5.2/src/Examples/backgroundex03.php
1161 -include ("../jpgraph.php");
1162 -include ("../jpgraph_line.php");
1163 +include ("/usr/share/jpgraph/jpgraph.php");
1164 +include ("/usr/share/jpgraph/jpgraph_line.php");
1167 $datay = array(28,19,18,23,12,11);
1168 --- libphp-jpgraph-1.5.2.orig/src/Examples/centeredlineex02.php
1169 +++ libphp-jpgraph-1.5.2/src/Examples/centeredlineex02.php
1172 -include ("../jpgraph.php");
\r
1173 -include ("../jpgraph_line.php");
\r
1174 -include ("../jpgraph_error.php");
\r
1175 +include ("/usr/share/jpgraph/jpgraph.php");
\r
1176 +include ("/usr/share/jpgraph/jpgraph_line.php");
\r
1177 +include ("/usr/share/jpgraph/jpgraph_error.php");
\r
1180 //$datax = array(3.5,3.7,3,4,6.2,6,3.5,8,14,8,11.1,13.7);
\r
1181 --- libphp-jpgraph-1.5.2.orig/src/Examples/scatterlinkex2.php
1182 +++ libphp-jpgraph-1.5.2/src/Examples/scatterlinkex2.php
1185 -include ("../jpgraph.php");
1186 -include ("../jpgraph_scatter.php");
1187 +include ("/usr/share/jpgraph/jpgraph.php");
1188 +include ("/usr/share/jpgraph/jpgraph_scatter.php");
1191 // Make a circle with a scatterplot
1192 --- libphp-jpgraph-1.5.2.orig/src/Examples/spiderex5.php
1193 +++ libphp-jpgraph-1.5.2/src/Examples/spiderex5.php
1196 - include ("../jpgraph.php");
1197 - include ("../jpgraph_spider.php");
1198 + include ("/usr/share/jpgraph/jpgraph.php");
1199 + include ("/usr/share/jpgraph/jpgraph_spider.php");
1201 // Some data to plot
1202 $data = array(55,80,46,21,95);
1203 --- libphp-jpgraph-1.5.2.orig/src/Examples/impulsex4.php
1204 +++ libphp-jpgraph-1.5.2/src/Examples/impulsex4.php
1207 -include ("../jpgraph.php");
1208 -include ("../jpgraph_scatter.php");
1209 -include ("../jpgraph_line.php");
1210 +include ("/usr/share/jpgraph/jpgraph.php");
1211 +include ("/usr/share/jpgraph/jpgraph_scatter.php");
1212 +include ("/usr/share/jpgraph/jpgraph_line.php");
1216 --- libphp-jpgraph-1.5.2.orig/src/Examples/bargradex6.php
1217 +++ libphp-jpgraph-1.5.2/src/Examples/bargradex6.php
1220 // Example for use of JpGraph,
\r
1221 // ljp, 01/03/01 20:32
\r
1222 -include ("../jpgraph.php");
\r
1223 -include ("../jpgraph_bar.php");
\r
1224 +include ("/usr/share/jpgraph/jpgraph.php");
\r
1225 +include ("/usr/share/jpgraph/jpgraph_bar.php");
\r
1227 // We need some data
\r
1228 $datay=array(-0.13,0.25,-0.21,0.35,0.31,0.04);
\r
1229 --- libphp-jpgraph-1.5.2.orig/src/Examples/example3.php
1230 +++ libphp-jpgraph-1.5.2/src/Examples/example3.php
1233 -include ("../jpgraph.php");
1234 -include ("../jpgraph_line.php");
1235 +include ("/usr/share/jpgraph/jpgraph.php");
1236 +include ("/usr/share/jpgraph/jpgraph_line.php");
1238 $ydata = array(11,3,8,12,5,1,9,13,5,7);
1240 --- libphp-jpgraph-1.5.2.orig/src/Examples/pie_csimex1.php
1241 +++ libphp-jpgraph-1.5.2/src/Examples/pie_csimex1.php
1244 -include ("../jpgraph.php");
1245 -include ("../jpgraph_pie.php");
1246 +include ("/usr/share/jpgraph/jpgraph.php");
1247 +include ("/usr/share/jpgraph/jpgraph_pie.php");
1250 $data = array(40,21,17,14,23);
1251 --- libphp-jpgraph-1.5.2.orig/src/Examples/example16.php
1252 +++ libphp-jpgraph-1.5.2/src/Examples/example16.php
1255 -include ("../jpgraph.php");
\r
1256 -include ("../jpgraph_line.php");
\r
1257 -include ("../jpgraph_error.php");
\r
1258 +include ("/usr/share/jpgraph/jpgraph.php");
\r
1259 +include ("/usr/share/jpgraph/jpgraph_line.php");
\r
1260 +include ("/usr/share/jpgraph/jpgraph_error.php");
\r
1262 $errdatay = array(11,9,2,4,19,26,13,19,7,12);
\r
1263 $datax=array("Jan","Feb","Mar","Apr","May");
\r
1264 --- libphp-jpgraph-1.5.2.orig/src/Examples/pieex6.php
1265 +++ libphp-jpgraph-1.5.2/src/Examples/pieex6.php
1268 -include ("../jpgraph.php");
\r
1269 -include ("../jpgraph_pie.php");
\r
1270 +include ("/usr/share/jpgraph/jpgraph.php");
\r
1271 +include ("/usr/share/jpgraph/jpgraph_pie.php");
\r
1274 $data = array(27,23,47,17);
\r
1275 --- libphp-jpgraph-1.5.2.orig/src/Examples/pie3dex1.php
1276 +++ libphp-jpgraph-1.5.2/src/Examples/pie3dex1.php
1279 -include ("../jpgraph.php");
1280 -include ("../jpgraph_pie.php");
1281 -include ("../jpgraph_pie3d.php");
1282 +include ("/usr/share/jpgraph/jpgraph.php");
1283 +include ("/usr/share/jpgraph/jpgraph_pie.php");
1284 +include ("/usr/share/jpgraph/jpgraph_pie3d.php");
1287 $data = array(20,27,45,75,90);
1288 --- libphp-jpgraph-1.5.2.orig/src/Examples/linebarex3.php
1289 +++ libphp-jpgraph-1.5.2/src/Examples/linebarex3.php
1292 -include ("../jpgraph.php");
\r
1293 -include ("../jpgraph_line.php");
\r
1294 -include ("../jpgraph_bar.php");
\r
1295 +include ("/usr/share/jpgraph/jpgraph.php");
\r
1296 +include ("/usr/share/jpgraph/jpgraph_line.php");
\r
1297 +include ("/usr/share/jpgraph/jpgraph_bar.php");
\r
1301 --- libphp-jpgraph-1.5.2.orig/src/Examples/scatterlinkex1.php
1302 +++ libphp-jpgraph-1.5.2/src/Examples/scatterlinkex1.php
1305 -include ("../jpgraph.php");
1306 -include ("../jpgraph_scatter.php");
1307 +include ("/usr/share/jpgraph/jpgraph.php");
1308 +include ("/usr/share/jpgraph/jpgraph_scatter.php");
1310 $datax = array(3.5,3.7,3,4,6.2,6,3.5,8,14,8,11.1,13.7);
1311 $datay = array(20,22,12,13,17,20,16,19,30,31,40,43);
1312 --- libphp-jpgraph-1.5.2.orig/src/Examples/example2.6.php
1313 +++ libphp-jpgraph-1.5.2/src/Examples/example2.6.php
1316 -include ("../jpgraph.php");
\r
1317 -include ("../jpgraph_line.php");
\r
1318 +include ("/usr/share/jpgraph/jpgraph.php");
\r
1319 +include ("/usr/share/jpgraph/jpgraph_line.php");
\r
1321 $ydata = array(11,-3,-8,7,5,-1,9,13,5,-7,-7);
\r
1323 --- libphp-jpgraph-1.5.2.orig/src/Examples/bartutex12.php
1324 +++ libphp-jpgraph-1.5.2/src/Examples/bartutex12.php
1326 // willing to go with the defaults. This is an illustrative example of
1327 // some of the capabilities of JpGraph.
1329 -include ("../jpgraph.php");
1330 -include ("../jpgraph_line.php");
1331 -include ("../jpgraph_bar.php");
1332 +include ("/usr/share/jpgraph/jpgraph.php");
1333 +include ("/usr/share/jpgraph/jpgraph_line.php");
1334 +include ("/usr/share/jpgraph/jpgraph_bar.php");
1337 "Jan","Feb","Mar","Apr","Maj","Jun","Jul","Aug","Sep","Okt","Nov","Dec");
1338 --- libphp-jpgraph-1.5.2.orig/src/Examples/filledline01.php
1339 +++ libphp-jpgraph-1.5.2/src/Examples/filledline01.php
1342 -include ("../jpgraph.php");
\r
1343 -include ("../jpgraph_line.php");
\r
1344 +include ("/usr/share/jpgraph/jpgraph.php");
\r
1345 +include ("/usr/share/jpgraph/jpgraph_line.php");
\r
1347 $datay = array(1.23,1.9,1.6,3.1,3.4,2.8,2.1,1.9);
\r
1348 $graph = new Graph(300,200);
\r
1349 --- libphp-jpgraph-1.5.2.orig/src/Examples/bar_csimex1.php
1350 +++ libphp-jpgraph-1.5.2/src/Examples/bar_csimex1.php
1353 -include ("../jpgraph.php");
1354 -include ("../jpgraph_bar.php");
1355 +include ("/usr/share/jpgraph/jpgraph.php");
1356 +include ("/usr/share/jpgraph/jpgraph_bar.php");
1358 $datay=array(12,26,9,17,31);
1360 --- libphp-jpgraph-1.5.2.orig/src/Examples/spiderlogex2.php
1361 +++ libphp-jpgraph-1.5.2/src/Examples/spiderlogex2.php
1364 -include ("../jpgraph.php");
1365 -include ("../jpgraph_log.php");
1366 -include ("../jpgraph_spider.php");
1367 +include ("/usr/share/jpgraph/jpgraph.php");
1368 +include ("/usr/share/jpgraph/jpgraph_log.php");
1369 +include ("/usr/share/jpgraph/jpgraph_spider.php");
1371 // Some data to plot
1372 $data = array(242,58,500,12,397,810,373);
1373 --- libphp-jpgraph-1.5.2.orig/src/Examples/example10.php
1374 +++ libphp-jpgraph-1.5.2/src/Examples/example10.php
1377 -include ("../jpgraph.php");
1378 -include ("../jpgraph_log.php");
1379 -include ("../jpgraph_line.php");
1380 +include ("/usr/share/jpgraph/jpgraph.php");
1381 +include ("/usr/share/jpgraph/jpgraph_log.php");
1382 +include ("/usr/share/jpgraph/jpgraph_line.php");
1384 $ydata = array(11,3,8,12,5,1,9,13,5,7);
1385 $y2data = array(354,200,265,99,111,91,198,225,293,251);
1386 --- libphp-jpgraph-1.5.2.orig/src/Examples/staticbandbarex7.php
1387 +++ libphp-jpgraph-1.5.2/src/Examples/staticbandbarex7.php
1390 -include ("../jpgraph.php");
1391 -include ("../jpgraph_bar.php");
1392 +include ("/usr/share/jpgraph/jpgraph.php");
1393 +include ("/usr/share/jpgraph/jpgraph_bar.php");
1395 $datay=array(12,5,19,22,17,6);
1397 --- libphp-jpgraph-1.5.2.orig/src/Examples/bargradex3.php
1398 +++ libphp-jpgraph-1.5.2/src/Examples/bargradex3.php
1401 // Example for use of JpGraph,
\r
1402 // ljp, 01/03/01 20:32
\r
1403 -include ("../jpgraph.php");
\r
1404 -include ("../jpgraph_bar.php");
\r
1405 +include ("/usr/share/jpgraph/jpgraph.php");
\r
1406 +include ("/usr/share/jpgraph/jpgraph_bar.php");
\r
1408 // We need some data
\r
1409 $datay=array(-0.13,0.25,-0.21,0.35,0.31,0.04);
\r
1410 --- libphp-jpgraph-1.5.2.orig/src/Examples/linebarex2.php
1411 +++ libphp-jpgraph-1.5.2/src/Examples/linebarex2.php
1414 -include ("../jpgraph.php");
\r
1415 -include ("../jpgraph_line.php");
\r
1416 -include ("../jpgraph_bar.php");
\r
1417 +include ("/usr/share/jpgraph/jpgraph.php");
\r
1418 +include ("/usr/share/jpgraph/jpgraph_line.php");
\r
1419 +include ("/usr/share/jpgraph/jpgraph_bar.php");
\r
1423 --- libphp-jpgraph-1.5.2.orig/src/Examples/example15.php
1424 +++ libphp-jpgraph-1.5.2/src/Examples/example15.php
1427 -include ("../jpgraph.php");
1428 -include ("../jpgraph_line.php");
1429 -include ("../jpgraph_error.php");
1430 +include ("/usr/share/jpgraph/jpgraph.php");
1431 +include ("/usr/share/jpgraph/jpgraph_line.php");
1432 +include ("/usr/share/jpgraph/jpgraph_error.php");
1434 $errdatay = array(11,9,2,4,19,26,13,19,7,12);
1435 $datax=array("Jan","Feb","Mar","Apr","May");
1436 --- libphp-jpgraph-1.5.2.orig/src/Examples/spiderex3.php
1437 +++ libphp-jpgraph-1.5.2/src/Examples/spiderex3.php
1440 - include ("../jpgraph.php");
1441 - include ("../jpgraph_spider.php");
1442 + include ("/usr/share/jpgraph/jpgraph.php");
1443 + include ("/usr/share/jpgraph/jpgraph_spider.php");
1445 // Some data to plot
1446 $data = array(55,80,46,71,95);
1447 --- libphp-jpgraph-1.5.2.orig/src/Examples/spiderex7.php
1448 +++ libphp-jpgraph-1.5.2/src/Examples/spiderex7.php
1451 - include ("../jpgraph.php");
1452 - include ("../jpgraph_spider.php");
1453 + include ("/usr/share/jpgraph/jpgraph.php");
1454 + include ("/usr/share/jpgraph/jpgraph_spider.php");
1456 $graph = new SpiderGraph(300,200,"auto");
1457 $graph->SetColor("white");
1458 --- libphp-jpgraph-1.5.2.orig/src/Examples/impulsex1.php
1459 +++ libphp-jpgraph-1.5.2/src/Examples/impulsex1.php
1462 -include ("../jpgraph.php");
1463 -include ("../jpgraph_scatter.php");
1464 +include ("/usr/share/jpgraph/jpgraph.php");
1465 +include ("/usr/share/jpgraph/jpgraph_scatter.php");
1467 $datay = array(20,22,12,13,17,20,16,19,30,31,40,43);
1468 $graph = new Graph(300,200,"auto");
1469 --- libphp-jpgraph-1.5.2.orig/src/Examples/centeredlineex03.php
1470 +++ libphp-jpgraph-1.5.2/src/Examples/centeredlineex03.php
1473 -include ("../jpgraph.php");
\r
1474 -include ("../jpgraph_line.php");
\r
1475 +include ("/usr/share/jpgraph/jpgraph.php");
\r
1476 +include ("/usr/share/jpgraph/jpgraph_line.php");
\r
1478 $labels = array("Oct 2000","Nov 2000","Dec 2000","Jan 2001","Feb 2001","Mar 2001","Apr 2001","May 2001");
\r
1479 $datay = array(1.23,1.9,1.6,3.1,3.4,2.8,2.1,1.9);
\r
1480 --- libphp-jpgraph-1.5.2.orig/src/Examples/staticbandbarex2.php
1481 +++ libphp-jpgraph-1.5.2/src/Examples/staticbandbarex2.php
1484 -include ("../jpgraph.php");
1485 -include ("../jpgraph_bar.php");
1486 +include ("/usr/share/jpgraph/jpgraph.php");
1487 +include ("/usr/share/jpgraph/jpgraph_bar.php");
1489 $datay=array(12,0,-19,-7,17,-6);
1491 --- libphp-jpgraph-1.5.2.orig/src/Examples/staticbandbarex5.php
1492 +++ libphp-jpgraph-1.5.2/src/Examples/staticbandbarex5.php
1495 -include ("../jpgraph.php");
1496 -include ("../jpgraph_bar.php");
1497 +include ("/usr/share/jpgraph/jpgraph.php");
1498 +include ("/usr/share/jpgraph/jpgraph_bar.php");
1500 $datay=array(12,0,-19,-7,17,-6);
1502 --- libphp-jpgraph-1.5.2.orig/src/Examples/example24.php
1503 +++ libphp-jpgraph-1.5.2/src/Examples/example24.php
1506 -include ("../jpgraph.php");
\r
1507 -include ("../jpgraph_bar.php");
\r
1508 +include ("/usr/share/jpgraph/jpgraph.php");
\r
1509 +include ("/usr/share/jpgraph/jpgraph_bar.php");
\r
1511 $data1y=array(12,8,19,3,10,5);
\r
1512 $data2y=array(8,2,11,7,14,4);
\r
1513 --- libphp-jpgraph-1.5.2.orig/src/Examples/bargradex1.php
1514 +++ libphp-jpgraph-1.5.2/src/Examples/bargradex1.php
1517 // Example for use of JpGraph,
1518 // ljp, 01/03/01 20:32
1519 -include ("../jpgraph.php");
1520 -include ("../jpgraph_bar.php");
1521 +include ("/usr/share/jpgraph/jpgraph.php");
1522 +include ("/usr/share/jpgraph/jpgraph_bar.php");
1524 // We need some data
1525 $datay=array(0.13,0.25,0.21,0.35,0.31,0.06);
1526 --- libphp-jpgraph-1.5.2.orig/src/Examples/example1.php
1527 +++ libphp-jpgraph-1.5.2/src/Examples/example1.php
1530 -include ("../jpgraph.php");
1531 -include ("../jpgraph_line.php");
1532 +include ("/usr/share/jpgraph/jpgraph.php");
1533 +include ("/usr/share/jpgraph/jpgraph_line.php");
1535 $ydata = array(11,3,8,12,5,1,9,13,5,7);
1537 --- libphp-jpgraph-1.5.2.orig/src/Examples/backgroundex02.php
1538 +++ libphp-jpgraph-1.5.2/src/Examples/backgroundex02.php
1541 -include ("../jpgraph.php");
1542 -include ("../jpgraph_line.php");
1543 +include ("/usr/share/jpgraph/jpgraph.php");
1544 +include ("/usr/share/jpgraph/jpgraph_line.php");
1547 $datay = array(28,19,18,23,12,11);
1548 --- libphp-jpgraph-1.5.2.orig/src/Examples/example17.php
1549 +++ libphp-jpgraph-1.5.2/src/Examples/example17.php
1552 -include ("../jpgraph.php");
\r
1553 -include ("../jpgraph_line.php");
\r
1554 +include ("/usr/share/jpgraph/jpgraph.php");
\r
1555 +include ("/usr/share/jpgraph/jpgraph_line.php");
\r
1557 $new_datay = array(11,7,5,8,3,5,5,4,8,6,5,5,3,2,5,1,2,0);
\r
1558 $inprogress_datay = array( 4,5,4,5,6,5,7,4,7,4,4,3,2,4,1,2,2,1);
\r
1559 --- libphp-jpgraph-1.5.2.orig/src/Examples/example2.1.php
1560 +++ libphp-jpgraph-1.5.2/src/Examples/example2.1.php
1563 -include ("../jpgraph.php");
1564 -include ("../jpgraph_line.php");
1565 +include ("/usr/share/jpgraph/jpgraph.php");
1566 +include ("/usr/share/jpgraph/jpgraph_line.php");
1568 $ydata = array(11,-3,-8,7,5,-1,9,13,5,-7);
1570 --- libphp-jpgraph-1.5.2.orig/src/Examples/example8.php
1571 +++ libphp-jpgraph-1.5.2/src/Examples/example8.php
1574 -include ("../jpgraph.php");
1575 -include ("../jpgraph_log.php");
1576 -include ("../jpgraph_line.php");
1577 +include ("/usr/share/jpgraph/jpgraph.php");
1578 +include ("/usr/share/jpgraph/jpgraph_log.php");
1579 +include ("/usr/share/jpgraph/jpgraph_line.php");
1581 $ydata = array(11,3,8,12,5,1,9,13,5,7);
1582 $y2data = array(354,200,265,99,111,91,198,225,293,251);
1583 --- libphp-jpgraph-1.5.2.orig/src/Examples/example2.php
1584 +++ libphp-jpgraph-1.5.2/src/Examples/example2.php
1587 -include ("../jpgraph.php");
1588 -include ("../jpgraph_line.php");
1589 +include ("/usr/share/jpgraph/jpgraph.php");
1590 +include ("/usr/share/jpgraph/jpgraph_line.php");
1593 $ydata = array(11,6,8,12,5,6,9,13,6,7);
1594 --- libphp-jpgraph-1.5.2.orig/src/Examples/text-example2.php
1595 +++ libphp-jpgraph-1.5.2/src/Examples/text-example2.php
1598 -include ("../jpgraph.php");
1599 -include ("../jpgraph_canvas.php");
1600 +include ("/usr/share/jpgraph/jpgraph.php");
1601 +include ("/usr/share/jpgraph/jpgraph_canvas.php");
1603 // Create the graph.
1604 $graph = new CanvasGraph(350,200,"auto");
projects / fusionforge / fusionforge.git / blob