The following commit has been merged in the build branch:
commit e71e4a074eb0752d642159a0b9b27325da01444f
Author: Giovanni Mascellani <mascell...@poisson.phc.unipi.it>
Date: Sat Mar 3 00:18:51 2012 +0100
Update patches.
diff --git a/debian/patches/patch/jar_files.diff
b/debian/patches/patch/jar_files.diff
deleted file mode 100644
index 4111e0c..0000000
--- a/debian/patches/patch/jar_files.diff
+++ /dev/null
@@ -1,42 +0,0 @@
-From: Giovanni Mascellani <g...@debian.org>
-Subject: [PATCH] patch/jar_files
-
-Trims the JAR list to just geogebra.jar, otherwise Java fails
-silently while searching other JARs (upstream splits the classes
-into many different files, but in Debian I keep everything inside
-geogebra.jar).
-
-Signed-off-by: Giovanni Mascellani <g...@debian.org>
-
----
- geogebra/main/Application.java | 15 +--------------
- 1 files changed, 1 insertions(+), 14 deletions(-)
-
-diff --git a/geogebra/main/Application.java b/geogebra/main/Application.java
-index e5c7038..ffee205 100644
---- a/geogebra/main/Application.java
-+++ b/geogebra/main/Application.java
-@@ -145,20 +145,7 @@ public class Application implements KeyEventDispatcher {
- // jar file names
- public final static String CAS_JAR_NAME = "geogebra_cas.jar";
- public final static String JAVASCRIPT_JAR_NAME =
"geogebra_javascript.jar";
-- public static final String[] JAR_FILES = { "geogebra.jar",
-- "geogebra_main.jar", "geogebra_gui.jar", CAS_JAR_NAME,
-- "geogebra_algos.jar", "geogebra_export.jar",
JAVASCRIPT_JAR_NAME, // don't
--
// put
--
// at
--
// end
--
// (sometimes
--
// omitted,
--
// see
--
// WorksheetExportDialog)
-- "jlatexmath.jar", // LaTeX
-- "jlm_greek.jar", // Greek Unicode codeblock (for LaTeX
texts)
-- "jlm_cyrillic.jar", // Cyrillic Unicode codeblock (for
LaTeX texts)
-- "geogebra_properties.jar" };
-+ public static final String[] JAR_FILES = { "geogebra.jar" };
-
- public static final String LOADING_GIF =
"http://www.geogebra.org/webstart/loading.gif";;
-
---
-tg: (402f16d..) patch/jar_files (depends on: build)
diff --git a/debian/patches/patch/jlatexmath.diff
b/debian/patches/patch/jlatexmath.diff
deleted file mode 100644
index 735f589..0000000
--- a/debian/patches/patch/jlatexmath.diff
+++ /dev/null
@@ -1,36 +0,0 @@
-From: Giovanni Mascellani <g...@debian.org>
-Subject: [PATCH] patch/jlatexmath
-
-Fix some calls to JLaTeXMath, that fail because of a slightly
-different API (there are some floats intead of ints).
-
-Signed-off-by: Giovanni Mascellani <g...@debian.org>
-
----
- geogebra/euclidian/DrawEquation.java | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/geogebra/euclidian/DrawEquation.java
b/geogebra/euclidian/DrawEquation.java
-index a60dbb1..60c7614 100644
---- a/geogebra/euclidian/DrawEquation.java
-+++ b/geogebra/euclidian/DrawEquation.java
-@@ -131,7 +131,7 @@ public class DrawEquation {
- formula = TeXFormula.getPartialTeXFormula(text);
- icon =
formula.createTeXIcon(TeXConstants.STYLE_DISPLAY, font.getSize() + 3, style,
fgColor);
-
--
formula.createTeXIcon(TeXConstants.STYLE_DISPLAY, 15, TeXConstants.UNIT_CM, 4f,
TeXConstants.ALIGN_LEFT, TeXConstants.UNIT_CM, 0.5f);
-+
formula.createTeXIcon(TeXConstants.STYLE_DISPLAY, 15f, TeXConstants.UNIT_CM,
4f, TeXConstants.ALIGN_LEFT, TeXConstants.UNIT_CM, 0.5f);
-
- //Rectangle rec =
drawMultiLineText(e.getMessage()+"\n"+text, x, y + g2.getFont().getSize(), g2);
- //return new Dimension(rec.width, rec.height);
-@@ -141,7 +141,7 @@ public class DrawEquation {
- // Write error message to Graphics View
-
- formula = TeXFormula.getPartialTeXFormula(text);
-- icon =
formula.createTeXIcon(TeXConstants.STYLE_DISPLAY, font.getSize() + 3, style,
fgColor);
-+ icon =
formula.createTeXIcon(TeXConstants.STYLE_DISPLAY, font.getSize() + 3f, style,
fgColor);
-
- //Rectangle rec =
drawMultiLineText(e.getMessage()+"\n"+text, x, y + g2.getFont().getSize(), g2);
- //return new Dimension(rec.width, rec.height);
---
-tg: (4896c42..) patch/jlatexmath (depends on: master)
diff --git a/debian/patches/patch/version.diff
b/debian/patches/patch/version.diff
index 5e5be43..cee26b6 100644
--- a/debian/patches/patch/version.diff
+++ b/debian/patches/patch/version.diff
@@ -10,7 +10,8 @@ Signed-off-by: Giovanni Mascellani
<mascell...@poisson.phc.unipi.it>
geogebra/GeoGebra.java | 2 ++
geogebra/GeoGebraAppletPreloader.java | 3 ++-
geogebra/gui/menubar/GeoGebraMenuBar.java | 4 +++-
- 3 files changed, 7 insertions(+), 2 deletions(-)
+ geogebra/main/Application.java | 3 ++-
+ 4 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/geogebra/GeoGebra.java b/geogebra/GeoGebra.java
index c503fc7..2a279c4 100644
@@ -54,5 +55,19 @@ index 6991e2c..d6529df 100644
sb.append("Java ");
sb.append(System.getProperty("java.version"));
sb.append(", ");
+diff --git a/geogebra/main/Application.java b/geogebra/main/Application.java
+index e5c7038..bca00b5 100644
+--- a/geogebra/main/Application.java
++++ b/geogebra/main/Application.java
+@@ -653,7 +653,8 @@ public class Application implements KeyEventDispatcher {
+ System.exit(0);
+ }
+ // help debug applets
+- System.out.println("GeoGebra " + GeoGebra.VERSION_STRING + " "
++ System.out.println("GeoGebra " + GeoGebra.VERSION_STRING + "
(Debian version "
++ + GeoGebra.DEBIAN_VERSION_STRING + ") "
+ + GeoGebra.BUILD_DATE + " Java "
+ + System.getProperty("java.version"));
+ if (args.containsArg("v")) {
--
tg: (4896c42..) patch/version (depends on: master)
diff --git a/debian/patches/series b/debian/patches/series
index ae3b723..e3ff3e8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,5 +2,3 @@ patch/ScientificFormat.java.diff -p1
patch/applet_export.diff -p1
patch/no_mac.diff -p1
patch/version.diff -p1
-patch/jlatexmath.diff -p1
-patch/jar_files.diff -p1
--
GeoGebra: Dynamic mathematics software for education
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
![http://www.geogebra.org/webstart/loading.gif"](http://www.geogebra.org/webstart/loading.gif"){kind=link}