[SCM] GeoGebra: Dynamic mathematics software for education branch, eclipse, updated. debian/3.2.42.0+dfsg1-1-112-g23f14d6
Giovanni Mascellani
gio at alioth.debian.org
Sun Aug 1 17:38:04 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 23f14d634e85f3b35694ec68da458c62515d453e (commit)
via d416b6c22c224c780d14ecd2724effa976375f76 (commit)
via f8429ed5e97b3760bab81b4f83ac7e5c047bc01d (commit)
via 16044df691603db707417cd93a3462f34a588a3b (commit)
via 420cc44603c69a4b8930a4f684954c97600cc523 (commit)
via 2ef590ea09f4a4d73f44d49bee4ed5239a44bcf1 (commit)
via ebb1996a54da8876b56ed978e07f248200bb54a6 (commit)
via 8c4fbd140be54f198ced792208e537c26512367e (commit)
via 546d9d3af5fb4f60815e503620f9b515b9a3a75d (commit)
via 6db86fec71f8fb3e745e3380a5fdd9c4f99446ef (commit)
via b7edd82eb6ebc75684eb4f9528f6c4cf7a6d7b25 (commit)
via 5a430657ced7cd4161701256e1661304642b61d8 (commit)
via f0d14dec0a643af6026866ed3014ad9b57341f72 (commit)
via 59a2ae2e613cf5ac388add11d586bdc5e54042ed (commit)
via de356d2b71956a690aec9d46e01fa7c21395b1ea (commit)
via 75b5809b2b381989ecdd5dbe8b91178caa6142ef (commit)
via 664d0ac37a78dd2e37958442012a2eb9a5803e70 (commit)
via 62bfddf57007ecb300cf21d5772cac9f0cb665ed (commit)
via 9d4005d8fbfa386c0bd9f93ec1c856057b2ace7a (commit)
via 876170d19888bac59c7feb08ce243de5f0d64ebc (commit)
via 8239c2d552b25de097a54dcd8c35f8e68419177e (commit)
via fc52bbb7d008f0ac7754d4cd986d9b78c80ceb59 (commit)
via c87b9b5ac57182713eadc03b308a2e06915c5c35 (commit)
via 5ff23ad5a1a90296e4a1973a04804fe0d20c0255 (commit)
via 3fc3b7d85ccc6218115a8bd7e67f2e5ca331f1a8 (commit)
via 206783c3cf01dc43004a1ffe6d08d8c5a28e451d (commit)
via fa4a29ad088bcdc7e5d52db72c16403c2a825131 (commit)
via 05ee9c7d833243b867ca03fa404b1c27e01c8f66 (commit)
via 1d9ae8dcde680fe578e9cf6d402992f132f8e80f (commit)
via 1d97afe7d8e41dcc085fc3b4414b7fbc96e5527c (commit)
from 636043d4087b7a9c28b9e5e48c553efe8d891aab (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 23f14d634e85f3b35694ec68da458c62515d453e
Merge: d416b6c 2ef590e
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date: Sun Aug 1 18:46:02 2010 +0200
Merge remote branch 'origin/patch/geogebra.desktop' into eclipse
commit d416b6c22c224c780d14ecd2724effa976375f76
Merge: 636043d f8429ed
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date: Sun Aug 1 18:45:56 2010 +0200
Merge remote branch 'origin/master' into eclipse
commit 2ef590ea09f4a4d73f44d49bee4ed5239a44bcf1
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date: Sun Aug 1 17:39:34 2010 +0200
Categories fixed
commit ebb1996a54da8876b56ed978e07f248200bb54a6
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date: Sun Aug 1 11:28:22 2010 +0200
Categories fixed in .desktop
commit 8c4fbd140be54f198ced792208e537c26512367e
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date: Sun Aug 1 11:26:44 2010 +0200
Added patch geogebra.desktop
-----------------------------------------------------------------------
Summary of changes:
debian/TODO | 3 ---
debian/changelog | 16 ++++++++++++++++
debian/control | 21 +++++++++++++++++++++
debian/copyright | 6 ------
debian/docs | 1 -
debian/geogebra-gnome.dirs | 1 +
debian/geogebra-gnome.gconf-defaults | 2 ++
debian/geogebra-gnome.manpages | 1 +
debian/{dirs => geogebra.dirs} | 0
debian/{install => geogebra.install} | 0
debian/geogebra.links | 2 ++
debian/geogebra.png | Bin 2344 -> 0 bytes
debian/ggthumb.sh | 17 +++++++++++++++++
debian/rules | 7 +++++++
debian/source/include-binaries | 1 -
geogebra/GeoGebra.java | 4 ++--
geogebra/euclidian/DrawRay.java | 20 ++++++++++----------
unix/usr/share/applications/geogebra.desktop | 2 +-
unix/usr/share/man/man1/geogebra.1.gz | Bin 613 -> 620 bytes
19 files changed, 80 insertions(+), 24 deletions(-)
diff --git a/debian/TODO b/debian/TODO
index e3612fa..3d89ac1 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -4,6 +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
- * add thumbnailer
diff --git a/debian/changelog b/debian/changelog
index e5adcb2..d13fedd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+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.
+
+ -- Giovanni Mascellani <gio at debian.org> Sun, 01 Aug 2010 11:14:51 +0200
+
+geogebra (3.2.43.0+dfsg1-2) unstable; urgency=low
+
+ * Added package geogebra-gnome, with a GNOME thumbnailer for GeoGebra
+ files.
+
+ -- Giovanni Mascellani <gio at debian.org> Sun, 25 Jul 2010 00:22:01 +0200
+
geogebra (3.2.43.0+dfsg1-1) unstable; urgency=low
* New upstream release (mostly bugfixes).
diff --git a/debian/control b/debian/control
index a0b704f..94a96bf 100644
--- a/debian/control
+++ b/debian/control
@@ -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
@@ -52,3 +53,23 @@ Description: Dynamic mathematics software for education
.
GeoGebra files can be exported in many different formats, or as interactive
applets for web pages.
+
+Package: geogebra-gnome
+Architecture: all
+Depends:
+ geogebra,
+ imagemagick,
+ ${misc:Depends}
+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
+ can be entered directly.
+ .
+ Support for many geometric constructions is provided, as well as support
+ for many elementary calculus-based tools (derivatives, osculating circle, ...).
+ .
+ GeoGebra files can be exported in many different formats, or as interactive
+ applets for web pages.
+ .
+ This package contains the GNOME thumbnailer for the GeoGebra file format.
diff --git a/debian/copyright b/debian/copyright
index bc9cf7a..440709b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -183,12 +183,6 @@ Files: debian/*
Copyright: 2010, Giovanni Mascellani <gio at debian.org>
License: GPL-2+
-Files: debian/geogebra.png,
- debian/geogebra.sharedmimeinfo,
- debian/geogebra.desktop
-Copyright: 2010, Gabor Ancsin <gabor at geogebra.org>
-License: GPL-2+
-
License: GPL-2+
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/debian/docs b/debian/docs
index 44620c5..5f222ff 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,2 +1 @@
-_LICENSE.txt
_README.txt
diff --git a/debian/geogebra-gnome.dirs b/debian/geogebra-gnome.dirs
new file mode 100644
index 0000000..e772481
--- /dev/null
+++ b/debian/geogebra-gnome.dirs
@@ -0,0 +1 @@
+usr/bin
diff --git a/debian/geogebra-gnome.gconf-defaults b/debian/geogebra-gnome.gconf-defaults
new file mode 100644
index 0000000..c8c6f32
--- /dev/null
+++ b/debian/geogebra-gnome.gconf-defaults
@@ -0,0 +1,2 @@
+/desktop/gnome/thumbnailers/application at vnd.geogebra.file/command /usr/bin/ggthumb %i %o %s
+/desktop/gnome/thumbnailers/application at vnd.geogebra.file/enable true
diff --git a/debian/geogebra-gnome.manpages b/debian/geogebra-gnome.manpages
new file mode 100644
index 0000000..15dbae8
--- /dev/null
+++ b/debian/geogebra-gnome.manpages
@@ -0,0 +1 @@
+unix/usr/share/man/man1/ggthumb.1.gz
diff --git a/debian/dirs b/debian/geogebra.dirs
similarity index 100%
rename from debian/dirs
rename to debian/geogebra.dirs
diff --git a/debian/install b/debian/geogebra.install
similarity index 100%
rename from debian/install
rename to debian/geogebra.install
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/geogebra.png b/debian/geogebra.png
deleted file mode 100644
index 51654ca..0000000
Binary files a/debian/geogebra.png and /dev/null differ
diff --git a/debian/ggthumb.sh b/debian/ggthumb.sh
new file mode 100755
index 0000000..ba3f3a9
--- /dev/null
+++ b/debian/ggthumb.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+# Use: ggthumb input_file output_file size
+
+if [ "$#" -ne "3" ] ; then
+ echo "Usage: ggthumb input_file output_file size"
+ exit 1
+fi
+
+INPUT_FILE="$1"
+OUTPUT_FILE="$2"
+SIZE="$3"
+
+TEMPDIR="`mktemp -d`"
+unzip -qq "$INPUT_FILE" -d "$TEMPDIR"
+convert -resize "$SIZE" "$TEMPDIR/geogebra_thumbnail.png" "$OUTPUT_FILE"
+rm -fr "$TEMPDIR"
+
diff --git a/debian/rules b/debian/rules
index 3b93409..1f58c8a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,6 +30,13 @@ install/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
+
get-orig-source:
./debian/get_orig_source.sh
diff --git a/debian/source/include-binaries b/debian/source/include-binaries
deleted file mode 100644
index c89dcaa..0000000
--- a/debian/source/include-binaries
+++ /dev/null
@@ -1 +0,0 @@
-debian/geogebra.png
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/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;
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