[SCM] GeoGebra: Dynamic mathematics software for education branch, build, updated. debian/4.0.19.0+dfsg1-2-11-gca82a24
Giovanni Mascellani
mascellani at poisson.phc.unipi.it
Sat Mar 3 00:07:28 UTC 2012
The following commit has been merged in the build branch:
commit 4a0dcae693f886da268a34f20ee65f80d5c39328
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date: Sun Feb 26 12:53:47 2012 +0100
Update patches.
diff --git a/debian/patches/patch/ScientificFormat.java.diff b/debian/patches/patch/ScientificFormat.java.diff
index d90ff32..acf0c8b 100644
--- a/debian/patches/patch/ScientificFormat.java.diff
+++ b/debian/patches/patch/ScientificFormat.java.diff
@@ -42,4 +42,4 @@ index 839e673..d983c7f 100644
\ No newline at end of file
+}
--
-tg: (854ab75..) patch/ScientificFormat.java (depends on: master)
+tg: (4896c42..) patch/ScientificFormat.java (depends on: master)
diff --git a/debian/patches/patch/applet_export.diff b/debian/patches/patch/applet_export.diff
index c0f0778..d201eef 100644
--- a/debian/patches/patch/applet_export.diff
+++ b/debian/patches/patch/applet_export.diff
@@ -11,10 +11,10 @@ Signed-off-by: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/geogebra/export/WorksheetExportDialog.java b/geogebra/export/WorksheetExportDialog.java
-index b489be3..bb7a89c 100644
+index ba4ba36..37d3c5f 100644
--- a/geogebra/export/WorksheetExportDialog.java
+++ b/geogebra/export/WorksheetExportDialog.java
-@@ -1109,10 +1109,15 @@ public class WorksheetExportDialog extends JDialog {
+@@ -1110,10 +1110,15 @@ public class WorksheetExportDialog extends JDialog {
* unsigned applet is needed for the options set.
*/
private URL getAppletCodebase() {
@@ -33,4 +33,4 @@ index b489be3..bb7a89c 100644
e.printStackTrace();
}
--
-tg: (854ab75..) patch/applet_export (depends on: master)
+tg: (4896c42..) patch/applet_export (depends on: master)
diff --git a/debian/patches/patch/jar_files.diff b/debian/patches/patch/jar_files.diff
new file mode 100644
index 0000000..4111e0c
--- /dev/null
+++ b/debian/patches/patch/jar_files.diff
@@ -0,0 +1,42 @@
+From: Giovanni Mascellani <gio at 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 <gio at 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
index 4f0086b..735f589 100644
--- a/debian/patches/patch/jlatexmath.diff
+++ b/debian/patches/patch/jlatexmath.diff
@@ -11,10 +11,10 @@ Signed-off-by: Giovanni Mascellani <gio at debian.org>
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/geogebra/euclidian/DrawEquation.java b/geogebra/euclidian/DrawEquation.java
-index 408a554..93b559a 100644
+index a60dbb1..60c7614 100644
--- a/geogebra/euclidian/DrawEquation.java
+++ b/geogebra/euclidian/DrawEquation.java
-@@ -127,7 +127,7 @@ public class DrawEquation {
+@@ -131,7 +131,7 @@ public class DrawEquation {
formula = TeXFormula.getPartialTeXFormula(text);
icon = formula.createTeXIcon(TeXConstants.STYLE_DISPLAY, font.getSize() + 3, style, fgColor);
@@ -23,7 +23,7 @@ index 408a554..93b559a 100644
//Rectangle rec = drawMultiLineText(e.getMessage()+"\n"+text, x, y + g2.getFont().getSize(), g2);
//return new Dimension(rec.width, rec.height);
-@@ -137,7 +137,7 @@ public class DrawEquation {
+@@ -141,7 +141,7 @@ public class DrawEquation {
// Write error message to Graphics View
formula = TeXFormula.getPartialTeXFormula(text);
@@ -33,4 +33,4 @@ index 408a554..93b559a 100644
//Rectangle rec = drawMultiLineText(e.getMessage()+"\n"+text, x, y + g2.getFont().getSize(), g2);
//return new Dimension(rec.width, rec.height);
--
-tg: (854ab75..) patch/jlatexmath (depends on: master)
+tg: (4896c42..) patch/jlatexmath (depends on: master)
diff --git a/debian/patches/patch/no_mac.diff b/debian/patches/patch/no_mac.diff
index d65d9e2..b086733 100644
--- a/debian/patches/patch/no_mac.diff
+++ b/debian/patches/patch/no_mac.diff
@@ -11,7 +11,7 @@ Signed-off-by: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
2 files changed, 0 insertions(+), 111 deletions(-)
diff --git a/geogebra/gui/app/GeoGebraFrame.java b/geogebra/gui/app/GeoGebraFrame.java
-index bafbee0..4ee3b7a 100644
+index bc5fbe0..2c8f7df 100644
--- a/geogebra/gui/app/GeoGebraFrame.java
+++ b/geogebra/gui/app/GeoGebraFrame.java
@@ -255,16 +255,6 @@ public class GeoGebraFrame extends JFrame implements WindowFocusListener {
@@ -139,4 +139,4 @@ index 0c53155..0000000
-
-}
--
-tg: (854ab75..) patch/no_mac (depends on: master)
+tg: (4896c42..) patch/no_mac (depends on: master)
diff --git a/debian/patches/patch/version.diff b/debian/patches/patch/version.diff
index 086be5f..5e5be43 100644
--- a/debian/patches/patch/version.diff
+++ b/debian/patches/patch/version.diff
@@ -13,7 +13,7 @@ Signed-off-by: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/geogebra/GeoGebra.java b/geogebra/GeoGebra.java
-index f9c86c8..3d754ca 100644
+index c503fc7..2a279c4 100644
--- a/geogebra/GeoGebra.java
+++ b/geogebra/GeoGebra.java
@@ -28,6 +28,8 @@ public class GeoGebra extends Object {
@@ -55,4 +55,4 @@ index 6991e2c..d6529df 100644
sb.append(System.getProperty("java.version"));
sb.append(", ");
--
-tg: (854ab75..) patch/version (depends on: master)
+tg: (4896c42..) patch/version (depends on: master)
diff --git a/debian/patches/series b/debian/patches/series
index d0fe6bf..ae3b723 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ 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
More information about the pkg-java-commits
mailing list