[SCM] GeoGebra: Dynamic mathematics software for education branch, build, updated. 016e2d565c99e13a52407a389488311f44da5579

[Giovanni Mascellani]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GeoGebra: Dynamic mathematics software for education".

The branch, build has been updated
       via  016e2d565c99e13a52407a389488311f44da5579 (commit)
      from  ad7595470ae7b4370eb2bd46427b08641ba9e24e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 016e2d565c99e13a52407a389488311f44da5579
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Sat Mar 13 00:15:53 2010 +0100

    Patches updated

-----------------------------------------------------------------------

Summary of changes:
 debian/patches/patch/build.xml.diff |   35 +++++++++++++++++++++--------------
 1 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/debian/patches/patch/build.xml.diff b/debian/patches/patch/build.xml.diff
index c0c5151..7109220 100644
--- a/debian/patches/patch/build.xml.diff
+++ b/debian/patches/patch/build.xml.diff
@@ -6,11 +6,11 @@ Fixes the build.xml for just building GeoGebra.
 Signed-off-by: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
 
 ---
- build.xml |  313 ++++++++----------------------------------------------------
- 1 files changed, 42 insertions(+), 271 deletions(-)
+ build.xml |  320 ++++++++++---------------------------------------------------
+ 1 files changed, 49 insertions(+), 271 deletions(-)
 
 diff --git a/build.xml b/build.xml
-index 7081f5f..50fa6b0 100644
+index 7081f5f..31ea2ae 100644
 --- a/build.xml
 +++ b/build.xml
 @@ -38,22 +38,31 @@ office at geogebra.org
@@ -57,7 +57,7 @@ index 7081f5f..50fa6b0 100644
  	
  	<!-- create all jar files -->
  	<target name="ggb-jar-files" 
-@@ -63,11 +72,17 @@ office at geogebra.org
+@@ -63,11 +72,24 @@ office at geogebra.org
  	<manifest file="../manifest.mf">	    
  		<attribute name="Main-Class" value="geogebra.GeoGebra"/>
  		<attribute name="Class-Path" 
@@ -68,7 +68,14 @@ index 7081f5f..50fa6b0 100644
 +				/usr/share/geogebra/geogebra_properties.jar
 +				/usr/share/geogebra/geogebra_export.jar
 +				/usr/share/geogebra/geogebra_cas.jar
-+				/usr/share/java/mathpiper.jar"/>
++				/usr/share/java/mathpiper.jar
++				/usr/share/java/freehep-xml.jar
++				/usr/share/java/freehep-util.jar
++				/usr/share/java/freehep-graphics2d.jar
++				/usr/share/java/freehep-graphicsio.jar
++				/usr/share/java/freehep-graphicsio-svg.jar
++				/usr/share/java/freehep-graphicsio-pdf.jar
++				/usr/share/java/freehep-graphicsio-emf.jar"/>
  		<!--	<attribute name="SplashScreen-Image" value="geogebra/splash.gif"/>	-->
  	</manifest>	
  	
@@ -77,7 +84,7 @@ index 7081f5f..50fa6b0 100644
  		<mkdir dir="${build.dir}"/>
  		<mkdir dir="${build.dir}/packed"/>
  		<mkdir dir="${build.dir}/unpacked"/>
-@@ -79,6 +94,11 @@ office at geogebra.org
+@@ -79,6 +101,11 @@ office at geogebra.org
  		    <fileset dir="${build.dir}" includes="**/geogebra*.jar, **/gluegen-rt.jar, **/jogl.jar, **/*.jar.pack.gz, **/*.html"/>
  		</delete>		
  	</target>
@@ -89,7 +96,7 @@ index 7081f5f..50fa6b0 100644
  	
  	<target name="finish">		
  		<delete dir="${propertiestemp.dir}"/>		   
-@@ -109,7 +129,7 @@ office at geogebra.org
+@@ -109,7 +136,7 @@ office at geogebra.org
  	</target>
  	
  	<!-- geogebra.jar loads the geogebra_main.jar file and starts up the application/applet  -->
@@ -98,7 +105,7 @@ index 7081f5f..50fa6b0 100644
  		<jar jarfile="${build.dir}/geogebra.jar" manifest="../manifest.mf" >		
  			<fileset dir="${src.dir}"		   
  				includes="geogebra/*"			
-@@ -132,7 +152,7 @@ office at geogebra.org
+@@ -132,7 +159,7 @@ office at geogebra.org
  	 
  	    
  	<!-- geogebra_main.jar includes all basic classes to run the application and applet  -->
@@ -107,7 +114,7 @@ index 7081f5f..50fa6b0 100644
  		<jar jarfile="${build.dir}/geogebra_main.jar"		
  			basedir="${src.dir}"		   
  			includes="**/*.class, 				
-@@ -156,7 +176,7 @@ office at geogebra.org
+@@ -156,7 +183,7 @@ office at geogebra.org
  		/>
  	</target>
  	
@@ -116,7 +123,7 @@ index 7081f5f..50fa6b0 100644
  		<jar jarfile="${build.dir}/geogebra_export.jar"
  			basedir="${src.dir}"
  			includes="geogebra/export/**, 
-@@ -166,7 +186,7 @@ office at geogebra.org
+@@ -166,7 +193,7 @@ office at geogebra.org
  		/>
  	</target>
  	
@@ -125,7 +132,7 @@ index 7081f5f..50fa6b0 100644
  		<jar jarfile="${build.dir}/geogebra_cas.jar"
  			basedir="${src.dir}"
  			includes="geogebra/cas/**,
-@@ -176,7 +196,7 @@ office at geogebra.org
+@@ -176,7 +203,7 @@ office at geogebra.org
  		/>
  	</target>
  
@@ -134,7 +141,7 @@ index 7081f5f..50fa6b0 100644
  		<jar jarfile="${build.dir}/geogebra_gui.jar"
  			basedir="${src.dir}"
  			includes="geogebra/gui/**"
-@@ -184,91 +204,13 @@ office at geogebra.org
+@@ -184,91 +211,13 @@ office at geogebra.org
  		/>
  	</target>
  	
@@ -228,7 +235,7 @@ index 7081f5f..50fa6b0 100644
  	<!-- reads the version/build number from geogebra.GeoGebra.java -->
  	<target name="readVersion">
  		<loadfile property="fullversion" srcfile="${src.dir}/geogebra/GeoGebra.java">
-@@ -327,175 +269,4 @@ office at geogebra.org
+@@ -327,175 +276,4 @@ office at geogebra.org
  		<echo> ${builddate}   </echo>
  		-->
  	</target>
@@ -407,4 +414,4 @@ index 7081f5f..50fa6b0 100644
 \ No newline at end of file
 +</project>
 -- 
-tg: (1401b2e..) patch/build.xml (depends on: master)
+tg: (f386e79..) patch/build.xml (depends on: master)


hooks/post-receive
-- 
GeoGebra: Dynamic mathematics software for education