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 ad7595470ae7b4370eb2bd46427b08641ba9e24e (commit)
via f386e79d097035a07a7112f25b4b69934a23c76e (commit)
via 27987b003d1ca05439008f45a9bfc68270f773ec (commit)
via 651aa816be8b9faffb1f4f81f1e75e1bb22ce071 (commit)
via 1a7990b916bdc5092396ea13ad0d37276b9cea0a (commit)
from f2de4917e69c25666c728597df1e649f3640e2b1 (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 ad7595470ae7b4370eb2bd46427b08641ba9e24e
Merge: 27987b003d1ca05439008f45a9bfc68270f773ec
f386e79d097035a07a7112f25b4b69934a23c76e
Author: Giovanni Mascellani <mascell...@poisson.phc.unipi.it>
Date: Sat Mar 13 00:09:32 2010 +0100
Merge branch 'master' into build
commit 27987b003d1ca05439008f45a9bfc68270f773ec
Author: Giovanni Mascellani <mascell...@poisson.phc.unipi.it>
Date: Sat Mar 13 00:08:18 2010 +0100
Patches updated
commit 651aa816be8b9faffb1f4f81f1e75e1bb22ce071
Merge: f2de4917e69c25666c728597df1e649f3640e2b1
1a7990b916bdc5092396ea13ad0d37276b9cea0a
Author: Giovanni Mascellani <mascell...@poisson.phc.unipi.it>
Date: Fri Mar 12 23:55:11 2010 +0100
Merge branch 'master' into build
-----------------------------------------------------------------------
Summary of changes:
debian/TODO | 2 ++
debian/dirs | 2 ++
debian/install | 1 +
debian/patches/patch/build.xml.diff | 35 +++++++++++++++++++++++------------
4 files changed, 28 insertions(+), 12 deletions(-)
diff --git a/debian/TODO b/debian/TODO
new file mode 100644
index 0000000..81f4519
--- /dev/null
+++ b/debian/TODO
@@ -0,0 +1,2 @@
+ * Verify hoteqn and jasymca (embedded copies?)
+ * verify exportable JARs
diff --git a/debian/dirs b/debian/dirs
new file mode 100644
index 0000000..ddbb9d3
--- /dev/null
+++ b/debian/dirs
@@ -0,0 +1,2 @@
+usr/share/geogebra
+usr/bin
diff --git a/debian/install b/debian/install
new file mode 100644
index 0000000..c9e25e7
--- /dev/null
+++ b/debian/install
@@ -0,0 +1 @@
+build/geogebra.jar build/geogebra_main.jar build/geogebra_gui.jar
build/geogebra_cas.jar build/geogebra_export.jar build/geogebra_properties.jar
usr/share/geogebra
diff --git a/debian/patches/patch/build.xml.diff
b/debian/patches/patch/build.xml.diff
index 6ea54fd..c0c5151 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 <mascell...@poisson.phc.unipi.it>
---
- build.xml | 305 +++++++------------------------------------------------------
- 1 files changed, 35 insertions(+), 270 deletions(-)
+ build.xml | 313 ++++++++----------------------------------------------------
+ 1 files changed, 42 insertions(+), 271 deletions(-)
diff --git a/build.xml b/build.xml
-index 7081f5f..0d22c6e 100644
+index 7081f5f..50fa6b0 100644
--- a/build.xml
+++ b/build.xml
@@ -38,22 +38,31 @@ off...@geogebra.org
@@ -57,7 +57,18 @@ index 7081f5f..0d22c6e 100644
<!-- create all jar files -->
<target name="ggb-jar-files"
-@@ -67,7 +76,7 @@ off...@geogebra.org
+@@ -63,11 +72,17 @@ off...@geogebra.org
+ <manifest file="../manifest.mf">
+ <attribute name="Main-Class" value="geogebra.GeoGebra"/>
+ <attribute name="Class-Path"
+- value="geogebra.jar geogebra_main.jar geogebra_gui.jar
geogebra_properties.jar geogebra_export.jar geogebra_cas.jar"/>
++ value="/usr/share/geogebra/geogebra.jar
++ /usr/share/geogebra/geogebra_main.jar
++ /usr/share/geogebra/geogebra_gui.jar
++ /usr/share/geogebra/geogebra_properties.jar
++ /usr/share/geogebra/geogebra_export.jar
++ /usr/share/geogebra/geogebra_cas.jar
++ /usr/share/java/mathpiper.jar"/>
<!-- <attribute name="SplashScreen-Image"
value="geogebra/splash.gif"/> -->
</manifest>
@@ -66,7 +77,7 @@ index 7081f5f..0d22c6e 100644
<mkdir dir="${build.dir}"/>
<mkdir dir="${build.dir}/packed"/>
<mkdir dir="${build.dir}/unpacked"/>
-@@ -79,6 +88,11 @@ off...@geogebra.org
+@@ -79,6 +94,11 @@ off...@geogebra.org
<fileset dir="${build.dir}" includes="**/geogebra*.jar,
**/gluegen-rt.jar, **/jogl.jar, **/*.jar.pack.gz, **/*.html"/>
</delete>
</target>
@@ -78,7 +89,7 @@ index 7081f5f..0d22c6e 100644
<target name="finish">
<delete dir="${propertiestemp.dir}"/>
-@@ -109,7 +123,7 @@ off...@geogebra.org
+@@ -109,7 +129,7 @@ off...@geogebra.org
</target>
<!-- geogebra.jar loads the geogebra_main.jar file and starts up the
application/applet -->
@@ -87,7 +98,7 @@ index 7081f5f..0d22c6e 100644
<jar jarfile="${build.dir}/geogebra.jar"
manifest="../manifest.mf" >
<fileset dir="${src.dir}"
includes="geogebra/*"
-@@ -132,7 +146,7 @@ off...@geogebra.org
+@@ -132,7 +152,7 @@ off...@geogebra.org
<!-- geogebra_main.jar includes all basic classes to run the
application and applet -->
@@ -96,7 +107,7 @@ index 7081f5f..0d22c6e 100644
<jar jarfile="${build.dir}/geogebra_main.jar"
basedir="${src.dir}"
includes="**/*.class,
-@@ -156,7 +170,7 @@ off...@geogebra.org
+@@ -156,7 +176,7 @@ off...@geogebra.org
/>
</target>
@@ -105,7 +116,7 @@ index 7081f5f..0d22c6e 100644
<jar jarfile="${build.dir}/geogebra_export.jar"
basedir="${src.dir}"
includes="geogebra/export/**,
-@@ -166,7 +180,7 @@ off...@geogebra.org
+@@ -166,7 +186,7 @@ off...@geogebra.org
/>
</target>
@@ -114,7 +125,7 @@ index 7081f5f..0d22c6e 100644
<jar jarfile="${build.dir}/geogebra_cas.jar"
basedir="${src.dir}"
includes="geogebra/cas/**,
-@@ -176,7 +190,7 @@ off...@geogebra.org
+@@ -176,7 +196,7 @@ off...@geogebra.org
/>
</target>
@@ -123,7 +134,7 @@ index 7081f5f..0d22c6e 100644
<jar jarfile="${build.dir}/geogebra_gui.jar"
basedir="${src.dir}"
includes="geogebra/gui/**"
-@@ -184,91 +198,13 @@ off...@geogebra.org
+@@ -184,91 +204,13 @@ off...@geogebra.org
/>
</target>
@@ -217,7 +228,7 @@ index 7081f5f..0d22c6e 100644
<!-- reads the version/build number from geogebra.GeoGebra.java -->
<target name="readVersion">
<loadfile property="fullversion"
srcfile="${src.dir}/geogebra/GeoGebra.java">
-@@ -327,175 +263,4 @@ off...@geogebra.org
+@@ -327,175 +269,4 @@ off...@geogebra.org
<echo> ${builddate} </echo>
-->
</target>
hooks/post-receive
--
GeoGebra: Dynamic mathematics software for education
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
