[SCM] GeoGebra: Dynamic mathematics software for education branch, build, updated. debian/3.2.44.0+dfsg1-1-4-g671d423
Giovanni Mascellani
gio at alioth.debian.org
Tue Aug 31 21:41:53 UTC 2010
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 671d423006f62b56dd5c7715dd48ac95e44a4a1f (commit)
via 86d99f284eff0a14caad19f6a1bc528d1d4be739 (commit)
via efad418a2bcf9a79ee0522ef9fef7fe20aae3452 (commit)
via 983a257c4c09a1fd9b7efa76b4a7681ffb228bb9 (commit)
from 3049e1df2b9fdcb358668f6794c1d4e03cf58406 (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 671d423006f62b56dd5c7715dd48ac95e44a4a1f
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date: Tue Aug 31 23:11:29 2010 +0200
Patches updated
commit 86d99f284eff0a14caad19f6a1bc528d1d4be739
Merge: 3049e1d efad418
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date: Tue Aug 31 23:11:05 2010 +0200
Merge branch 'master' into build
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 8 ++++++++
debian/control | 4 ++++
debian/geogebra.sh | 2 +-
debian/patches/patch/build.xml.diff | 28 ++++++++++++++++------------
4 files changed, 29 insertions(+), 13 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 365c251..ad52aa0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+geogebra (3.2.44.0+dfsg1-2) unstable; urgency=low
+
+ * Fix missing JARs in execution classpath (closes: #594173).
+ * Bigger memory limits for GeoGebra, necessary when dealing with
+ big constructions.
+
+ -- Giovanni Mascellani <gio at debian.org> Tue, 31 Aug 2010 22:47:42 +0200
+
geogebra (3.2.44.0+dfsg1-1) unstable; urgency=low
* New upstream release (mostly bug fixing).
diff --git a/debian/control b/debian/control
index e9d2e77..b0a225e 100644
--- a/debian/control
+++ b/debian/control
@@ -33,6 +33,10 @@ Depends:
mathpiper,
libcommons-math-java,
libjama-java,
+ libfreehep-io-java,
+ libfreehep-graphicsio-tests-java,
+ libfreehep-export-java,
+ libfreehep-swing-java,
libfreehep-xml-java,
libfreehep-util-java,
libfreehep-graphics2d-java,
diff --git a/debian/geogebra.sh b/debian/geogebra.sh
index 1699404..81b306c 100755
--- a/debian/geogebra.sh
+++ b/debian/geogebra.sh
@@ -5,6 +5,6 @@ if [ -z "$JAVACMD" ] ; then
JAVACMD=java
fi
-exec $JAVACMD $JAVA_OPTS -jar /usr/share/geogebra/geogebra.jar "$@"
+exec $JAVACMD -Xms32m -Xmx512m $JAVA_OPTS -jar /usr/share/geogebra/geogebra.jar "$@"
diff --git a/debian/patches/patch/build.xml.diff b/debian/patches/patch/build.xml.diff
index 729d06e..f61d8a7 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 | 385 ++++++++----------------------------------------------------
- 1 files changed, 52 insertions(+), 333 deletions(-)
+ build.xml | 389 +++++++++----------------------------------------------------
+ 1 files changed, 56 insertions(+), 333 deletions(-)
diff --git a/build.xml b/build.xml
-index 5b182b1..b6749ba 100644
+index 5b182b1..3a624dc 100644
--- a/build.xml
+++ b/build.xml
@@ -38,22 +38,31 @@ office at geogebra.org
@@ -57,7 +57,7 @@ index 5b182b1..b6749ba 100644
<!-- create all jar files -->
<target name="ggb-jar-files"
-@@ -63,11 +72,26 @@ office at geogebra.org
+@@ -63,11 +72,30 @@ office at geogebra.org
<manifest file="../manifest.mf">
<attribute name="Main-Class" value="geogebra.GeoGebra"/>
<attribute name="Class-Path"
@@ -71,6 +71,10 @@ index 5b182b1..b6749ba 100644
+ /usr/share/java/mathpiper.jar
+ /usr/share/java/commons-math.jar
+ /usr/share/java/jama.jar
++ /usr/share/java/freehep-io.jar
++ /usr/share/java/freehep-io-tests.jar
++ /usr/share/java/freehep-export.jar
++ /usr/share/java/freehep-swing.jar
+ /usr/share/java/freehep-xml.jar
+ /usr/share/java/freehep-util.jar
+ /usr/share/java/freehep-graphics2d.jar
@@ -86,7 +90,7 @@ index 5b182b1..b6749ba 100644
<mkdir dir="${build.dir}"/>
<mkdir dir="${build.dir}/packed"/>
<mkdir dir="${build.dir}/unpacked"/>
-@@ -79,6 +103,11 @@ office at geogebra.org
+@@ -79,6 +107,11 @@ office at geogebra.org
<fileset dir="${build.dir}" includes="**/geogebra*.jar, **/gluegen-rt.jar, **/jogl.jar, **/jlatexmath.jar, **/jlm_*.jar,**/*.jar.pack.gz, **/*.html"/>
</delete>
</target>
@@ -98,7 +102,7 @@ index 5b182b1..b6749ba 100644
<target name="finish">
<delete dir="${propertiestemp.dir}"/>
-@@ -109,7 +138,7 @@ office at geogebra.org
+@@ -109,7 +142,7 @@ office at geogebra.org
</target>
<!-- geogebra.jar loads the geogebra_main.jar file and starts up the application/applet -->
@@ -107,7 +111,7 @@ index 5b182b1..b6749ba 100644
<jar jarfile="${build.dir}/geogebra.jar" manifest="../manifest.mf" >
<fileset dir="${src.dir}"
includes="geogebra/*"
-@@ -132,7 +161,7 @@ office at geogebra.org
+@@ -132,7 +165,7 @@ office at geogebra.org
<!-- geogebra_main.jar includes all basic classes to run the application and applet -->
@@ -116,7 +120,7 @@ index 5b182b1..b6749ba 100644
<jar jarfile="${build.dir}/geogebra_main.jar"
basedir="${src.dir}"
includes="**/*.class,
-@@ -156,7 +185,7 @@ office at geogebra.org
+@@ -156,7 +189,7 @@ office at geogebra.org
/>
</target>
@@ -125,7 +129,7 @@ index 5b182b1..b6749ba 100644
<jar jarfile="${build.dir}/geogebra_export.jar"
basedir="${src.dir}"
includes="geogebra/export/**,
-@@ -166,7 +195,7 @@ office at geogebra.org
+@@ -166,7 +199,7 @@ office at geogebra.org
/>
</target>
@@ -134,7 +138,7 @@ index 5b182b1..b6749ba 100644
<jar jarfile="${build.dir}/geogebra_cas.jar"
basedir="${src.dir}"
includes="geogebra/cas/**,
-@@ -176,7 +205,7 @@ office at geogebra.org
+@@ -176,7 +209,7 @@ office at geogebra.org
/>
</target>
@@ -143,7 +147,7 @@ index 5b182b1..b6749ba 100644
<jar jarfile="${build.dir}/geogebra_gui.jar"
basedir="${src.dir}"
includes="geogebra/gui/**"
-@@ -184,91 +213,13 @@ office at geogebra.org
+@@ -184,91 +217,13 @@ office at geogebra.org
/>
</target>
@@ -237,7 +241,7 @@ index 5b182b1..b6749ba 100644
<!-- reads the version/build number from geogebra.GeoGebra.java -->
<target name="readVersion">
<loadfile property="fullversion" srcfile="${src.dir}/geogebra/GeoGebra.java">
-@@ -327,237 +278,5 @@ office at geogebra.org
+@@ -327,237 +282,5 @@ office at geogebra.org
<echo> ${builddate} </echo>
-->
</target>
hooks/post-receive
--
GeoGebra: Dynamic mathematics software for education
More information about the pkg-java-commits
mailing list