[SCM] GeoGebra: Dynamic mathematics software for education branch, build, updated. debian/3.2.43.0+dfsg1-2-21-g3049e1d
Giovanni Mascellani
gio at alioth.debian.org
Sun Aug 1 17:38:02 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 3049e1df2b9fdcb358668f6794c1d4e03cf58406 (commit)
via 1a36fc481558f1e1312a02f21cf01a7e46659c3e (commit)
via 8278724337f4c6de10c0b349e63e13cb98485e55 (commit)
via 901eb2e00a085de8ef6a408ddeb59e2cd2321b2b (commit)
via f10a141919189b7aeb0bc95ee1e36fdc63e09677 (commit)
via c72da5e1a598f2f116ac6c4f0a6c24c39bc240eb (commit)
via 5c7a8d2704b7c79d77ab11254ecb9f4e6379c3d0 (commit)
via 4bdaf2cc287d50cd7cfda59ac8e9d9ff1ea66656 (commit)
via fea2079d3b7f7d905e68d5c495f6cceb9b0bb5b3 (commit)
via f8429ed5e97b3760bab81b4f83ac7e5c047bc01d (commit)
via b303461799ed316f9f2cec2e9b8eb05d9cc070bd (commit)
via 16044df691603db707417cd93a3462f34a588a3b (commit)
via 420cc44603c69a4b8930a4f684954c97600cc523 (commit)
via 0a2e0ae140b3d0a5de66601cfc436e20b358414d (commit)
via 539db34c67865ab61f7b0b7dfac529ef7ed8347e (commit)
via 546d9d3af5fb4f60815e503620f9b515b9a3a75d (commit)
via 6db86fec71f8fb3e745e3380a5fdd9c4f99446ef (commit)
via b7edd82eb6ebc75684eb4f9528f6c4cf7a6d7b25 (commit)
via 5a430657ced7cd4161701256e1661304642b61d8 (commit)
via f0d14dec0a643af6026866ed3014ad9b57341f72 (commit)
via 59a2ae2e613cf5ac388add11d586bdc5e54042ed (commit)
from 74ecb35c853a1a06a946a5db1fa47869c29f273a (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 3049e1df2b9fdcb358668f6794c1d4e03cf58406
Merge: 901eb2e 1a36fc4
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date: Sun Aug 1 19:29:35 2010 +0200
Merge branch 'master' into build
commit 901eb2e00a085de8ef6a408ddeb59e2cd2321b2b
Merge: c72da5e f10a141
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date: Sun Aug 1 19:25:55 2010 +0200
Merge branch 'master' into build
commit c72da5e1a598f2f116ac6c4f0a6c24c39bc240eb
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date: Sun Aug 1 19:14:06 2010 +0200
Patches updated
commit 5c7a8d2704b7c79d77ab11254ecb9f4e6379c3d0
Merge: b303461 4bdaf2c
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date: Sun Aug 1 19:13:25 2010 +0200
Merge branch 'master' into build
commit b303461799ed316f9f2cec2e9b8eb05d9cc070bd
Merge: 0a2e0ae 16044df
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date: Sun Aug 1 18:36:52 2010 +0200
Merge branch 'master' into build
commit 0a2e0ae140b3d0a5de66601cfc436e20b358414d
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date: Sun Aug 1 17:40:41 2010 +0200
Patches updated
commit 539db34c67865ab61f7b0b7dfac529ef7ed8347e
Merge: 74ecb35 546d9d3
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date: Sun Aug 1 11:48:23 2010 +0200
Merge branch 'master' into build
-----------------------------------------------------------------------
Summary of changes:
debian/TODO | 5 --
debian/changelog | 11 ++++
debian/control | 5 +-
debian/create_debian_class.sh | 12 +++++
debian/geogebra.links | 2 +
debian/patches/patch/geogebra.desktop.diff | 25 +++++++++
debian/patches/patch/version.diff | 75 ++++++++++++++++++++++++++++
debian/patches/series | 2 +
debian/rules | 9 +++
geogebra/GeoGebra.java | 4 +-
geogebra/euclidian/DrawRay.java | 20 ++++----
unix/usr/share/man/man1/geogebra.1.gz | Bin 613 -> 620 bytes
12 files changed, 151 insertions(+), 19 deletions(-)
diff --git a/debian/TODO b/debian/TODO
index 2d9e621..3d89ac1 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -4,8 +4,3 @@
+ informing the user when the process is completed
+ document these issues in README.Debian
+ why both signed and unsigned?
- * add a menu entry
- * additional resources in http://groups.google.com/group/geogebra-dev/browse_thread/thread/77c6736ed48688ae
- + file icons
- * add thumbnailer (also for KDE)
- * fix the manpage
diff --git a/debian/changelog b/debian/changelog
index 5c70fbb..365c251 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+geogebra (3.2.44.0+dfsg1-1) unstable; urgency=low
+
+ * New upstream release (mostly bug fixing).
+ * Added recommendation against a Java plugin.
+ * Categories in .desktop fixed.
+ * GeoGebra files are shown with the correct icon in file managers.
+ * Debian version number is shown along with the upstream one.
+ * Standards-Version bumped to 3.9.1 (no changes required).
+
+ -- Giovanni Mascellani <gio at debian.org> Sun, 01 Aug 2010 19:29:15 +0200
+
geogebra (3.2.43.0+dfsg1-2) unstable; urgency=low
* Added package geogebra-gnome, with a GNOME thumbnailer for GeoGebra
diff --git a/debian/control b/debian/control
index 423b16d..e9d2e77 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,7 @@ Build-Depends:
libfreehep-graphicsio-svg-java,
libfreehep-graphicsio-pdf-java,
libfreehep-graphicsio-emf-java
-Standards-Version: 3.9.0
+Standards-Version: 3.9.1
Homepage: http://www.geogebra.org/
Vcs-Git: git://git.debian.org/git/pkg-java/geogebra.git
Vcs-Browser: http://git.debian.org/?p=pkg-java/geogebra.git
@@ -41,6 +41,7 @@ Depends:
libfreehep-graphicsio-pdf-java,
libfreehep-graphicsio-emf-java,
${misc:Depends}
+Recommends: icedtea6-plugin | sun-java6-plugin
Description: Dynamic mathematics software for education
GeoGebra is a dynamic geometry system. You can do constructions with points,
vectors, segments, lines, conic sections as well as functions and change
@@ -59,7 +60,7 @@ Depends:
geogebra,
imagemagick,
${misc:Depends}
-Description: GNOME integration for GeoGebra
+Description: GNOME integration layer for GeoGebra
GeoGebra is a dynamic geometry system. You can do constructions with points,
vectors, segments, lines, conic sections as well as functions and change
them dynamically afterwards. On the other hand, equations and coordinates
diff --git a/debian/create_debian_class.sh b/debian/create_debian_class.sh
new file mode 100755
index 0000000..8aa5788
--- /dev/null
+++ b/debian/create_debian_class.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+cat << EOF
+package geogebra;
+
+public class GeoGebraDebian {
+
+ public static final String DEBIAN_VERSION_STRING = "$DEB_VERSION";
+
+}
+EOF
+
diff --git a/debian/geogebra.links b/debian/geogebra.links
new file mode 100644
index 0000000..7342808
--- /dev/null
+++ b/debian/geogebra.links
@@ -0,0 +1,2 @@
+usr/share/pixmaps/geogebra.png usr/share/icons/hicolor/48x48/mimetypes/application-vnd.geogebra.file.png
+usr/share/pixmaps/geogebra.png usr/share/icons/hicolor/48x48/mimetypes/application-vnd.geogebra.tool.png
diff --git a/debian/patches/patch/geogebra.desktop.diff b/debian/patches/patch/geogebra.desktop.diff
new file mode 100644
index 0000000..c18d2c6
--- /dev/null
+++ b/debian/patches/patch/geogebra.desktop.diff
@@ -0,0 +1,25 @@
+From: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
+Subject: [PATCH] patch/geogebra.desktop
+
+This patch fixes the categories of geogebra.desktop, in order
+to make Education the preferred one.
+
+Signed-off-by: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
+
+---
+ unix/usr/share/applications/geogebra.desktop | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/unix/usr/share/applications/geogebra.desktop b/unix/usr/share/applications/geogebra.desktop
+index 1631774..a0a7669 100644
+--- a/unix/usr/share/applications/geogebra.desktop
++++ b/unix/usr/share/applications/geogebra.desktop
+@@ -20,5 +20,5 @@ Icon=geogebra.png
+ Terminal=false
+ Type=Application
+ StartupNotify=true
+-Categories=Science;Math;Education
++Categories=Education;Math
+ MimeType=application/vnd.geogebra.file;application/vnd.geogebra.tool;
+--
+tg: (b7edd82..) patch/geogebra.desktop (depends on: master)
diff --git a/debian/patches/patch/version.diff b/debian/patches/patch/version.diff
new file mode 100644
index 0000000..602b897
--- /dev/null
+++ b/debian/patches/patch/version.diff
@@ -0,0 +1,75 @@
+From: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
+Subject: [PATCH] patch/version
+
+Patches GeoGebra in order to make the Debian version visible
+along with the upstream one.
+
+Signed-off-by: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
+
+---
+ geogebra/GeoGebra.java | 3 ++-
+ geogebra/GeoGebraAppletPreloader.java | 3 ++-
+ geogebra/gui/menubar/MenubarImpl.java | 4 +++-
+ geogebra/main/Application.java | 3 ++-
+ 4 files changed, 9 insertions(+), 4 deletions(-)
+
+diff --git a/geogebra/GeoGebra.java b/geogebra/GeoGebra.java
+index 318d533..4c3b409 100644
+--- a/geogebra/GeoGebra.java
++++ b/geogebra/GeoGebra.java
+@@ -20,8 +20,9 @@ public class GeoGebra extends Object {
+
+ // GeoGebra version
+ public static final String BUILD_DATE = "July 25, 2010";
+-
++
+ public static final String VERSION_STRING = "3.2.44.0";
++ public static final String DEBIAN_VERSION_STRING = GeoGebraDebian.DEBIAN_VERSION_STRING;
+ public static final String SHORT_VERSION_STRING = "3.2"; // used for online archive
+
+ // File format versions
+diff --git a/geogebra/GeoGebraAppletPreloader.java b/geogebra/GeoGebraAppletPreloader.java
+index 90321a8..51a66e5 100644
+--- a/geogebra/GeoGebraAppletPreloader.java
++++ b/geogebra/GeoGebraAppletPreloader.java
+@@ -11,7 +11,8 @@ public class GeoGebraAppletPreloader extends JApplet {
+
+ public void init() {
+ setBackground(Color.white);
+- System.out.println("GeoGebraAppletPreloader " + GeoGebra.VERSION_STRING + " started");
++ System.out.println("GeoGebraAppletPreloader " + GeoGebra.VERSION_STRING
++ + " (Debian package " + GeoGebra.DEBIAN_VERSION_STRING + " started");
+ loadAllJarFiles();
+ }
+
+diff --git a/geogebra/gui/menubar/MenubarImpl.java b/geogebra/gui/menubar/MenubarImpl.java
+index 7a24880..97dc2cc 100644
+--- a/geogebra/gui/menubar/MenubarImpl.java
++++ b/geogebra/gui/menubar/MenubarImpl.java
+@@ -1437,7 +1437,9 @@ public abstract class MenubarImpl extends JMenuBar implements Menubar {
+ sb.append(app.getPlain("ApplicationName"));
+ sb.append(" ");
+ sb.append(GeoGebra.VERSION_STRING);
+- sb.append("</b> (");
++ sb.append("</b> <i>Debian package ");
++ sb.append(GeoGebra.DEBIAN_VERSION_STRING);
++ sb.append("</i> (");
+ sb.append("Java "+ System.getProperty("java.version") + ", " +(app.getHeapSize()/1024/1024)+"MB");
+ sb.append(")<br>");
+ sb.append(GeoGebra.BUILD_DATE);
+diff --git a/geogebra/main/Application.java b/geogebra/main/Application.java
+index d613cfa..01ace52 100644
+--- a/geogebra/main/Application.java
++++ b/geogebra/main/Application.java
+@@ -361,7 +361,8 @@ public abstract class Application implements KeyEventDispatcher {
+
+ // Michael Borcherds 2008-05-05
+ // added to help debug applets
+- System.out.println("GeoGebra " + GeoGebra.VERSION_STRING + ", "
++ System.out.println("GeoGebra " + GeoGebra.VERSION_STRING + ", Debian package "
++ + GeoGebra.DEBIAN_VERSION_STRING + ", "
+ + GeoGebra.BUILD_DATE + ", Java "
+ + System.getProperty("java.version"));
+
+--
+tg: (fea2079..) patch/version (depends on: master)
diff --git a/debian/patches/series b/debian/patches/series
index f31abe9..cbffa5b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,5 +2,7 @@ patch/ScientificFormat.java.diff -p1
patch/applet_export.diff -p1
patch/build.xml.diff -p1
patch/flanagan_nonfree.diff -p1
+patch/geogebra.desktop.diff -p1
patch/jama.diff -p1
patch/no_mac.diff -p1
+patch/version.diff -p1
diff --git a/debian/rules b/debian/rules
index a5c656f..8c84036 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,16 +24,25 @@ DEB_JARS += /usr/share/java/freehep-graphicsio-svg.jar
DEB_JARS += /usr/share/java/freehep-graphicsio-pdf.jar
DEB_JARS += /usr/share/java/freehep-graphicsio-emf.jar
+configure/geogebra::
+ DEB_VERSION=$(DEB_VERSION) ./debian/create_debian_class.sh > $(CURDIR)/geogebra/GeoGebraDebian.java
+
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
+ # Update icons cache for freedesktop.org environments
+ dh_icons
+
install/geogebra-gnome::
install -m 755 $(CURDIR)/debian/ggthumb.sh $(CURDIR)/debian/geogebra-gnome/usr/bin/ggthumb
dh_gconf -pgeogebra-gnome
+clean::
+ rm -f $(CURDIR)/geogebra/GeoGebraDebian.java
+
get-orig-source:
./debian/get_orig_source.sh
diff --git a/geogebra/GeoGebra.java b/geogebra/GeoGebra.java
index e042af5..318d533 100644
--- a/geogebra/GeoGebra.java
+++ b/geogebra/GeoGebra.java
@@ -19,9 +19,9 @@ import java.net.URL;
public class GeoGebra extends Object {
// GeoGebra version
- public static final String BUILD_DATE = "July 21, 2010";
+ public static final String BUILD_DATE = "July 25, 2010";
- public static final String VERSION_STRING = "3.2.43.0";
+ public static final String VERSION_STRING = "3.2.44.0";
public static final String SHORT_VERSION_STRING = "3.2"; // used for online archive
// File format versions
diff --git a/geogebra/euclidian/DrawRay.java b/geogebra/euclidian/DrawRay.java
index 64d9f71..dd16981 100644
--- a/geogebra/euclidian/DrawRay.java
+++ b/geogebra/euclidian/DrawRay.java
@@ -79,7 +79,15 @@ implements Previewable {
if (isVisible) {
labelVisible = showLabel && geo.isLabelVisible();
updateStrokes(ray);
-
+
+ // calc start point of ray in screen coords
+ A = ray.getStartPoint();
+ A.getInhomCoords(a);
+ view.toScreenCoords(a);
+ // calc direction vector of ray in screen coords
+ v[0] = ray.y * view.xscale;
+ v[1] = ray.x * view.yscale;
+
setClippedLine();
// line on screen?
@@ -124,16 +132,8 @@ implements Previewable {
}
private void setClippedLine() {
- A = ray.getStartPoint();
-
- // calc start point of ray in screen coords
- A.getInhomCoords(a);
- boolean onscreenA = view.toScreenCoords(a);
+ boolean onscreenA = view.isOnScreen(a);
- // calc direction vector of ray in screen coords
- v[0] = ray.y * view.xscale;
- v[1] = ray.x * view.yscale;
-
// calc clip point C = a + lambda * v
double lambda;
if (Math.abs(v[0]) > Math.abs(v[1])) {
diff --git a/unix/usr/share/man/man1/geogebra.1.gz b/unix/usr/share/man/man1/geogebra.1.gz
index 4b76848..fb40284 100644
Binary files a/unix/usr/share/man/man1/geogebra.1.gz and b/unix/usr/share/man/man1/geogebra.1.gz differ
hooks/post-receive
--
GeoGebra: Dynamic mathematics software for education
More information about the pkg-java-commits
mailing list