The following commit has been merged in the build branch:
commit 7a8832e8bdf28735aed71f74d3915bf952e13b8f
Author: Giovanni Mascellani
Date: Tue Dec 27 19:32:36 2011 +0100
Update patches.
diff --git a/debian/patches/patch/ScientificFormat.java.diff
b/debian/patches/patch/ScientificFormat.java.diff
index 6cf0d22..d90ff32 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: (87975a1..) patch/ScientificFormat.java (depends on: master)
+tg: (854ab75..) patch/ScientificFormat.java (depends on: master)
diff --git a/debian/patches/patch/applet_export.diff
b/debian/patches/patch/applet_export.diff
index 3f3e900..c0f0778 100644
--- a/debian/patches/patch/applet_export.diff
+++ b/debian/patches/patch/applet_export.diff
@@ -33,4 +33,4 @@ index b489be3..bb7a89c 100644
e.printStackTrace();
}
--
-tg: (87975a1..) patch/applet_export (depends on: master)
+tg: (854ab75..) patch/applet_export (depends on: master)
diff --git a/debian/patches/patch/jlatexmath.diff
b/debian/patches/patch/jlatexmath.diff
index d10df64..4f0086b 100644
--- a/debian/patches/patch/jlatexmath.diff
+++ b/debian/patches/patch/jlatexmath.diff
@@ -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: (feb5468..) patch/jlatexmath (depends on: master)
+tg: (854ab75..) patch/jlatexmath (depends on: master)
diff --git a/debian/patches/patch/no_mac.diff b/debian/patches/patch/no_mac.diff
index 75ae1ce..d65d9e2 100644
--- a/debian/patches/patch/no_mac.diff
+++ b/debian/patches/patch/no_mac.diff
@@ -139,4 +139,4 @@ index 0c53155..000
-
-}
--
-tg: (87975a1..) patch/no_mac (depends on: master)
+tg: (854ab75..) patch/no_mac (depends on: master)
diff --git a/debian/patches/patch/version.diff
b/debian/patches/patch/version.diff
index 7d5749b..086be5f 100644
--- a/debian/patches/patch/version.diff
+++ b/debian/patches/patch/version.diff
@@ -7,34 +7,24 @@ along with the upstream one.
Signed-off-by: Giovanni Mascellani
---
- geogebra/GeoGebra.java|7 +--
+ geogebra/GeoGebra.java|2 ++
geogebra/GeoGebraAppletPreloader.java |3 ++-
geogebra/gui/menubar/GeoGebraMenuBar.java |4 +++-
- 3 files changed, 10 insertions(+), 4 deletions(-)
+ 3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/geogebra/GeoGebra.java b/geogebra/GeoGebra.java
-index f25403d..86c 100644
+index f9c86c8..3d754ca 100644
--- a/geogebra/GeoGebra.java
+++ b/geogebra/GeoGebra.java
-@@ -26,7 +26,10 @@ public class GeoGebra extends Object {
- public static final String SHORT_VERSION_STRING = "4.0"; // used for
online archive
+@@ -28,6 +28,8 @@ public class GeoGebra extends Object {
public static final boolean CAS_VIEW_ENABLED = false;
public static final boolean IS_PRE_RELEASE =
!VERSION_STRING.endsWith(".0");
--
+
++public static final String DEBIAN_VERSION_STRING =
GeoGebraDebian.DEBIAN_VERSION_STRING;
+
-+ // Debian version
-+ public static final String DEBIAN_VERSION_STRING =
GeoGebraDebian.DEBIAN_VERSION_STRING;
-+
// File format versions
public static final String XML_FILE_FORMAT = "4.0";
public static final String GGB_XSD_FILENAME = "ggb.xsd"; // for ggb
files
-@@ -96,4 +99,4 @@ public class GeoGebra extends Object {
- geogebra.gui.app.GeoGebraFrame.main(args);
- }
-
--}
-\ No newline at end of file
-+}
diff --git a/geogebra/GeoGebraAppletPreloader.java
b/geogebra/GeoGebraAppletPreloader.java
index d8de89d..2929722 100644
--- a/geogebra/GeoGebraAppletPreloader.java
@@ -65,4 +55,4 @@ index 6991e2c..d6529df 100644
sb.append(System.getProperty("java.version"));
sb.append(", ");
--
-tg: (87975a1..) patch/version (depends on: master)
+tg: (854ab75..) patch/version (depends on: master)
--
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
