[SCM] GeoGebra: Dynamic mathematics software for education branch, eclipse, updated. debian/3.2.42.0+dfsg1-1-82-g636043d
Giovanni Mascellani
gio at alioth.debian.org
Fri Jul 23 19:33:56 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, eclipse has been updated
via 636043d4087b7a9c28b9e5e48c553efe8d891aab (commit)
via 37ee2566f3f1b68a40898d40a5e07514c889fa96 (commit)
via 74129fc14dfa6d88d9596a056a4243f63e3a4d30 (commit)
via 9169d99e16a7e7c4fa668a795dd4ffbb2f3ab773 (commit)
via 863a8a3a88d9d4f93dcaac7715c545955dcf59a4 (commit)
via 214a803661329265fb16509dd0e54106193c8ca7 (commit)
via b4f74d8315b7f1c59ea945ec79fb4b96b2065b22 (commit)
via 052617eee4b761e2d92ea05f695c15097cb6aece (commit)
via 4b6e56e070092ed0e8f0af3017454e26e9ba948b (commit)
via f51291ef541c45ea4b08d4cfb6d40368589fd1d9 (commit)
via 732c25345dfc1563f4b9e125bda6c4aeb0db2d4f (commit)
via d4d7cd1ca3f0f6ea4c53da39594132b99fe67c95 (commit)
via 958fa87566fe68171a98d86b7474f489352ee53a (commit)
via a4076637ae5e7b3055ea6a8c2806950d983d6a84 (commit)
via 29f74628b36c8c44d9526f0dfb40e7686b833d5d (commit)
via 6ec98f1c2bf2d7eb48950e95e2a775d154fbed30 (commit)
via ab89acd0e33dd2cf8c500d9195510227e4697ec3 (commit)
via cd5a812566bb6160d93176849f609c5e763b7fad (commit)
via 6704c7c1cd47401e25253d0332c0de4b94c11b29 (commit)
via b3a089872c0b94e35edd06bab86eae9b0195b270 (commit)
from 6f60072d2b45065ec8579e593f5e82eb83f707ae (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 636043d4087b7a9c28b9e5e48c553efe8d891aab
Merge: 37ee256 6704c7c
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date: Fri Jul 23 21:33:33 2010 +0200
Merge branch 'patch/jama' into eclipse
commit 37ee2566f3f1b68a40898d40a5e07514c889fa96
Merge: 74129fc 863a8a3
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date: Fri Jul 23 21:33:20 2010 +0200
Merge branch 'patch/applet_export' into eclipse
commit 74129fc14dfa6d88d9596a056a4243f63e3a4d30
Merge: 6f60072 9169d99
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date: Fri Jul 23 21:33:09 2010 +0200
Merge branch 'master' into eclipse
-----------------------------------------------------------------------
Summary of changes:
debian/TODO | 8 ++++++--
debian/changelog | 9 ++++++++-
debian/geogebra.desktop | 11 -----------
debian/geogebra.manpages | 1 +
debian/geogebra.sharedmimeinfo | 11 -----------
debian/install | 4 ++--
debian/rules | 3 +++
geogebra/export/WorksheetExportDialog.java | 9 +++++++--
geogebra/kernel/AlgoInvert.java | 2 +-
geogebra/kernel/AlgoTranspose.java | 2 +-
geogebra/kernel/jama/GgbMat.java | 18 ++++++++++++++++++
11 files changed, 47 insertions(+), 31 deletions(-)
diff --git a/debian/TODO b/debian/TODO
index 769e324..e3612fa 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -1,5 +1,9 @@
* verify exportable JARs
+ + signed vs. unsigned (ability to print....)
+ + if Internet connection is not available?
+ + informing the user when the process is completed
+ + document these issues in README.Debian
+ + why both signed and unsigned?
* add a menu entry
- * check jama patch (inverse of a singular matrix)
- * additional patch provided by Markus
* additional resources in http://groups.google.com/group/geogebra-dev/browse_thread/thread/77c6736ed48688ae
+ * add thumbnailer
diff --git a/debian/changelog b/debian/changelog
index df59793..e5adcb2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,15 @@
geogebra (3.2.43.0+dfsg1-1) unstable; urgency=low
* New upstream release (mostly bugfixes).
+ + Patches updated
+ * patch/flanagan_nonfree.diff: search of polynomial roots improved,
+ thanks to Markus Hohenwarter.
+ * Inverse of a singular matrix bug fixed.
+ * Added manpage.
+ * Upstream icons, .desktop and MIME description used.
+ * JAR files for exporting applets are downloaded from upstream website.
- -- Giovanni Mascellani <gio at debian.org> Fri, 23 Jul 2010 10:02:58 +0200
+ -- Giovanni Mascellani <gio at debian.org> Fri, 23 Jul 2010 19:24:22 +0200
geogebra (3.2.42.0+dfsg1-1) unstable; urgency=low
diff --git a/debian/geogebra.desktop b/debian/geogebra.desktop
deleted file mode 100644
index 08721fc..0000000
--- a/debian/geogebra.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Name=GeoGebra
-Comment=Create interactive mathematical constructions and applets
-Exec=geogebra %f
-Icon=geogebra.png
-Terminal=false
-Type=Application
-StartupNotify=true
-Categories=Math;Education
-MimeType=application/vnd.geogebra.file;application/vnd.geogebra.tool;
-
diff --git a/debian/geogebra.manpages b/debian/geogebra.manpages
new file mode 100644
index 0000000..945f70f
--- /dev/null
+++ b/debian/geogebra.manpages
@@ -0,0 +1 @@
+unix/usr/share/man/man1/geogebra.1.gz
diff --git a/debian/geogebra.sharedmimeinfo b/debian/geogebra.sharedmimeinfo
deleted file mode 100644
index 5608011..0000000
--- a/debian/geogebra.sharedmimeinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
- <mime-type type="application/vnd.geogebra.file">
- <comment>GeoGebra File</comment>
- <glob pattern="*.ggb"/>
- </mime-type>
- <mime-type type="application/vnd.geogebra.tool">
- <comment>GeoGebra Tool</comment>
- <glob pattern="*.ggt"/>
- </mime-type>
-</mime-info>
diff --git a/debian/install b/debian/install
index 6a1e8de..4665bb4 100644
--- a/debian/install
+++ b/debian/install
@@ -1,3 +1,3 @@
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
-debian/geogebra.desktop usr/share/applications
-debian/geogebra.png usr/share/pixmaps
+unix/usr/share/applications/geogebra.desktop usr/share/applications
+unix/usr/share/pixmaps/geogebra.png usr/share/pixmaps
diff --git a/debian/rules b/debian/rules
index cdd4bbe..3b93409 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,6 +27,9 @@ DEB_JARS += /usr/share/java/freehep-graphicsio-emf.jar
install/geogebra::
install -m 755 $(CURDIR)/debian/geogebra.sh $(CURDIR)/debian/geogebra/usr/bin/geogebra
+ # This link is created so dh_installmime gets the correct file
+ ln -s ../unix/usr/share/mime/packages/geogebra.xml debian/geogebra.sharedmimeinfo
+
get-orig-source:
./debian/get_orig_source.sh
diff --git a/geogebra/export/WorksheetExportDialog.java b/geogebra/export/WorksheetExportDialog.java
index e7119c4..321389e 100644
--- a/geogebra/export/WorksheetExportDialog.java
+++ b/geogebra/export/WorksheetExportDialog.java
@@ -664,10 +664,15 @@ public class WorksheetExportDialog extends JDialog {
* whether a signed or unsigned applet is needed for the options set.
*/
private URL getAppletCodebase() {
- URL codebase = app.getCodeBase();
+ URL codebase = null;
+ try {
+ codebase = new URL("http://www.geogebra.org/webstart/");
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
if (!cbSavePrint.isSelected()) {
try {
- codebase = new URL(app.getCodeBase(), "unsigned/");
+ codebase = new URL(codebase, "unsigned/");
} catch (Exception e) {
e.printStackTrace();
}
diff --git a/geogebra/kernel/AlgoInvert.java b/geogebra/kernel/AlgoInvert.java
index c5cf4dd..ce611f3 100644
--- a/geogebra/kernel/AlgoInvert.java
+++ b/geogebra/kernel/AlgoInvert.java
@@ -81,7 +81,7 @@ public class AlgoInvert extends AlgoElement {
return;
}*/
- matrix = new GgbMat(matrix.inverse());
+ matrix = matrix.ggbInverse();
if (matrix.isUndefined()) {
//outputList.setUndefined();
diff --git a/geogebra/kernel/AlgoTranspose.java b/geogebra/kernel/AlgoTranspose.java
index 0f1c3c9..d0b99b8 100644
--- a/geogebra/kernel/AlgoTranspose.java
+++ b/geogebra/kernel/AlgoTranspose.java
@@ -63,7 +63,7 @@ public class AlgoTranspose extends AlgoElement {
return;
}
- matrix = new GgbMat(matrix.transpose());
+ matrix = matrix.ggbTranspose();
// Transpose[{{1,2},{3,4}}]
outputList = matrix.getGeoList(outputList, cons);
diff --git a/geogebra/kernel/jama/GgbMat.java b/geogebra/kernel/jama/GgbMat.java
index e8aa175..db01f23 100644
--- a/geogebra/kernel/jama/GgbMat.java
+++ b/geogebra/kernel/jama/GgbMat.java
@@ -18,6 +18,10 @@ public class GgbMat extends Matrix{
super(m.getArray());
}
+ public GgbMat(int row, int col) {
+ super(row, col);
+ }
+
public static Dimension calcDim(GeoList inputList) {
int rows = inputList.size();
if (!inputList.isDefined() || rows == 0) {
@@ -73,6 +77,20 @@ public class GgbMat extends Matrix{
}
}
+ public GgbMat ggbInverse() {
+ try {
+ return new GgbMat(((Matrix) this).inverse());
+ } catch (Exception e) {
+ GgbMat mat = new GgbMat(this.getRowDimension(), this.getColumnDimension());
+ mat.setIsUndefined(true);
+ return mat;
+ }
+ }
+
+ public GgbMat ggbTranspose() {
+ return new GgbMat(((Matrix) this).transpose());
+ }
+
/*
* returns GgbMatrix as a GeoList eg { {1,2}, {3,4} }
*/
hooks/post-receive
--
GeoGebra: Dynamic mathematics software for education
More information about the pkg-java-commits
mailing list