[Fusionforge-commits] r14412 - in trunk/3rd-party: . php-jpgraph

Christian Bayle cbayle at fusionforge.org
Sun Sep 18 14:26:14 CEST 2011


Author: cbayle
Date: 2011-09-18 14:26:14 +0200 (Sun, 18 Sep 2011)
New Revision: 14412

Added:
   trunk/3rd-party/php-jpgraph/libphp-jpgraph_1.5.2-12.diff
Removed:
   trunk/3rd-party/php-jpgraph/libphp-jpgraph_1.5.2-12.diff.gz
Modified:
   trunk/3rd-party/Makefile.rh
   trunk/3rd-party/php-jpgraph/php-jpgraph.spec
Log:
Make rpm 3rd-party build much simpler
Remove the use of .rpmmacros
No more source code copy
No more result code copy
No more diff unzip


Modified: trunk/3rd-party/Makefile.rh
===================================================================
--- trunk/3rd-party/Makefile.rh	2011-09-18 10:38:34 UTC (rev 14411)
+++ trunk/3rd-party/Makefile.rh	2011-09-18 12:26:14 UTC (rev 14412)
@@ -4,88 +4,82 @@
 #
 # Once built, packages are in $RPM_TMP
 
-RPM_TMP=$(HOME)/rpmbuild
-DEPOT=$(HOME)/depot
+#RPM_TMP=$(HOME)/rpmbuild
+RPM_TMP=$(shell cd ..; pwd)/tmp
 BUILDRESULT=$(HOME)/fusionforge_repo
 
+HTMLPURIFYER_DIR=$(CURDIR)/php-htmlpurifier
 HTMLPURIFIER_VERSION=4.3.0
-HTMLPURIFIER_SPEC=php-htmlpurifier/php-htmlpurifier.spec
+HTMLPURIFIER_SPEC=$(HTMLPURIFYER_DIR)/php-htmlpurifier.spec
 HTMLPURIFIER_TBZ=htmlpurifier-$(HTMLPURIFIER_VERSION).tar.gz
-HTMLPURIFIER_RPM=php-htmlpurifier-$(HTMLPURIFIER_VERSION)-1.noarch.rpm
+HTMLPURIFIER_RPM=noarch/php-htmlpurifier-$(HTMLPURIFIER_VERSION)-1.noarch.rpm
 
+JPGRAPH_DIR=$(CURDIR)/php-jpgraph
+JPGRAPH_VERSION=1.5.2
+JPGRAPH_SPEC=$(JPGRAPH_DIR)/php-jpgraph.spec
+JPGRAPH_TBZ=libphp-jpgraph_$(JPGRAPH_VERSION).tar.gz
+JPGRAPH_RPM=noarch/php-jpgraph-$(JPGRAPH_VERSION)-1.noarch.rpm
+JPGRAPH_DIFF=libphp-jpgraph_$(JPGRAPH_VERSION)-12.diff
+
+WEBDAV_SERVER_DIR=$(CURDIR)/php-pear-HTTP_WebDAV_Server
 WEBDAV_SERVER_VERSION=1.0.0RC5
-WEBDAV_SERVER_SPEC=php-pear-HTTP_WebDAV_Server/php-pear-HTTP_WebDAV_Server.spec
+WEBDAV_SERVER_SPEC=$(WEBDAV_SERVER_DIR)/php-pear-HTTP_WebDAV_Server.spec
 WEBDAV_SERVER_TBZ=HTTP_WebDAV_Server-$(WEBDAV_SERVER_VERSION).tgz
-WEBDAV_SERVER_RPM=php-pear-HTTP_WebDAV_Server-$(WEBDAV_SERVER_VERSION)-1.noarch.rpm
+WEBDAV_SERVER_RPM=noarch/php-pear-HTTP_WebDAV_Server-$(WEBDAV_SERVER_VERSION)-1.noarch.rpm
 
-JPGRAPH_VERSION=1.5.2
-JPGRAPH_SPEC=php-jpgraph/php-jpgraph.spec
-JPGRAPH_TBZ=jpgraph-$(JPGRAPH_VERSION).tar.gz
-JPGRAPH_RPM=php-jpgraph-$(JPGRAPH_VERSION)-1.noarch.rpm
-JPGRAPH_DIFF=libphp-jpgraph_$(JPGRAPH_VERSION)-12.diff
+# rpmbuild --showrc | grep _topdir
+# gives
+# _builddir	%{_topdir}/BUILD
+# _buildrootdir	%{_topdir}/BUILDROOT
+# _rpmdir	%{_topdir}/RPMS
+# _sourcedir	%{_topdir}/SOURCES
+# _specdir	%{_topdir}/SPECS
+# _srcrpmdir	%{_topdir}/SRPMS
+# _topdir	%{getenv:HOME}/rpmbuild
 
-default: php-htmlpurifier php-jpgraph php-pear-HTTP_WebDAV_Server dist getselenium
+RPMBUILD=rpmbuild --define='_topdir $(RPM_TMP)' --define='_tmppath %{_topdir}' --define='_sysconfdir /etc' --define='_rpmdir $(BUILDRESULT)'
 
+default: $(HTMLPURIFYER_DIR) $(JPGRAPH_DIR) $(WEBDAV_SERVER_DIR) dist getselenium
+
 all: clean default
 
 clean:	
-	-rm -Rf $(HOME)/.rpmmacros $(RPM_TMP) $(DEPOT) $(BUILDRESULT)
+	-rm -Rf $(HOME)/.rpmmacros $(RPM_TMP) $(BUILDRESULT)
 
-rpmprep: $(HOME)/.rpmmacros
-
-$(HOME)/.rpmmacros:
-	-rm -Rf ~/.rpmmacros
-	sh ../tools/rpmdev-setuptree
-	echo '%_tmppath %{_topdir}/TMP' >> ~/.rpmmacros
-	echo '%_buildroot %{_tmppath}/%{name}-root' >> ~/.rpmmacros
-	echo '%_sysconfdir /etc' >> ~/.rpmmacros
-	[ -d $(RPM_TMP)/TMP ] || mkdir $(RPM_TMP)/TMP
-
 dist:
 	-mkdir -p $(BUILDRESULT)
-	cp $(RPM_TMP)/RPMS/noarch/*.rpm $(BUILDRESULT)
-	createrepo $(BUILDRESULT) 2>&1 | grep -v DeprecationWarning
+	createrepo $(BUILDRESULT)/noarch 2>&1 | grep -v DeprecationWarning
 
 getselenium:
 	cd selenium ; make getselenium
+
 #
 # Building RPM for external components
 #
-# PHP JPGRAPH
-php-jpgraph: rpmprep $(BUILDRESULT)/$(JPGRAPH_RPM)
-
-$(BUILDRESULT)/$(JPGRAPH_RPM): $(JPGRAPH_SPEC) $(RPM_TMP)/SOURCES/$(JPGRAPH_TBZ)
-	rpmbuild --quiet --clean -ba $(JPGRAPH_SPEC)
-
-$(RPM_TMP)/SOURCES/$(JPGRAPH_TBZ):
-	cp php-jpgraph/libphp-jpgraph_$(JPGRAPH_VERSION).orig.tar.gz $@
-	zcat php-jpgraph/$(JPGRAPH_DIFF).gz > $(RPM_TMP)/SOURCES/$(JPGRAPH_DIFF)
-	cp php-jpgraph/*.patch $(RPM_TMP)/SOURCES/
-	
 # HTML PURIFIER
-php-htmlpurifier: rpmprep $(BUILDRESULT)/$(HTMLPURIFIER_RPM)
+$(HTMLPURIFYER_DIR): $(BUILDRESULT)/$(HTMLPURIFIER_RPM)
 
-$(BUILDRESULT)/$(HTMLPURIFIER_RPM): $(HTMLPURIFIER_SPEC) $(RPM_TMP)/SOURCES/$(HTMLPURIFIER_TBZ)
-	rpmbuild --quiet --clean -ba $(HTMLPURIFIER_SPEC)
+$(BUILDRESULT)/$(HTMLPURIFIER_RPM): $(HTMLPURIFIER_SPEC) $(HTMLPURIFYER_DIR)/$(HTMLPURIFIER_TBZ)
+	$(RPMBUILD) --define='_sourcedir $(HTMLPURIFYER_DIR)' --quiet --clean -ba $(HTMLPURIFIER_SPEC)
 
-$(RPM_TMP)/SOURCES/$(HTMLPURIFIER_TBZ): $(DEPOT)/$(HTMLPURIFIER_TBZ)
-	cp $(DEPOT)/$(HTMLPURIFIER_TBZ) $@
+$(HTMLPURIFYER_DIR)/$(HTMLPURIFIER_TBZ):
+	@cd $(HTMLPURIFYER_DIR); [ -f $@ ] || wget -q -N http://htmlpurifier.org/releases/$(HTMLPURIFIER_TBZ)
 
-$(DEPOT)/$(HTMLPURIFIER_TBZ): $(DEPOT) rpmprep
-	@cd $(DEPOT); [ -f $@ ] || wget -q -N http://htmlpurifier.org/releases/$(HTMLPURIFIER_TBZ)
+# PHP JPGRAPH
+$(JPGRAPH_DIR): $(BUILDRESULT)/$(JPGRAPH_RPM)
 
+$(BUILDRESULT)/$(JPGRAPH_RPM): $(JPGRAPH_SPEC) $(JPGRAPH_DIR)/$(JPGRAPH_DIFF)
+	$(RPMBUILD) --define='_sourcedir $(JPGRAPH_DIR)' --quiet --clean -ba $(JPGRAPH_SPEC)
+
+$(JPGRAPH_DIR)/$(JPGRAPH_DIFF):
+	zcat $(JPGRAPH_DIR)/$(JPGRAPH_DIFF).gz > $(JPGRAPH_DIR)/$(JPGRAPH_DIFF)
+	
 # WEBDAV SERVER
-php-pear-HTTP_WebDAV_Server: rpmprep $(BUILDRESULT)/$(WEBDAV_SERVER_RPM)
+$(WEBDAV_SERVER_DIR): $(BUILDRESULT)/$(WEBDAV_SERVER_RPM)
 
-$(BUILDRESULT)/$(WEBDAV_SERVER_RPM): $(WEBDAV_SERVER_SPEC) $(RPM_TMP)/SOURCES/$(WEBDAV_SERVER_TBZ)
-	rpmbuild --quiet --clean -ba $(WEBDAV_SERVER_SPEC)
+$(BUILDRESULT)/$(WEBDAV_SERVER_RPM): $(WEBDAV_SERVER_SPEC) $(WEBDAV_SERVER_DIR)/$(WEBDAV_SERVER_TBZ)
+	$(RPMBUILD) --define='_sourcedir $(WEBDAV_SERVER_DIR)' -v --quiet --clean -ba $(WEBDAV_SERVER_SPEC)
 
-$(RPM_TMP)/SOURCES/$(WEBDAV_SERVER_TBZ): $(DEPOT)/$(WEBDAV_SERVER_TBZ)
-	cp $(DEPOT)/$(WEBDAV_SERVER_TBZ) $@
+$(WEBDAV_SERVER_DIR)/$(WEBDAV_SERVER_TBZ):
+	@cd $(WEBDAV_SERVER_DIR); [ -f $@ ] || wget -q -N http://download.pear.php.net/package/$(WEBDAV_SERVER_TBZ)
 
-$(DEPOT)/$(WEBDAV_SERVER_TBZ): $(DEPOT) rpmprep
-	@cd $(DEPOT); [ -f $@ ] || wget -q -N http://download.pear.php.net/package/$(WEBDAV_SERVER_TBZ)
-
-# DEPOT
-$(DEPOT):
-	@[ -d "$(DEPOT)" ] || mkdir $(DEPOT)

Added: trunk/3rd-party/php-jpgraph/libphp-jpgraph_1.5.2-12.diff
===================================================================
--- trunk/3rd-party/php-jpgraph/libphp-jpgraph_1.5.2-12.diff	                        (rev 0)
+++ trunk/3rd-party/php-jpgraph/libphp-jpgraph_1.5.2-12.diff	2011-09-18 12:26:14 UTC (rev 14412)
@@ -0,0 +1,1604 @@
+--- libphp-jpgraph-1.5.2.orig/debian/changelog
++++ libphp-jpgraph-1.5.2/debian/changelog
+@@ -0,0 +1,110 @@
++libphp-jpgraph (1.5.2-12) unstable; urgency=low
++
++  * Add support for free LIBERATION fonts
++  and depends on ttf-liberation (Thanks to Alain Peyrat) or non free 
++  alternate ttf-mscorefonts-installer (Closes: #490037)
++  * Claim support for php5 and remove php4 depends in control
++  file (Closes: #524172)
++  * Changed section from web to php
++
++ -- Christian Bayle <bayle at debian.org>  Sun, 26 Apr 2009 23:46:16 +0200
++
++libphp-jpgraph (1.5.2-11+u1) unstable; urgency=low
++
++  * Non-maintainer upload.
++  * Applied patch that prevented PHP5 compile time generated warning
++    "Non-static method called statically" to appear on screen and corrupts
++    the output of graphics. The usual error_reporting and display_errors
++    had no effect as a custom error handler was installed by the library.
++    Closes: #436289
++
++ -- Christian Hammers <ch at debian.org>  Sat, 10 Jan 2009 00:10:30 +0100
++
++libphp-jpgraph (1.5.2-11) unstable; urgency=low
++
++  * Added support for php5(-gd), reviewed all example that seems to work
++  (Closes: #424795) affected by php4-removal 
++
++ -- Christian Bayle <bayle at debian.org>  Wed, 23 May 2007 01:24:50 +0200
++
++libphp-jpgraph (1.5.2-10.1) unstable; urgency=low
++
++  * Non-Maintainer upload with maintainer consent.
++
++  * Apply patch to make $gd2 global really global (Closes: #354637).
++
++  * Bring out-of-sync debhelper version in sync to level 5.
++  * Install upstream Changelog.
++  * Update FSF address in debian/copyright.
++  * Checked for policy version 3.7.2.
++
++ -- Thijs Kinkhorst <thijs at debian.org>  Wed,  5 Jul 2006 16:51:18 +0200
++
++libphp-jpgraph (1.5.2-10) unstable; urgency=low
++
++  * msttcorefonts dir changed (in package msttcorefonts)
++  from /usr/share/fonts/truetype/ to /usr/share/fonts/truetype/msttcorefonts/
++  (Closes: #275281) 
++
++ -- Christian Bayle <bayle at debian.org>  Thu,  7 Oct 2004 21:24:42 +0200
++
++libphp-jpgraph (1.5.2-9) unstable; urgency=low
++
++  * Applied a patch proposed by Guillaume Smet that add a fake
++  SetMargin method and a doing nothing ExplodeSlice method, to make this
++  make work better with gforge package.
++  * Finnaly commented the fake SetMargin
++
++ -- Christian Bayle <bayle at debian.org>  Mon, 13 Sep 2004 22:34:42 +0200
++
++libphp-jpgraph (1.5.2-8) unstable; urgency=low
++
++  * Changed dependancy on php4-gd2 with php4-gd (Closes: #257999)
++  * I explain in copyright file why I don't upgrade to new QPLed + non 
++  commercial use clause upstream version, this is not DFSG compliant (Closes: #258104)
++
++ -- Christian Bayle <bayle at debian.org>  Wed,  1 Sep 2004 22:58:59 +0200
++
++libphp-jpgraph (1.5.2-7) unstable; urgency=low
++
++  * Added alternate depend on libapache2-mod-php4 to support apache2 
++  (closes bug#255315)
++
++ -- Christian Bayle <bayle at debian.org>  Fri, 25 Jun 2004 09:52:29 +0200
++
++libphp-jpgraph (1.5.2-6) stable; urgency=low
++
++  * Woody backport 
++
++ -- Christian Bayle <bayle at debian.org>  Thu, 15 Apr 2004 11:22:26 +0200
++
++libphp-jpgraph (1.5.2-5) unstable; urgency=low
++
++  * Changed dependancy on php4-gd for php4-gd2
++  * Changed density in jpgraph_gantt.php as suggested by Joseph Miller (joff)
++
++ -- Christian Bayle <bayle at debian.org>  Thu, 15 Apr 2004 11:20:58 +0200
++
++libphp-jpgraph (1.5.2-4) stable; urgency=low
++
++  * Woody backport 
++
++ -- Christian Bayle <bayle at debian.org>  Sat, 27 Mar 2004 17:45:25 +0100
++
++libphp-jpgraph (1.5.2-3) unstable; urgency=low
++
++  * New First upload (closes #173601) ITP
++  * This package was released by Luis Bustamante <luferbu at debian.org>
++  * Luis who allowed me to upload the package will maintain the package
++    when he will have more time to work on it.
++  * For some licensing reason it was probably rejected
++  * This is the packaging of and older GPLed release
++  * I changed cache and ttf path in ./src/jpgraph_dir.php
++  * I disabled caching in ./src/jpgraph.php
++  * I corrected imagefilledelipse broken function
++  * I corrected path in examples
++  * I corrected font names
++  * I added gantt->SetMargin function needed by gforge package
++
++ -- Christian Bayle <bayle at debian.org>  Thu, 19 Feb 2004 23:50:14 +0100
++
+--- libphp-jpgraph-1.5.2.orig/debian/libphp-jpgraph.dirs
++++ libphp-jpgraph-1.5.2/debian/libphp-jpgraph.dirs
+@@ -0,0 +1,3 @@
++usr/share/jpgraph/
++var/cache/jpgraph/
++
+--- libphp-jpgraph-1.5.2.orig/debian/compat
++++ libphp-jpgraph-1.5.2/debian/compat
+@@ -0,0 +1 @@
++5
+--- libphp-jpgraph-1.5.2.orig/debian/copyright
++++ libphp-jpgraph-1.5.2/debian/copyright
+@@ -0,0 +1,37 @@
++This package was debianized by Luis Bustamante <luferbu at fluidsignal.com> on
++Thu, 19 Dec 2002 13:48:02 -0500.
++For licensing reasons only GPLed 1.5.2 is now packaged by Christian Bayle
++<bayle at debian.org>
++
++To be clear for those that would ask why I don't upload the new 1.17 QPLed
++version. You can read on the home page:
++
++"JpGraph is released under a dual license.  QPL 1.0 (Qt Free Licensee) For
++non-commercial, open-source and educational use and JpGraph Professional
++License for commercial use."
++This is not compliant with DFSG #6 
++"The license must not restrict anyone from making use of the program in a
++specific field of endeavor. For example, it may not restrict the program from
++being used in a business, or from being used for genetic research."
++
++It was downloaded from:
++http://www.aditus.nu/jpgraph/downloads/jpgraph-1.5.2.tar.gz
++
++Upstream Author: Johan Persson <jpgraph at aditus.nu>
++Copyright (C) 2001 Johan Persson
++
++Copyright:
++  This program is free software; you can redistribute it and/or modify
++  it under the terms of the GNU General Public License as published by
++  the Free Software Foundation; either version 2 of the License, or
++  (at your option) any later version.
++
++  This program is distributed in the hope that it will be useful,
++  but WITHOUT ANY WARRANTY; without even the implied warranty of
++  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++  GNU General Public License for more details.
++
++  You should have received a copy of the GNU General Public License with
++  the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL-2;
++  if not, write to the Free Software Foundation, Inc., 51 Franklin Street,
++  Fifth Floor, Boston, MA  02110-1301, USA
+--- libphp-jpgraph-1.5.2.orig/debian/rules
++++ libphp-jpgraph-1.5.2/debian/rules
+@@ -0,0 +1,34 @@
++#!/usr/bin/make -f
++# rules for libphp-jpgraph package
++# by Luis Bustamante (luferbu at fluidsignal.com)
++
++build:
++
++clean:
++	dh_testdir
++	dh_testroot
++	dh_clean
++
++install: build
++	dh_testdir
++	dh_testroot
++	dh_clean -k
++	dh_installdirs
++	dh_install
++
++binary: binary-indep
++
++binary-arch: install
++
++binary-indep: install
++	dh_testdir
++	dh_testroot
++	dh_installdocs
++	dh_installexamples -plibphp-jpgraph-examples src/Examples/*
++	chmod 644 $(CURDIR)/debian/libphp-jpgraph-examples/usr/share/doc/libphp-jpgraph-examples/examples/*
++	dh_installchangelogs src/Changelog
++	dh_compress
++	dh_gencontrol
++	dh_md5sums
++	dh_builddeb
++
+--- libphp-jpgraph-1.5.2.orig/debian/install
++++ libphp-jpgraph-1.5.2/debian/install
+@@ -0,0 +1 @@
++src/*.php	/usr/share/jpgraph
+--- libphp-jpgraph-1.5.2.orig/debian/libphp-jpgraph.docs
++++ libphp-jpgraph-1.5.2/debian/libphp-jpgraph.docs
+@@ -0,0 +1 @@
++README
+--- libphp-jpgraph-1.5.2.orig/debian/control
++++ libphp-jpgraph-1.5.2/debian/control
+@@ -0,0 +1,33 @@
++Source: libphp-jpgraph
++Section: php
++Priority: optional
++Maintainer: Christian Bayle <bayle at debian.org>
++Build-Depends: debhelper (>= 5)
++Standards-Version: 3.8.1.0
++
++Package: libphp-jpgraph
++Architecture: all
++Depends: libapache2-mod-php5 | php5 | php5-cgi, php5-gd, ttf-liberation | ttf-mscorefonts-installer
++Description: Object oriented graph library for php5
++ JpGraph is an object oriented class library for php5. JpGraph makes
++ it easy to draw both "quick and dirty" graphs with a minimum of code
++ and complex professional graphs which requires a very fine grain
++ control. JpGraph is equally well suited for both scientific and
++ business type of graphs. Though claimed as non php5 works perfectly 
++ for all samples with php5. This is the last GPLed version, 
++ more recent version are non DFSG complianti (See copyright file).
++
++Package: libphp-jpgraph-examples
++Architecture: all
++Depends: libphp-jpgraph
++Description: Object oriented graph library for php5 (examples)
++ JpGraph is an object oriented class library for php5. JpGraph makes
++ it easy to draw both "quick and dirty" graphs with a minimum of code
++ and complex professional graphs which requires a very fine grain
++ control. JpGraph is equally well suited for both scientific and
++ business type of graphs. Though claimed as non php5 works perfectly
++ for all samples with php5. This is the last GPLed version,
++ more recent version are non DFSG complianti (See copyright file).
++ .
++ This package contains examples for using JpGraph library.
++
+--- libphp-jpgraph-1.5.2.orig/src/jpgraph_gantt.php
++++ libphp-jpgraph-1.5.2/src/jpgraph_gantt.php
+@@ -1157,9 +1157,9 @@
+ 	$this->iCaptionMargin=$aMarg;
+     }
+ 
+-    function GetLineNbr() {
+-	return 0;
+-    }
++//    function GetLineNbr() {
++//	return 0;
++//   }
+ 
+     function GetAbsHeight($aImg) {
+ 	return 0;
+@@ -1189,7 +1189,7 @@
+ 	$this->iProgress = $aProg;
+     }
+ 
+-    function SetPattern($aPattern,$aColor="blue",$aDensity=98) {		
++    function SetPattern($aPattern,$aColor="blue",$aDensity=100) {		
+ 	$this->iPattern = $aPattern;
+ 	$this->iColor = $aColor;
+ 	$this->iDensity = $aDensity;
+--- libphp-jpgraph-1.5.2.orig/src/jpgraph_dir.php
++++ libphp-jpgraph-1.5.2/src/jpgraph_dir.php
+@@ -16,7 +16,7 @@
+ //------------------------------------------------------------------
+ // The full absolute name of directory to be used as a cache. This directory MUST
+ // be readable and writable for PHP. Must end with '/'
+-DEFINE("CACHE_DIR","/tmp/jpgraph_cache/");
++DEFINE("CACHE_DIR","/var/cache/jpgraph/");
+ 
+ // The URL relative name where the cache can be found, i.e
+ // under what HTTP directory can the cache be found. Normally
+@@ -25,6 +25,9 @@
+ DEFINE("APACHE_CACHE_DIR","/jpgraph_cache/");
+ 
+ // Directory for TTF fonts. Must end with '/'
+-DEFINE("TTF_DIR","/usr/local/fonts/ttf/");
++DEFINE("TTF_DIR","/usr/share/fonts/truetype/msttcorefonts/");
++
++// Add Free liberation font as suggested by Alain Peyrat
++DEFINE("LIBERATION_DIR","/usr/share/fonts/truetype/ttf-liberation/");
+ 
+ ?>
+--- libphp-jpgraph-1.5.2.orig/src/jpgraph.php
++++ libphp-jpgraph-1.5.2/src/jpgraph.php
+@@ -30,7 +30,8 @@
+ // regenerate the image. Note that even if reading the cache is 
+ // disabled the cached will still be updated with the newly generated
+ // image. Set also "USE_CACHE" below.
+-DEFINE("READ_CACHE",true);
++//DEFINE("READ_CACHE",true);
++DEFINE("READ_CACHE",false);
+ 
+ // Should the cache be used at all? By setting this to false no
+ // files will be generated in the cache directory.  
+@@ -38,7 +39,8 @@
+ // false will still create the image in the cache directory
+ // just not use it. By setting USE_CACHE=false no files will even
+ // be generated in the cache directory.
+-DEFINE("USE_CACHE",true);
++//DEFINE("USE_CACHE",true);
++DEFINE("USE_CACHE",false);
+ 
+ // If the color palette is full should JpGraph try to allocate
+ // the closest match? If you plan on using background image or
+@@ -104,6 +106,7 @@
+ DEFINE("FF_COMIC",14);
+ DEFINE("FF_ARIAL",15);
+ DEFINE("FF_BOOK",16);
++DEFINE("FF_LIBERATION_SANS",17);
+ 
+ // TTF Font styles
+ DEFINE("FS_NORMAL",1);
+@@ -244,18 +247,20 @@
+ //user
+ //
+ if( isset($GLOBALS['php_errormsg']) ) {
+-    JpGraphError::Raise("<b>General PHP error:</b><br>".$GLOBALS['php_errormsg']);
++    // Disabled by Debian to prevent showing PHP5 warnings
++    // ("Non-static method called statically")
++    // JpGraphError::Raise("<b>General PHP error:</b><br>".$GLOBALS['php_errormsg']);
+ }
+ 
+ //
+ // Check what version of the GD library is being used
+ //
+ if(function_exists('imagecopyresampled') ) {
+-    $gd2 = true;
++    $GLOBALS['gd2'] = true;
+     $copyfunc = "imagecopyresampled";
+ } elseif(function_exists('imagecopyresized')) {
+     $copyfunc = "imagecopyresized";
+-    $gd2 = false;
++    $GLOBALS['gd2'] = false;
+ }
+ else {
+     JpGraphError::Raise("<b>JpGraph Error:</b> Your PHP installation does not 
+@@ -280,10 +285,10 @@
+ 	$img_format="gif";
+     elseif( $supported & IMG_JPG )
+ 	$img_format="jpeg";
+-    if( !isset($HTTP_SERVER_VARS['PHP_SELF']) )
++    if( !isset($_SERVER['PHP_SELF']) )
+ 	JpGraphError::Raise("<b>JpGraph Error:</b> Can't access PHP_SELF, PHP global variable. You can't run PHP from command line
+ 		if you want to use the 'auto' naming of cache or image files.");
+-    $fname=basename($HTTP_SERVER_VARS['PHP_SELF']);
++    $fname=basename($_SERVER['PHP_SELF']);
+     // Replace the ".php" extension with the image format extension
+     return substr($fname,0,strlen($fname)-4).".".$img_format;
+ }
+@@ -426,6 +431,11 @@
+ //---------------
+ // PUBLIC METHODS	
+ 
++    // OW : fake method to have reporting working
++    //function SetMargin($x1, $x2, $x3, $x4) {
++    //    return true;
++    //}
++
+     // Should the grid be in front or back of the plot?
+     function SetGridDepth($aDepth) {
+ 	$this->grid_depth=$aDepth;
+@@ -490,6 +500,8 @@
+     // Specify a background image
+     function SetBackgroundImage($aFileName,$aBgType=BKIMG_FILLPLOT,$aImgFormat="png") {
+ 
++/* CB Not any more bugging
++
+ 	if( $GLOBALS["gd2"] && !USE_TRUECOLOR ) {
+ 	    JpGraphError::Raise("<b>JpGraph Error:</b>You are using GD 2.x and are 
+ trying to use a background images on a non truecolor image. <br>
+@@ -500,6 +512,7 @@
+ using any truetype fonts with truecolor images will result in very
+ poor quality fonts.");
+ 	}
++*/
+ 
+ 	$this->background_image = $aFileName;
+ 	$this->background_image_type=$aBgType;
+@@ -1064,6 +1077,10 @@
+ 	    $this->img->Rectangle(0,0,$this->img->width-1,$this->img->height-1);		
+ 	}
+     }
++    // Set Margin by Christian Bayle
++    function SetMargin($lm,$rm,$tm,$bm) {
++    	$this->img->SetMargin($lm,$rm,$tm,$bm);
++    }
+ } // Class
+ 
+ 
+@@ -1078,13 +1095,14 @@
+     function TTF() {
+ 	// Base file names for available fonts
+ 	$this->font_fam=array(
+-	    FF_COURIER => TTF_DIR."courier",
+-	    FF_VERDANA => TTF_DIR."verdana",
+-	    FF_TIMES => TTF_DIR."times",
+-	    FF_HANDWRT => TTF_DIR."handwriting",
+-	    FF_COMIC => TTF_DIR."comic",
+-	    FF_ARIAL => TTF_DIR."arial",
+-	    FF_BOOK => TTF_DIR."bookant");
++	    FF_COURIER => TTF_DIR."Courier_New",
++	    FF_VERDANA => TTF_DIR."Verdana",
++	    FF_TIMES => TTF_DIR."Times",
++	    FF_HANDWRT => TTF_DIR."Handwriting",
++	    FF_COMIC => TTF_DIR."Comic",
++	    FF_ARIAL => TTF_DIR."Arial",
++	    FF_BOOK => TTF_DIR."Bookant",
++            FF_LIBERATION_SANS => LIBERATION_DIR."LiberationSans-Regular");
+     }
+ 
+ //---------------
+@@ -1096,11 +1114,11 @@
+ 	switch( $style ) {
+ 	    case FS_NORMAL:
+ 		break;
+-	    case FS_BOLD: $f .= "bd";
++	    case FS_BOLD: $f .= "_Bold";
+ 		break;
+-	    case FS_ITALIC: $f .= "i";
++	    case FS_ITALIC: $f .= "_Italic";
+ 		break;
+-	    case FS_BOLDIT: $f .= "bi";
++	    case FS_BOLDIT: $f .= "_Bold_Italic";
+ 		break;
+ 	    default:
+ 		JpGraphError::Raise("<b>JpGraph Error:</b> Unknown TTF Style.");
+@@ -3183,7 +3201,7 @@
+ 		}
+ 	    }
+ 	}
+-	elseif($this->font_family >= FF_COURIER && $this->font_family <= FF_BOOK)  { // TTF font
++	elseif($this->font_family >= FF_COURIER && $this->font_family <= FF_LIBERATION_SANS)  { // TTF font
+ 	    $file = $this->ttf->File($this->font_family,$this->font_style);			
+ 	    $angle=$dir;
+ 	    $bbox=ImageTTFBBox($this->font_size,$angle,$file,$txt);
+@@ -3208,7 +3226,7 @@
+ 	    }
+ 	}
+ 	else
+-	    JpGraphError::Raise("<b>JpGraph Error:</b> Unknown font font family specification. ");
++	    JpGraphError::Raise("<b>JpGraph Error:</b> Unknown font family specification: ". $this->font_family);
+     }
+ 	
+     function SetMargin($lm,$rm,$tm,$bm) {
+@@ -3490,7 +3508,16 @@
+     }
+ 	
+     function FilledCircle($xc,$yc,$r) {
+-	imagefilledellipse($this->img,$xc,$yc,2*$r,2*$r,$this->current_color);
++	if( $GLOBALS['gd2'] ) {
++		imagefilledellipse($this->img,$xc,$yc,2*$r,2*$r,$this->current_color);
++        }
++        else {
++        	for( $i=1; $i < 2*$r; $i += 2 ) {
++			$this->Arc($xc,$yc,$i,$i,0,360);
++			$this->Arc($xc,$yc,$i+1,$i,0,360);
++			$this->Arc($xc,$yc,$i+1,$i+1,0,360);
++		}
++	}
+     }
+ 	
+     // Linear Color InterPolation
+--- libphp-jpgraph-1.5.2.orig/src/jpgraph_pie3d.php
++++ libphp-jpgraph-1.5.2/src/jpgraph_pie3d.php
+@@ -88,7 +88,7 @@
+ 
+ 	
+     function ExplodeSlice($e) {
+-	JpGraphError::Raise("JpGraph Error: Exploding slices are not (yet) implemented for 3d pies graphs.");
++	//JpGraphError::Raise("JpGraph Error: Exploding slices are not (yet) implemented for 3d pies graphs.");
+ 	//$this->explode_slice=$e;
+     }
+ 	
+--- libphp-jpgraph-1.5.2.orig/src/Examples/example1.1.php
++++ libphp-jpgraph-1.5.2/src/Examples/example1.1.php
+@@ -1,8 +1,8 @@
+ <?php
+-include ("../jpgraph.php");
+-include ("../jpgraph_line.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_line.php");
+ 
+-$ydata = array(11,11,11);
++$ydata = array(11,11,11,12,12,12);
+ 
+ // Create the graph. 
+ $graph = new Graph(350,250,"auto");	
+--- libphp-jpgraph-1.5.2.orig/src/Examples/example4.php
++++ libphp-jpgraph-1.5.2/src/Examples/example4.php
+@@ -1,6 +1,6 @@
+ <?php
+-include ("../jpgraph.php");
+-include ("../jpgraph_line.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_line.php");
+ 
+ $ydata = array(11,3,8,12,5,1,9,13,5,7);
+ $ydata2 = array(1,19,15,7,22,14,5,9,21,13);
+--- libphp-jpgraph-1.5.2.orig/src/Examples/spiderex2.php
++++ libphp-jpgraph-1.5.2/src/Examples/spiderex2.php
+@@ -1,6 +1,6 @@
+ <?php
+-	include ("../jpgraph.php");
+-	include ("../jpgraph_spider.php");
++	include ("/usr/share/jpgraph/jpgraph.php");
++	include ("/usr/share/jpgraph/jpgraph_spider.php");
+ 	
+ 	// Some data to plot
+ 	$data = array(55,80,46,71,95);
+--- libphp-jpgraph-1.5.2.orig/src/Examples/linegrace.php
++++ libphp-jpgraph-1.5.2/src/Examples/linegrace.php
+@@ -1,6 +1,6 @@
+ <?php
+-include ("../jpgraph.php");
+-include ("../jpgraph_line.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_line.php");
+ 
+ $datay = array(0.2980,0.3039,0.3020,0.3027,0.3015);
+ $graph = new Graph(300,200);
+--- libphp-jpgraph-1.5.2.orig/src/Examples/bargradex5.php
++++ libphp-jpgraph-1.5.2/src/Examples/bargradex5.php
+@@ -1,9 +1,9 @@
+ <?php
+ // Example for use of JpGraph, 
+ // ljp, 01/03/01 19:44
+-include ("../jpgraph.php");
+-include ("../jpgraph_bar.php");
+-include ("../jpgraph_line.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_bar.php");
++include ("/usr/share/jpgraph/jpgraph_line.php");
+ 
+ // We need some data
+ $datay=array(0.3031,0.3044,0.3049,0.3040,0.3024,0.3047);
+--- libphp-jpgraph-1.5.2.orig/src/Examples/scatterex2.php
++++ libphp-jpgraph-1.5.2/src/Examples/scatterex2.php
+@@ -1,6 +1,6 @@
+ <?php
+-include ("../jpgraph.php");
+-include ("../jpgraph_scatter.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_scatter.php");
+ 
+ $datax = array(3.5,3.7,3,4,6.2,6,3.5,8,14,8,11.1,13.7);
+ $datay = array(20,22,12,13,17,20,16,19,30,31,40,43);
+--- libphp-jpgraph-1.5.2.orig/src/Examples/example9.php
++++ libphp-jpgraph-1.5.2/src/Examples/example9.php
+@@ -1,7 +1,7 @@
+ <?php
+-include ("../jpgraph.php");
+-include ("../jpgraph_log.php");
+-include ("../jpgraph_line.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_log.php");
++include ("/usr/share/jpgraph/jpgraph_line.php");
+ 
+ 
+ $ydata = array(11,3,8,12,5,1,9,13,5,7);
+--- libphp-jpgraph-1.5.2.orig/src/Examples/impulsex3.php
++++ libphp-jpgraph-1.5.2/src/Examples/impulsex3.php
+@@ -1,6 +1,6 @@
+ <?php
+-include ("../jpgraph.php");
+-include ("../jpgraph_scatter.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_scatter.php");
+ 
+ $numpoints=50;
+ $k=0.05;
+--- libphp-jpgraph-1.5.2.orig/src/Examples/staticbandbarex3.php
++++ libphp-jpgraph-1.5.2/src/Examples/staticbandbarex3.php
+@@ -1,6 +1,6 @@
+ <?php
+-include ("../jpgraph.php");
+-include ("../jpgraph_bar.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_bar.php");
+ 
+ $datay=array(12,0,-19,-7,17,-6);
+ 
+--- libphp-jpgraph-1.5.2.orig/src/Examples/impulsex2.php
++++ libphp-jpgraph-1.5.2/src/Examples/impulsex2.php
+@@ -1,6 +1,6 @@
+ <?php
+-include ("../jpgraph.php");
+-include ("../jpgraph_scatter.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_scatter.php");
+ 
+ $datay = array(20,22,12,13,17,20,16,19,30,31,40,43);
+ $graph = new Graph(300,200,"auto");
+--- libphp-jpgraph-1.5.2.orig/src/Examples/example19.php
++++ libphp-jpgraph-1.5.2/src/Examples/example19.php
+@@ -1,6 +1,6 @@
+ <?php
+-include ("../jpgraph.php");
+-include ("../jpgraph_bar.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_bar.php");
+ 
+ $datay=array(12,8,19,3,10,5);
+ 
+--- libphp-jpgraph-1.5.2.orig/src/Examples/negbarvalueex01.php
++++ libphp-jpgraph-1.5.2/src/Examples/negbarvalueex01.php
+@@ -1,6 +1,6 @@
+ <?php
+-include ("../jpgraph.php");
+-include ("../jpgraph_bar.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_bar.php");
+ 
+ $datay=array(12,0,-19,-7,17,-6);
+ 
+--- libphp-jpgraph-1.5.2.orig/src/Examples/pieex1.php
++++ libphp-jpgraph-1.5.2/src/Examples/pieex1.php
+@@ -1,6 +1,6 @@
+ <?php
+-include ("../jpgraph.php");
+-include ("../jpgraph_pie.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_pie.php");
+ 
+ // Some data
+ $data = array(113,5,160,3,15,10,1);
+--- libphp-jpgraph-1.5.2.orig/src/Examples/backgroundex01.php
++++ libphp-jpgraph-1.5.2/src/Examples/backgroundex01.php
+@@ -1,6 +1,6 @@
+ <?php
+-include ("../jpgraph.php");
+-include ("../jpgraph_line.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_line.php");
+ 
+ // Some data
+ $datay = array(28,19,18,23,12,11);
+--- libphp-jpgraph-1.5.2.orig/src/Examples/pieex3.php
++++ libphp-jpgraph-1.5.2/src/Examples/pieex3.php
+@@ -1,6 +1,6 @@
+ <?php
+-include ("../jpgraph.php");
+-include ("../jpgraph_pie.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_pie.php");
+ 
+ // Some data
+ $data = array(40,21,17,14,23);
+--- libphp-jpgraph-1.5.2.orig/src/Examples/linegraceex.php
++++ libphp-jpgraph-1.5.2/src/Examples/linegraceex.php
+@@ -1,6 +1,6 @@
+ <?php
+-include ("../jpgraph.php");
+-include ("../jpgraph_line.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_line.php");
+ 
+ $datay = array(0.2980,0.3039,0.3020,0.3027,0.3015);
+ 
+--- libphp-jpgraph-1.5.2.orig/src/Examples/example3.1.php
++++ libphp-jpgraph-1.5.2/src/Examples/example3.1.php
+@@ -1,6 +1,6 @@
+ <?php
+-include ("../jpgraph.php");
+-include ("../jpgraph_line.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_line.php");
+ 
+ $ydata = array(11,3,8,12,5,1,9,13,5,7);
+ 
+--- libphp-jpgraph-1.5.2.orig/src/Examples/pie3d_csimex1.php
++++ libphp-jpgraph-1.5.2/src/Examples/pie3d_csimex1.php
+@@ -1,7 +1,7 @@
+ <?php
+-include ("../jpgraph.php");
+-include ("../jpgraph_pie.php");
+-include ("../jpgraph_pie3d.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_pie.php");
++include ("/usr/share/jpgraph/jpgraph_pie3d.php");
+ 
+ // Some data
+ $data = array(40,21,17,27,23);
+--- libphp-jpgraph-1.5.2.orig/src/Examples/pieex5.php
++++ libphp-jpgraph-1.5.2/src/Examples/pieex5.php
+@@ -1,6 +1,6 @@
+ <?php
+-include ("../jpgraph.php");
+-include ("../jpgraph_pie.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_pie.php");
+ 
+ $data = array(40,60,21,33);
+ 
+--- libphp-jpgraph-1.5.2.orig/src/Examples/bargradex2.php
++++ libphp-jpgraph-1.5.2/src/Examples/bargradex2.php
+@@ -1,8 +1,8 @@
+ <?php
+ // Example for use of JpGraph, 
+ // ljp, 01/03/01 20:32
+-include ("../jpgraph.php");
+-include ("../jpgraph_bar.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_bar.php");
+ 
+ // We need some data
+ $datay=array(-0.13,0.25,-0.21,0.35,0.31,0.04);
+--- libphp-jpgraph-1.5.2.orig/src/Examples/nullvalueex01.php
++++ libphp-jpgraph-1.5.2/src/Examples/nullvalueex01.php
+@@ -1,6 +1,6 @@
+ <?php
+-include ("../jpgraph.php");
+-include ("../jpgraph_line.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_line.php");
+ 
+ // Some data
+ $datax = array("2001-04-01","2001-04-02","2001-04-03",
+--- libphp-jpgraph-1.5.2.orig/src/Examples/scatterex1.php
++++ libphp-jpgraph-1.5.2/src/Examples/scatterex1.php
+@@ -1,6 +1,6 @@
+ <?php
+-include ("../jpgraph.php");
+-include ("../jpgraph_scatter.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_scatter.php");
+ 
+ $datax = array(3.5,3.7,3,4,6.2,6,3.5,8,14,8,11.1,13.7);
+ $datay = array(20,22,12,13,17,20,16,19,30,31,40,43);
+--- libphp-jpgraph-1.5.2.orig/src/Examples/exampleex9.php
++++ libphp-jpgraph-1.5.2/src/Examples/exampleex9.php
+@@ -1,7 +1,7 @@
+ <?php
+-include ("../jpgraph.php");
+-include ("../jpgraph_log.php");
+-include ("../jpgraph_line.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_log.php");
++include ("/usr/share/jpgraph/jpgraph_line.php");
+ 
+ 
+ $ydata = array(11,3,8,12,5,1,9,13,5,7);
+--- libphp-jpgraph-1.5.2.orig/src/Examples/example18.php
++++ libphp-jpgraph-1.5.2/src/Examples/example18.php
+@@ -1,6 +1,6 @@
+ <?php
+-include ("../jpgraph.php");
+-include ("../jpgraph_bar.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_bar.php");
+ 
+ $datay=array(12,8,19,3,10,5);
+ 
+--- libphp-jpgraph-1.5.2.orig/src/Examples/staticbandbarex1.php
++++ libphp-jpgraph-1.5.2/src/Examples/staticbandbarex1.php
+@@ -1,6 +1,6 @@
+ <?php
+-include ("../jpgraph.php");
+-include ("../jpgraph_bar.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_bar.php");
+ 
+ $datay=array(12,0,-19,-7,17,-6);
+ 
+--- libphp-jpgraph-1.5.2.orig/src/Examples/example6.php
++++ libphp-jpgraph-1.5.2/src/Examples/example6.php
+@@ -1,6 +1,6 @@
+ <?php
+-include ("../jpgraph.php");
+-include ("../jpgraph_line.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_line.php");
+ 
+ $ydata = array(11,3,8,12,5,1,9,13,5,7);
+ $y2data = array(354,200,265,99,111,91,198,225,293,251);
+--- libphp-jpgraph-1.5.2.orig/src/Examples/staticbandbarex4.php
++++ libphp-jpgraph-1.5.2/src/Examples/staticbandbarex4.php
+@@ -1,6 +1,6 @@
+ <?php
+-include ("../jpgraph.php");
+-include ("../jpgraph_bar.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_bar.php");
+ 
+ $datay=array(12,0,-19,-7,17,-6);
+ 
+--- libphp-jpgraph-1.5.2.orig/src/Examples/ganttex30.php
++++ libphp-jpgraph-1.5.2/src/Examples/ganttex30.php
+@@ -1,8 +1,8 @@
+ <?php
+ // Gantt example 30
+ // $Id: ganttex30.php,v 1.2 2001/12/22 17:27:47 ljp Exp $
+-include ("../jpgraph.php");
+-include ("../jpgraph_gantt.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_gantt.php");
+ 
+ // Standard calls to create a new graph
+ $graph = new GanttGraph(-1,-1,"auto");
+--- libphp-jpgraph-1.5.2.orig/src/Examples/example20.php
++++ libphp-jpgraph-1.5.2/src/Examples/example20.php
+@@ -1,6 +1,6 @@
+ <?php
+-include ("../jpgraph.php");
+-include ("../jpgraph_bar.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_bar.php");
+ 
+ $datay=array(12,8,19,3,10,5);
+ 
+--- libphp-jpgraph-1.5.2.orig/src/Examples/text-example1.php
++++ libphp-jpgraph-1.5.2/src/Examples/text-example1.php
+@@ -1,6 +1,6 @@
+ <?php
+-include ("../jpgraph.php");
+-include ("../jpgraph_canvas.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_canvas.php");
+ 
+ // Create the graph. 
+ $graph = new CanvasGraph(350,200,"auto");	
+--- libphp-jpgraph-1.5.2.orig/src/Examples/example16.3.php
++++ libphp-jpgraph-1.5.2/src/Examples/example16.3.php
+@@ -1,8 +1,8 @@
+ <?php
+-include ("../jpgraph.php");
+-include ("../jpgraph_line.php");
+-include ("../jpgraph_error.php");
+-include ("../jpgraph_bar.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_line.php");
++include ("/usr/share/jpgraph/jpgraph_error.php");
++include ("/usr/share/jpgraph/jpgraph_bar.php");
+ 
+ $l1datay = array(11,9,2,4,3,13,17);
+ $l2datay = array(23,12,5,19,17,10,15);
+--- libphp-jpgraph-1.5.2.orig/src/Examples/example14.php
++++ libphp-jpgraph-1.5.2/src/Examples/example14.php
+@@ -1,6 +1,6 @@
+ <?php
+-include ("../jpgraph.php");
+-include ("../jpgraph_error.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_error.php");
+ 
+ $errdatay = array(11,9,2,4,19,26,13,19,7,12);
+ $datax=array("Jan","Feb","Mar","Apr","May");
+--- libphp-jpgraph-1.5.2.orig/src/Examples/example3.2.php
++++ libphp-jpgraph-1.5.2/src/Examples/example3.2.php
+@@ -1,6 +1,6 @@
+ <?php
+-include ("../jpgraph.php");
+-include ("../jpgraph_line.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_line.php");
+ 
+ $ydata = array(11,3,8,12,5,1,9,13,5,7);
+ 
+--- libphp-jpgraph-1.5.2.orig/src/Examples/example21.php
++++ libphp-jpgraph-1.5.2/src/Examples/example21.php
+@@ -1,6 +1,6 @@
+ <?php
+-include ("../jpgraph.php");
+-include ("../jpgraph_bar.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_bar.php");
+ 
+ $data1y=array(12,8,19,3,10,5);
+ $data2y=array(8,2,11,7,14,4);
+--- libphp-jpgraph-1.5.2.orig/src/Examples/example16.2.php
++++ libphp-jpgraph-1.5.2/src/Examples/example16.2.php
+@@ -1,7 +1,7 @@
+ <?php
+-include ("../jpgraph.php");
+-include ("../jpgraph_line.php");
+-include ("../jpgraph_bar.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_line.php");
++include ("/usr/share/jpgraph/jpgraph_bar.php");
+ 
+ $l1datay = array(11,9,2,4,3,13,17);
+ $l2datay = array(23,12,5,19,17,10,15);
+--- libphp-jpgraph-1.5.2.orig/src/Examples/example2.5.php
++++ libphp-jpgraph-1.5.2/src/Examples/example2.5.php
+@@ -1,6 +1,6 @@
+ <?php
+-include ("../jpgraph.php");
+-include ("../jpgraph_line.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_line.php");
+ 
+ $ydata = array(11,-3,-8,7,5,-1,9,13,5,-7);
+ 
+--- libphp-jpgraph-1.5.2.orig/src/Examples/spiderex6.php
++++ libphp-jpgraph-1.5.2/src/Examples/spiderex6.php
+@@ -1,6 +1,6 @@
+ <?php
+-	include ("../jpgraph.php");
+-	include ("../jpgraph_spider.php");
++	include ("/usr/share/jpgraph/jpgraph.php");
++	include ("/usr/share/jpgraph/jpgraph_spider.php");
+ 	
+ 	// Some data to plot
+ 	$data = array(55,80,46,21,95);
+--- libphp-jpgraph-1.5.2.orig/src/Examples/centeredlineex01.php
++++ libphp-jpgraph-1.5.2/src/Examples/centeredlineex01.php
+@@ -1,7 +1,7 @@
+ <?php
+-include ("../jpgraph.php");
+-include ("../jpgraph_line.php");
+-include ("../jpgraph_error.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_line.php");
++include ("/usr/share/jpgraph/jpgraph_error.php");
+ 
+ 
+ //$datax = array(3.5,3.7,3,4,6.2,6,3.5,8,14,8,11.1,13.7);
+--- libphp-jpgraph-1.5.2.orig/src/Examples/example23.php
++++ libphp-jpgraph-1.5.2/src/Examples/example23.php
+@@ -1,6 +1,6 @@
+ <?php
+-include ("../jpgraph.php");
+-include ("../jpgraph_bar.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_bar.php");
+ 
+ $data1y=array(12,8,19,3,10,5);
+ $data2y=array(8,2,11,7,14,4);
+--- libphp-jpgraph-1.5.2.orig/src/Examples/pieex4.php
++++ libphp-jpgraph-1.5.2/src/Examples/pieex4.php
+@@ -1,6 +1,6 @@
+ <?php
+-include ("../jpgraph.php");
+-include ("../jpgraph_pie.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_pie.php");
+ 
+ $data = array(40,60,21,33);
+ 
+--- libphp-jpgraph-1.5.2.orig/src/Examples/example5.php
++++ libphp-jpgraph-1.5.2/src/Examples/example5.php
+@@ -1,6 +1,6 @@
+ <?php
+-include ("../jpgraph.php");
+-include ("../jpgraph_line.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_line.php");
+ 
+ $ydata = array(11,3,8,12,5,1,9,13,5,7);
+ $y2data = array(354,200,265,99,111,91,198,225,293,251);
+--- libphp-jpgraph-1.5.2.orig/src/Examples/spiderex6.1.php
++++ libphp-jpgraph-1.5.2/src/Examples/spiderex6.1.php
+@@ -1,6 +1,6 @@
+ <?php
+-	include ("../jpgraph.php");
+-	include ("../jpgraph_spider.php");
++	include ("/usr/share/jpgraph/jpgraph.php");
++	include ("/usr/share/jpgraph/jpgraph_spider.php");
+ 	
+ 	// Some data to plot
+ 	$data = array(55,80,46,21,95);
+--- libphp-jpgraph-1.5.2.orig/src/Examples/example7.php
++++ libphp-jpgraph-1.5.2/src/Examples/example7.php
+@@ -1,7 +1,7 @@
+ <?php
+-include ("../jpgraph.php");
+-include ("../jpgraph_log.php");
+-include ("../jpgraph_line.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_log.php");
++include ("/usr/share/jpgraph/jpgraph_line.php");
+ 
+ $ydata = array(11,3,8,12,5,1,9,13,5,7);
+ $y2data = array(354,200,265,99,111,91,198,225,293,251);
+--- libphp-jpgraph-1.5.2.orig/src/Examples/spiderex4.php
++++ libphp-jpgraph-1.5.2/src/Examples/spiderex4.php
+@@ -1,6 +1,6 @@
+ <?php
+-	include ("../jpgraph.php");
+-	include ("../jpgraph_spider.php");
++	include ("/usr/share/jpgraph/jpgraph.php");
++	include ("/usr/share/jpgraph/jpgraph_spider.php");
+ 	
+ 	// Some data to plot
+ 	$data = array(55,80,46,21,95);
+--- libphp-jpgraph-1.5.2.orig/src/Examples/example13.php
++++ libphp-jpgraph-1.5.2/src/Examples/example13.php
+@@ -1,6 +1,6 @@
+ <?php
+-include ("../jpgraph.php");
+-include ("../jpgraph_error.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_error.php");
+ 
+ $errdatay = array(11,9,2,4,19,26,13,19,7,12);
+ $datax=array("Jan","Feb","Mar","Apr","May");
+--- libphp-jpgraph-1.5.2.orig/src/Examples/example22.php
++++ libphp-jpgraph-1.5.2/src/Examples/example22.php
+@@ -1,6 +1,6 @@
+ <?php
+-include ("../jpgraph.php");
+-include ("../jpgraph_bar.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_bar.php");
+ 
+ $data1y=array(12,8,19,3,10,5);
+ $data2y=array(8,2,11,7,14,4);
+--- libphp-jpgraph-1.5.2.orig/src/Examples/spiderlogex1.php
++++ libphp-jpgraph-1.5.2/src/Examples/spiderlogex1.php
+@@ -1,7 +1,7 @@
+ <?php
+-include ("../jpgraph.php");
+-include ("../jpgraph_log.php");
+-include ("../jpgraph_spider.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_log.php");
++include ("/usr/share/jpgraph/jpgraph_spider.php");
+ 
+ // Some data to plot
+ $data = array(242,58,1500,12,1397,810,373);
+--- libphp-jpgraph-1.5.2.orig/src/Examples/example16.1.php
++++ libphp-jpgraph-1.5.2/src/Examples/example16.1.php
+@@ -1,8 +1,8 @@
+ <?php
+-include ("../jpgraph.php");
+-include ("../jpgraph_line.php");
+-include ("../jpgraph_error.php");
+-include ("../jpgraph_bar.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_line.php");
++include ("/usr/share/jpgraph/jpgraph_error.php");
++include ("/usr/share/jpgraph/jpgraph_bar.php");
+ 
+ $l1datay = array(11,9,2,4,3,13,17);
+ $l2datay = array(23,12,5,19,17,10,15);
+--- libphp-jpgraph-1.5.2.orig/src/Examples/bargradex4.php
++++ libphp-jpgraph-1.5.2/src/Examples/bargradex4.php
+@@ -1,8 +1,8 @@
+ <?php
+ // Example for use of JpGraph, 
+ // ljp, 01/03/01 19:44
+-include ("../jpgraph.php");
+-include ("../jpgraph_bar.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_bar.php");
+ 
+ // We need some data
+ $datay=array(0.3031,0.3044,0.3049,0.3040,0.3024,0.3047);
+--- libphp-jpgraph-1.5.2.orig/src/Examples/pieex2.php
++++ libphp-jpgraph-1.5.2/src/Examples/pieex2.php
+@@ -1,6 +1,6 @@
+ <?php
+-include ("../jpgraph.php");
+-include ("../jpgraph_pie.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_pie.php");
+ 
+ // Some data
+ $data = array(40,21,17,14,23);
+--- libphp-jpgraph-1.5.2.orig/src/Examples/rotateex1.php
++++ libphp-jpgraph-1.5.2/src/Examples/rotateex1.php
+@@ -1,6 +1,6 @@
+ <?php
+-include ("../jpgraph.php");
+-include ("../jpgraph_line.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_line.php");
+ 
+ $ydata = array(11,3,8,12,5,1,9,13,5,7);
+ $y2data = array(354,200,265,99,111,91,198,225,293,251);
+--- libphp-jpgraph-1.5.2.orig/src/Examples/filledlineex01.php
++++ libphp-jpgraph-1.5.2/src/Examples/filledlineex01.php
+@@ -1,6 +1,6 @@
+ <?php
+-include ("../jpgraph.php");
+-include ("../jpgraph_line.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_line.php");
+ 
+ $datay = array(1.23,1.9,1.6,3.1,3.4,2.8,2.1,1.9);
+ $graph = new Graph(300,200,"auto");
+--- libphp-jpgraph-1.5.2.orig/src/Examples/spiderex1.php
++++ libphp-jpgraph-1.5.2/src/Examples/spiderex1.php
+@@ -1,6 +1,6 @@
+ <?php
+-	include ("../jpgraph.php");
+-	include ("../jpgraph_spider.php");
++	include ("/usr/share/jpgraph/jpgraph.php");
++	include ("/usr/share/jpgraph/jpgraph_spider.php");
+ 	
+ 	// Some data to plot
+ 	$data = array(55,80,46,71,95);
+--- libphp-jpgraph-1.5.2.orig/src/Examples/bar_csimex2.php
++++ libphp-jpgraph-1.5.2/src/Examples/bar_csimex2.php
+@@ -1,6 +1,6 @@
+ <?php
+-include ("../jpgraph.php");
+-include ("../jpgraph_bar.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_bar.php");
+ 
+ $data1y=array(12,8,19,3,10,5);
+ $data2y=array(8,2,12,7,14,4);
+--- libphp-jpgraph-1.5.2.orig/src/Examples/staticlinebarex1.php
++++ libphp-jpgraph-1.5.2/src/Examples/staticlinebarex1.php
+@@ -1,6 +1,6 @@
+ <?php
+-include ("../jpgraph.php");
+-include ("../jpgraph_bar.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_bar.php");
+ 
+ $datay=array(12,0,-19,-7,17,-6);
+ 
+--- libphp-jpgraph-1.5.2.orig/src/Examples/linebarex1.php
++++ libphp-jpgraph-1.5.2/src/Examples/linebarex1.php
+@@ -1,7 +1,7 @@
+ <?php
+-include ("../jpgraph.php");
+-include ("../jpgraph_line.php");
+-include ("../jpgraph_bar.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_line.php");
++include ("/usr/share/jpgraph/jpgraph_bar.php");
+ 
+ $month=array(
+ "Jan","Feb","Mar","Apr","Maj","Jun","Jul","Aug","Sep","Okt","Nov","Dec");
+--- libphp-jpgraph-1.5.2.orig/src/Examples/staticbandbarex6.php
++++ libphp-jpgraph-1.5.2/src/Examples/staticbandbarex6.php
+@@ -1,6 +1,6 @@
+ <?php
+-include ("../jpgraph.php");
+-include ("../jpgraph_bar.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_bar.php");
+ 
+ $datay=array(12,0,-19,-7,17,-6);
+ 
+--- libphp-jpgraph-1.5.2.orig/src/Examples/example1.2.php
++++ libphp-jpgraph-1.5.2/src/Examples/example1.2.php
+@@ -1,6 +1,6 @@
+ <?php
+-include ("../jpgraph.php");
+-include ("../jpgraph_line.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_line.php");
+ 
+ $ydata = array(11,3,8,12,5,1,9,13,5,7);
+ 
+--- libphp-jpgraph-1.5.2.orig/src/Examples/backgroundex03.php
++++ libphp-jpgraph-1.5.2/src/Examples/backgroundex03.php
+@@ -1,6 +1,6 @@
+ <?php
+-include ("../jpgraph.php");
+-include ("../jpgraph_line.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_line.php");
+ 
+ // Some data
+ $datay = array(28,19,18,23,12,11);
+--- libphp-jpgraph-1.5.2.orig/src/Examples/centeredlineex02.php
++++ libphp-jpgraph-1.5.2/src/Examples/centeredlineex02.php
+@@ -1,7 +1,7 @@
+ <?php
+-include ("../jpgraph.php");
+-include ("../jpgraph_line.php");
+-include ("../jpgraph_error.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_line.php");
++include ("/usr/share/jpgraph/jpgraph_error.php");
+ 
+ 
+ //$datax = array(3.5,3.7,3,4,6.2,6,3.5,8,14,8,11.1,13.7);
+--- libphp-jpgraph-1.5.2.orig/src/Examples/scatterlinkex2.php
++++ libphp-jpgraph-1.5.2/src/Examples/scatterlinkex2.php
+@@ -1,6 +1,6 @@
+ <?php
+-include ("../jpgraph.php");
+-include ("../jpgraph_scatter.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_scatter.php");
+ 
+ 
+ // Make a circle with a scatterplot
+--- libphp-jpgraph-1.5.2.orig/src/Examples/spiderex5.php
++++ libphp-jpgraph-1.5.2/src/Examples/spiderex5.php
+@@ -1,6 +1,6 @@
+ <?php
+-	include ("../jpgraph.php");
+-	include ("../jpgraph_spider.php");
++	include ("/usr/share/jpgraph/jpgraph.php");
++	include ("/usr/share/jpgraph/jpgraph_spider.php");
+ 	
+ 	// Some data to plot
+ 	$data = array(55,80,46,21,95);
+--- libphp-jpgraph-1.5.2.orig/src/Examples/impulsex4.php
++++ libphp-jpgraph-1.5.2/src/Examples/impulsex4.php
+@@ -1,7 +1,7 @@
+ <?php
+-include ("../jpgraph.php");
+-include ("../jpgraph_scatter.php");
+-include ("../jpgraph_line.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_scatter.php");
++include ("/usr/share/jpgraph/jpgraph_line.php");
+ 
+ $numpoints=50;
+ $k=0.05;
+--- libphp-jpgraph-1.5.2.orig/src/Examples/bargradex6.php
++++ libphp-jpgraph-1.5.2/src/Examples/bargradex6.php
+@@ -1,8 +1,8 @@
+ <?php
+ // Example for use of JpGraph, 
+ // ljp, 01/03/01 20:32
+-include ("../jpgraph.php");
+-include ("../jpgraph_bar.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_bar.php");
+ 
+ // We need some data
+ $datay=array(-0.13,0.25,-0.21,0.35,0.31,0.04);
+--- libphp-jpgraph-1.5.2.orig/src/Examples/example3.php
++++ libphp-jpgraph-1.5.2/src/Examples/example3.php
+@@ -1,6 +1,6 @@
+ <?php
+-include ("../jpgraph.php");
+-include ("../jpgraph_line.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_line.php");
+ 
+ $ydata = array(11,3,8,12,5,1,9,13,5,7);
+ 
+--- libphp-jpgraph-1.5.2.orig/src/Examples/pie_csimex1.php
++++ libphp-jpgraph-1.5.2/src/Examples/pie_csimex1.php
+@@ -1,6 +1,6 @@
+ <?php
+-include ("../jpgraph.php");
+-include ("../jpgraph_pie.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_pie.php");
+ 
+ // Some data
+ $data = array(40,21,17,14,23);
+--- libphp-jpgraph-1.5.2.orig/src/Examples/example16.php
++++ libphp-jpgraph-1.5.2/src/Examples/example16.php
+@@ -1,7 +1,7 @@
+ <?php
+-include ("../jpgraph.php");
+-include ("../jpgraph_line.php");
+-include ("../jpgraph_error.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_line.php");
++include ("/usr/share/jpgraph/jpgraph_error.php");
+ 
+ $errdatay = array(11,9,2,4,19,26,13,19,7,12);
+ $datax=array("Jan","Feb","Mar","Apr","May");
+--- libphp-jpgraph-1.5.2.orig/src/Examples/pieex6.php
++++ libphp-jpgraph-1.5.2/src/Examples/pieex6.php
+@@ -1,6 +1,6 @@
+ <?php
+-include ("../jpgraph.php");
+-include ("../jpgraph_pie.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_pie.php");
+ 
+ // Some data
+ $data = array(27,23,47,17);
+--- libphp-jpgraph-1.5.2.orig/src/Examples/pie3dex1.php
++++ libphp-jpgraph-1.5.2/src/Examples/pie3dex1.php
+@@ -1,7 +1,7 @@
+ <?php
+-include ("../jpgraph.php");
+-include ("../jpgraph_pie.php");
+-include ("../jpgraph_pie3d.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_pie.php");
++include ("/usr/share/jpgraph/jpgraph_pie3d.php");
+ 
+ // Some data
+ $data = array(20,27,45,75,90);
+--- libphp-jpgraph-1.5.2.orig/src/Examples/linebarex3.php
++++ libphp-jpgraph-1.5.2/src/Examples/linebarex3.php
+@@ -1,7 +1,7 @@
+ <?php
+-include ("../jpgraph.php");
+-include ("../jpgraph_line.php");
+-include ("../jpgraph_bar.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_line.php");
++include ("/usr/share/jpgraph/jpgraph_bar.php");
+ 
+ // Some data
+ 
+--- libphp-jpgraph-1.5.2.orig/src/Examples/scatterlinkex1.php
++++ libphp-jpgraph-1.5.2/src/Examples/scatterlinkex1.php
+@@ -1,6 +1,6 @@
+ <?php
+-include ("../jpgraph.php");
+-include ("../jpgraph_scatter.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_scatter.php");
+ 
+ $datax = array(3.5,3.7,3,4,6.2,6,3.5,8,14,8,11.1,13.7);
+ $datay = array(20,22,12,13,17,20,16,19,30,31,40,43);
+--- libphp-jpgraph-1.5.2.orig/src/Examples/example2.6.php
++++ libphp-jpgraph-1.5.2/src/Examples/example2.6.php
+@@ -1,6 +1,6 @@
+ <?php
+-include ("../jpgraph.php");
+-include ("../jpgraph_line.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_line.php");
+ 
+ $ydata = array(11,-3,-8,7,5,-1,9,13,5,-7,-7);
+ 
+--- libphp-jpgraph-1.5.2.orig/src/Examples/bartutex12.php
++++ libphp-jpgraph-1.5.2/src/Examples/bartutex12.php
+@@ -4,9 +4,9 @@
+ // willing to go with the defaults. This is an illustrative example of
+ // some of the capabilities of JpGraph.
+ 
+-include ("../jpgraph.php");
+-include ("../jpgraph_line.php");
+-include ("../jpgraph_bar.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_line.php");
++include ("/usr/share/jpgraph/jpgraph_bar.php");
+ 
+ $month=array(
+ "Jan","Feb","Mar","Apr","Maj","Jun","Jul","Aug","Sep","Okt","Nov","Dec");
+--- libphp-jpgraph-1.5.2.orig/src/Examples/filledline01.php
++++ libphp-jpgraph-1.5.2/src/Examples/filledline01.php
+@@ -1,6 +1,6 @@
+ <?php
+-include ("../jpgraph.php");
+-include ("../jpgraph_line.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_line.php");
+ 
+ $datay = array(1.23,1.9,1.6,3.1,3.4,2.8,2.1,1.9);
+ $graph = new Graph(300,200);
+--- libphp-jpgraph-1.5.2.orig/src/Examples/bar_csimex1.php
++++ libphp-jpgraph-1.5.2/src/Examples/bar_csimex1.php
+@@ -1,6 +1,6 @@
+ <?php
+-include ("../jpgraph.php");
+-include ("../jpgraph_bar.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_bar.php");
+ 
+ $datay=array(12,26,9,17,31);
+ 
+--- libphp-jpgraph-1.5.2.orig/src/Examples/spiderlogex2.php
++++ libphp-jpgraph-1.5.2/src/Examples/spiderlogex2.php
+@@ -1,7 +1,7 @@
+ <?php
+-include ("../jpgraph.php");
+-include ("../jpgraph_log.php");
+-include ("../jpgraph_spider.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_log.php");
++include ("/usr/share/jpgraph/jpgraph_spider.php");
+ 
+ // Some data to plot
+ $data = array(242,58,500,12,397,810,373);
+--- libphp-jpgraph-1.5.2.orig/src/Examples/example10.php
++++ libphp-jpgraph-1.5.2/src/Examples/example10.php
+@@ -1,7 +1,7 @@
+ <?php
+-include ("../jpgraph.php");
+-include ("../jpgraph_log.php");
+-include ("../jpgraph_line.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_log.php");
++include ("/usr/share/jpgraph/jpgraph_line.php");
+ 
+ $ydata = array(11,3,8,12,5,1,9,13,5,7);
+ $y2data = array(354,200,265,99,111,91,198,225,293,251);
+--- libphp-jpgraph-1.5.2.orig/src/Examples/staticbandbarex7.php
++++ libphp-jpgraph-1.5.2/src/Examples/staticbandbarex7.php
+@@ -1,6 +1,6 @@
+ <?php
+-include ("../jpgraph.php");
+-include ("../jpgraph_bar.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_bar.php");
+ 
+ $datay=array(12,5,19,22,17,6);
+ 
+--- libphp-jpgraph-1.5.2.orig/src/Examples/bargradex3.php
++++ libphp-jpgraph-1.5.2/src/Examples/bargradex3.php
+@@ -1,8 +1,8 @@
+ <?php
+ // Example for use of JpGraph, 
+ // ljp, 01/03/01 20:32
+-include ("../jpgraph.php");
+-include ("../jpgraph_bar.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_bar.php");
+ 
+ // We need some data
+ $datay=array(-0.13,0.25,-0.21,0.35,0.31,0.04);
+--- libphp-jpgraph-1.5.2.orig/src/Examples/linebarex2.php
++++ libphp-jpgraph-1.5.2/src/Examples/linebarex2.php
+@@ -1,7 +1,7 @@
+ <?php
+-include ("../jpgraph.php");
+-include ("../jpgraph_line.php");
+-include ("../jpgraph_bar.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_line.php");
++include ("/usr/share/jpgraph/jpgraph_bar.php");
+ 
+ // Some data
+ 
+--- libphp-jpgraph-1.5.2.orig/src/Examples/example15.php
++++ libphp-jpgraph-1.5.2/src/Examples/example15.php
+@@ -1,7 +1,7 @@
+ <?php
+-include ("../jpgraph.php");
+-include ("../jpgraph_line.php");
+-include ("../jpgraph_error.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_line.php");
++include ("/usr/share/jpgraph/jpgraph_error.php");
+ 
+ $errdatay = array(11,9,2,4,19,26,13,19,7,12);
+ $datax=array("Jan","Feb","Mar","Apr","May");
+--- libphp-jpgraph-1.5.2.orig/src/Examples/spiderex3.php
++++ libphp-jpgraph-1.5.2/src/Examples/spiderex3.php
+@@ -1,6 +1,6 @@
+ <?php
+-	include ("../jpgraph.php");
+-	include ("../jpgraph_spider.php");
++	include ("/usr/share/jpgraph/jpgraph.php");
++	include ("/usr/share/jpgraph/jpgraph_spider.php");
+ 	
+ 	// Some data to plot
+ 	$data = array(55,80,46,71,95);
+--- libphp-jpgraph-1.5.2.orig/src/Examples/spiderex7.php
++++ libphp-jpgraph-1.5.2/src/Examples/spiderex7.php
+@@ -1,6 +1,6 @@
+ <?php
+-	include ("../jpgraph.php");
+-	include ("../jpgraph_spider.php");
++	include ("/usr/share/jpgraph/jpgraph.php");
++	include ("/usr/share/jpgraph/jpgraph_spider.php");
+ 	
+ 	$graph = new SpiderGraph(300,200,"auto");
+ 	$graph->SetColor("white");
+--- libphp-jpgraph-1.5.2.orig/src/Examples/impulsex1.php
++++ libphp-jpgraph-1.5.2/src/Examples/impulsex1.php
+@@ -1,6 +1,6 @@
+ <?php
+-include ("../jpgraph.php");
+-include ("../jpgraph_scatter.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_scatter.php");
+ 
+ $datay = array(20,22,12,13,17,20,16,19,30,31,40,43);
+ $graph = new Graph(300,200,"auto");
+--- libphp-jpgraph-1.5.2.orig/src/Examples/centeredlineex03.php
++++ libphp-jpgraph-1.5.2/src/Examples/centeredlineex03.php
+@@ -1,6 +1,6 @@
+ <?php
+-include ("../jpgraph.php");
+-include ("../jpgraph_line.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_line.php");
+ 
+ $labels = array("Oct 2000","Nov 2000","Dec 2000","Jan 2001","Feb 2001","Mar 2001","Apr 2001","May 2001");
+ $datay = array(1.23,1.9,1.6,3.1,3.4,2.8,2.1,1.9);
+--- libphp-jpgraph-1.5.2.orig/src/Examples/staticbandbarex2.php
++++ libphp-jpgraph-1.5.2/src/Examples/staticbandbarex2.php
+@@ -1,6 +1,6 @@
+ <?php
+-include ("../jpgraph.php");
+-include ("../jpgraph_bar.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_bar.php");
+ 
+ $datay=array(12,0,-19,-7,17,-6);
+ 
+--- libphp-jpgraph-1.5.2.orig/src/Examples/staticbandbarex5.php
++++ libphp-jpgraph-1.5.2/src/Examples/staticbandbarex5.php
+@@ -1,6 +1,6 @@
+ <?php
+-include ("../jpgraph.php");
+-include ("../jpgraph_bar.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_bar.php");
+ 
+ $datay=array(12,0,-19,-7,17,-6);
+ 
+--- libphp-jpgraph-1.5.2.orig/src/Examples/example24.php
++++ libphp-jpgraph-1.5.2/src/Examples/example24.php
+@@ -1,6 +1,6 @@
+ <?php
+-include ("../jpgraph.php");
+-include ("../jpgraph_bar.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_bar.php");
+ 
+ $data1y=array(12,8,19,3,10,5);
+ $data2y=array(8,2,11,7,14,4);
+--- libphp-jpgraph-1.5.2.orig/src/Examples/bargradex1.php
++++ libphp-jpgraph-1.5.2/src/Examples/bargradex1.php
+@@ -1,8 +1,8 @@
+ <?php
+ // Example for use of JpGraph, 
+ // ljp, 01/03/01 20:32
+-include ("../jpgraph.php");
+-include ("../jpgraph_bar.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_bar.php");
+ 
+ // We need some data
+ $datay=array(0.13,0.25,0.21,0.35,0.31,0.06);
+--- libphp-jpgraph-1.5.2.orig/src/Examples/example1.php
++++ libphp-jpgraph-1.5.2/src/Examples/example1.php
+@@ -1,6 +1,6 @@
+ <?php
+-include ("../jpgraph.php");
+-include ("../jpgraph_line.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_line.php");
+ 
+ $ydata = array(11,3,8,12,5,1,9,13,5,7);
+ 
+--- libphp-jpgraph-1.5.2.orig/src/Examples/backgroundex02.php
++++ libphp-jpgraph-1.5.2/src/Examples/backgroundex02.php
+@@ -1,6 +1,6 @@
+ <?php
+-include ("../jpgraph.php");
+-include ("../jpgraph_line.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_line.php");
+ 
+ // Some data
+ $datay = array(28,19,18,23,12,11);
+--- libphp-jpgraph-1.5.2.orig/src/Examples/example17.php
++++ libphp-jpgraph-1.5.2/src/Examples/example17.php
+@@ -1,6 +1,6 @@
+ <?php
+-include ("../jpgraph.php");
+-include ("../jpgraph_line.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_line.php");
+ 
+ $new_datay = 			array(11,7,5,8,3,5,5,4,8,6,5,5,3,2,5,1,2,0);
+ $inprogress_datay = 	array( 4,5,4,5,6,5,7,4,7,4,4,3,2,4,1,2,2,1);
+--- libphp-jpgraph-1.5.2.orig/src/Examples/example2.1.php
++++ libphp-jpgraph-1.5.2/src/Examples/example2.1.php
+@@ -1,6 +1,6 @@
+ <?php
+-include ("../jpgraph.php");
+-include ("../jpgraph_line.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_line.php");
+ 
+ $ydata = array(11,-3,-8,7,5,-1,9,13,5,-7);
+ 
+--- libphp-jpgraph-1.5.2.orig/src/Examples/example8.php
++++ libphp-jpgraph-1.5.2/src/Examples/example8.php
+@@ -1,7 +1,7 @@
+ <?php
+-include ("../jpgraph.php");
+-include ("../jpgraph_log.php");
+-include ("../jpgraph_line.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_log.php");
++include ("/usr/share/jpgraph/jpgraph_line.php");
+ 
+ $ydata = array(11,3,8,12,5,1,9,13,5,7);
+ $y2data = array(354,200,265,99,111,91,198,225,293,251);
+--- libphp-jpgraph-1.5.2.orig/src/Examples/example2.php
++++ libphp-jpgraph-1.5.2/src/Examples/example2.php
+@@ -1,6 +1,6 @@
+ <?php
+-include ("../jpgraph.php");
+-include ("../jpgraph_line.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_line.php");
+ 
+ 
+ $ydata = array(11,6,8,12,5,6,9,13,6,7);
+--- libphp-jpgraph-1.5.2.orig/src/Examples/text-example2.php
++++ libphp-jpgraph-1.5.2/src/Examples/text-example2.php
+@@ -1,6 +1,6 @@
+ <?php
+-include ("../jpgraph.php");
+-include ("../jpgraph_canvas.php");
++include ("/usr/share/jpgraph/jpgraph.php");
++include ("/usr/share/jpgraph/jpgraph_canvas.php");
+ 
+ // Create the graph. 
+ $graph = new CanvasGraph(350,200,"auto");	

Deleted: trunk/3rd-party/php-jpgraph/libphp-jpgraph_1.5.2-12.diff.gz
===================================================================
(Binary files differ)

Modified: trunk/3rd-party/php-jpgraph/php-jpgraph.spec
===================================================================
--- trunk/3rd-party/php-jpgraph/php-jpgraph.spec	2011-09-18 10:38:34 UTC (rev 14411)
+++ trunk/3rd-party/php-jpgraph/php-jpgraph.spec	2011-09-18 12:26:14 UTC (rev 14412)
@@ -11,7 +11,8 @@
 Group: Development/Languages
 URL: http://www.aditus.nu/jpgraph/
 
-Source: http://members.chello.se/jpgraph/jpgdownloads/jpgraph-%{version}.tar.gz
+#Source: http://members.chello.se/jpgraph/jpgdownloads/jpgraph-%{version}.tar.gz
+Source: libphp-jpgraph_%{version}.orig.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildArch: noarch




More information about the Fusionforge-commits mailing list