The following commit has been merged in the build branch: commit 111b33f6e5f0681c0d7f287f85d7bd203db3af56 Author: Giovanni Mascellani <mascell...@poisson.phc.unipi.it> Date: Sat May 12 00:36:29 2012 +0200
Update patches. diff --git a/debian/patches/patch/ScientificFormat.java.diff b/debian/patches/patch/ScientificFormat.java.diff index acf0c8b..2af9a1e 100644 --- a/debian/patches/patch/ScientificFormat.java.diff +++ b/debian/patches/patch/ScientificFormat.java.diff @@ -7,7 +7,7 @@ Signed-off-by: Giovanni Mascellani <mascell...@poisson.phc.unipi.it> --- geogebra/util/ScientificFormat.java | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) + 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/geogebra/util/ScientificFormat.java b/geogebra/util/ScientificFormat.java index 839e673..d983c7f 100644 @@ -42,4 +42,4 @@ index 839e673..d983c7f 100644 \ No newline at end of file +} -- -tg: (4896c42..) patch/ScientificFormat.java (depends on: master) +tg: (cb0585b..) patch/ScientificFormat.java (depends on: master) diff --git a/debian/patches/patch/applet_export.diff b/debian/patches/patch/applet_export.diff index d201eef..67e56ea 100644 --- a/debian/patches/patch/applet_export.diff +++ b/debian/patches/patch/applet_export.diff @@ -8,13 +8,13 @@ Signed-off-by: Giovanni Mascellani <mascell...@poisson.phc.unipi.it> --- geogebra/export/WorksheetExportDialog.java | 9 +++++++-- - 1 files changed, 7 insertions(+), 2 deletions(-) + 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/geogebra/export/WorksheetExportDialog.java b/geogebra/export/WorksheetExportDialog.java -index ba4ba36..37d3c5f 100644 +index 9648a8b..712e304 100644 --- a/geogebra/export/WorksheetExportDialog.java +++ b/geogebra/export/WorksheetExportDialog.java -@@ -1110,10 +1110,15 @@ public class WorksheetExportDialog extends JDialog { +@@ -1086,10 +1086,15 @@ public class WorksheetExportDialog extends JDialog { * unsigned applet is needed for the options set. */ private URL getAppletCodebase() { @@ -33,4 +33,4 @@ index ba4ba36..37d3c5f 100644 e.printStackTrace(); } -- -tg: (4896c42..) patch/applet_export (depends on: master) +tg: (cb0585b..) patch/applet_export (depends on: master) diff --git a/debian/patches/patch/no_mac.diff b/debian/patches/patch/no_mac.diff index b086733..6b7cec9 100644 --- a/debian/patches/patch/no_mac.diff +++ b/debian/patches/patch/no_mac.diff @@ -8,10 +8,10 @@ Signed-off-by: Giovanni Mascellani <mascell...@poisson.phc.unipi.it> --- geogebra/gui/app/GeoGebraFrame.java | 10 --- geogebra/gui/app/MacApplicationListener.java | 101 -------------------------- - 2 files changed, 0 insertions(+), 111 deletions(-) + 2 files changed, 111 deletions(-) diff --git a/geogebra/gui/app/GeoGebraFrame.java b/geogebra/gui/app/GeoGebraFrame.java -index bc5fbe0..2c8f7df 100644 +index ec4dda1..b5b8ec2 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: (4896c42..) patch/no_mac (depends on: master) +tg: (cb0585b..) patch/no_mac (depends on: master) diff --git a/debian/patches/patch/version.diff b/debian/patches/patch/version.diff index 5aec1e6..282f53e 100644 --- a/debian/patches/patch/version.diff +++ b/debian/patches/patch/version.diff @@ -16,7 +16,7 @@ Signed-off-by: Giovanni Mascellani <mascell...@poisson.phc.unipi.it> 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/geogebra/GeoGebra.java b/geogebra/GeoGebra.java -index c503fc7..2a279c4 100644 +index bd03821..ff31dfc 100644 --- a/geogebra/GeoGebra.java +++ b/geogebra/GeoGebra.java @@ -28,6 +28,8 @@ public class GeoGebra extends Object { @@ -43,10 +43,10 @@ index d8de89d..2929722 100644 } diff --git a/geogebra/gui/app/GeoGebraFrame.java b/geogebra/gui/app/GeoGebraFrame.java -index bc5fbe0..ec0f215 100644 +index ec4dda1..63d06b2 100644 --- a/geogebra/gui/app/GeoGebraFrame.java +++ b/geogebra/gui/app/GeoGebraFrame.java -@@ -467,16 +467,9 @@ public class GeoGebraFrame extends JFrame implements WindowFocusListener { +@@ -470,16 +470,9 @@ public class GeoGebraFrame extends JFrame implements WindowFocusListener { String dl = app.getPlain("GoToDownloadPage"); Object[] options = { app.getMenu("Cancel"), dl }; Component comp = app.getMainComponent(); @@ -79,10 +79,10 @@ index 6991e2c..d6529df 100644 sb.append(System.getProperty("java.version")); sb.append(", "); diff --git a/geogebra/main/Application.java b/geogebra/main/Application.java -index e5c7038..bca00b5 100644 +index fb2d7ec..a4c3890 100644 --- a/geogebra/main/Application.java +++ b/geogebra/main/Application.java -@@ -653,7 +653,8 @@ public class Application implements KeyEventDispatcher { +@@ -652,7 +652,8 @@ public class Application implements KeyEventDispatcher { System.exit(0); } // help debug applets @@ -93,4 +93,4 @@ index e5c7038..bca00b5 100644 + System.getProperty("java.version")); if (args.containsArg("v")) { -- -tg: (4896c42..) patch/version (depends on: master) +tg: (cb0585b..) 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