From: Giovanni Mascellani Subject: [PATCH] patch/version Patches GeoGebra in order to make the Debian version visible along with the upstream one. Signed-off-by: Giovanni Mascellani --- 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(" ("); + sb.append(" Debian package "); + sb.append(GeoGebra.DEBIAN_VERSION_STRING); + sb.append(" ("); sb.append("Java "+ System.getProperty("java.version") + ", " +(app.getHeapSize()/1024/1024)+"MB"); sb.append(")
"); 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)