Author: ewl-guest
Date: 2007-03-18 16:12:42 +0000 (Sun, 18 Mar 2007)
New Revision: 3076

Added:
   trunk/freemind/debian/patches/50_groovy.patch
Modified:
   trunk/freemind/debian/rules
Log:
Fix some issues with groovy (possibly due to version of it in Debian)
Replace userdoc target through doc


Added: trunk/freemind/debian/patches/50_groovy.patch
===================================================================
--- trunk/freemind/debian/patches/50_groovy.patch       2007-03-14 21:08:36 UTC 
(rev 3075)
+++ trunk/freemind/debian/patches/50_groovy.patch       2007-03-18 16:12:42 UTC 
(rev 3076)
@@ -0,0 +1,17 @@
+diff -Nur freemind-0.9.0~beta9/freemind/plugins/script/ScriptEditor.java 
freemind-0.9.0~beta9.new/freemind/plugins/script/ScriptEditor.java
+--- freemind-0.9.0~beta9/freemind/plugins/script/ScriptEditor.java     
2007-03-18 17:06:33.000000000 +0100
++++ freemind-0.9.0~beta9.new/freemind/plugins/script/ScriptEditor.java 
2007-03-18 17:08:21.000000000 +0100
+@@ -81,10 +81,12 @@
+                       String script = getScript(pIndex).getScript();
+                       // redirect output:
+                       PrintStream oldOut = System.out;
+-                      Object value;
++                      Object value = null;
+                       try {
+                               System.setOut(pOutStream);
+                               value = shell.evaluate(script);
++                      } catch 
(org.codehaus.groovy.control.CompilationFailedException e) {
++                              logger.severe("Compilation of script failed.");
+                       } finally {
+                               System.setOut(oldOut);
+                       }

Modified: trunk/freemind/debian/rules
===================================================================
--- trunk/freemind/debian/rules 2007-03-14 21:08:36 UTC (rev 3075)
+++ trunk/freemind/debian/rules 2007-03-18 16:12:42 UTC (rev 3076)
@@ -16,7 +16,7 @@
 
 ANT_HOME             := /usr/share/ant
 DEB_JARS             := ant-antlr ant-apache-bcel ant-apache-bsf 
ant-apache-log4j ant-apache-oro ant-apache-regexp ant-commons-logging 
ant-javamail ant-jdepend ant-nodeps ant-swing ant-jmf ant-apache-resolver 
ant-commons-net ant-jsch ant-junit ant-trax
-DEB_ANT_BUILD_TARGET := dist userdoc browser
+DEB_ANT_BUILD_TARGET := dist doc browser
 DEB_BUILDDIR         := freemind
 DEB_COMPRESS_EXCLUDE := .mm
 


_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits

Reply via email to