[pkg-java] r8012 - trunk/freemind/debian/patches

ewl-guest at alioth.debian.org ewl-guest at alioth.debian.org
Wed Feb 25 20:34:10 UTC 2009 

Author: ewl-guest
Date: 2009-02-25 20:34:10 +0000 (Wed, 25 Feb 2009)
New Revision: 8012

Added:
   trunk/freemind/debian/patches/41_plug_script_build.patch
   trunk/freemind/debian/patches/50_plug_latex_off.patch
Modified:
   trunk/freemind/debian/patches/01_build_xml.patch
   trunk/freemind/debian/patches/20_plug_svg.patch
   trunk/freemind/debian/patches/21_plug_svg_build.patch
Log:
Fix plugin classpath errors.
Deactivate the latex plugin for now.


Modified: trunk/freemind/debian/patches/01_build_xml.patch
===================================================================
--- trunk/freemind/debian/patches/01_build_xml.patch	2009-02-24 22:29:28 UTC (rev 8011)
+++ trunk/freemind/debian/patches/01_build_xml.patch	2009-02-25 20:34:10 UTC (rev 8012)
@@ -1,6 +1,6 @@
 diff -Nur -x '*.orig' -x '*~' freemind-0.9.0~rc1/freemind/build.xml freemind-0.9.0~rc1.new/freemind/build.xml
---- freemind-0.9.0~rc1/freemind/build.xml	2008-12-21 14:26:47.000000000 +0100
-+++ freemind-0.9.0~rc1.new/freemind/build.xml	2009-02-22 18:51:17.000000000 +0100
+--- freemind-0.9.0~rc1/freemind/build.xml	2009-02-25 20:48:50.000000000 +0100
++++ freemind-0.9.0~rc1.new/freemind/build.xml	2009-02-25 20:49:38.000000000 +0100
 @@ -31,15 +31,10 @@
  	<property name="java_source_version" value="1.4" />
  	<property name="java_target_version" value="1.4" />
@@ -67,7 +67,11 @@
  			</fileset>
  		</copy>
  
-@@ -189,11 +171,6 @@
+@@ -185,15 +167,9 @@
+ 		<condition property="isMacOs">
+ 			<os family="mac"/>
+ 		</condition>
+-		<antcall target="dist_icon"/>
  		<antcall target="dist_macos"/>
  	</target>
  
@@ -79,7 +83,7 @@
  	<target name="dist_macos" if="isMacOs">
  		<delete dir="${dist_macos}"/>
  		<mkdir dir="${dist_macos}"/>
-@@ -212,27 +189,6 @@
+@@ -212,27 +188,6 @@
  			</fileset>
  		</jar>
  		<delete file="${dist_macos}/freemind.properties"/>
@@ -107,7 +111,7 @@
  		<copy todir="${dist_macos_contents}/Resources/Java">
  			<fileset dir="${dist}">
  				<include name="browser/**" />
-@@ -468,7 +424,7 @@
+@@ -468,7 +423,7 @@
  	<target name="val">
  		<xmlvalidate lenient="false"
  		  failonerror="no" warn="true" classname="org.apache.xerces.parsers.SAXParser"

Modified: trunk/freemind/debian/patches/20_plug_svg.patch
===================================================================
--- trunk/freemind/debian/patches/20_plug_svg.patch	2009-02-24 22:29:28 UTC (rev 8011)
+++ trunk/freemind/debian/patches/20_plug_svg.patch	2009-02-25 20:34:10 UTC (rev 8012)
@@ -1,6 +1,6 @@
 --- freemind-0.8.0/freemind/plugins/ExportSvg.xml	2005-10-22 15:07:23.000000000 +0000
 +++ ExportSvg.xml	2005-10-22 15:07:04.000000000 +0000
-@@ -1,27 +1,14 @@
+@@ -1,27 +1,15 @@
  <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
  <plugin label="plugins/ExportPdf">
  	<plugin_classpath jar="svg/svg_plugin.jar"/>
@@ -27,12 +27,14 @@
 -	<plugin_classpath jar="svg/xml-apis.jar"/>
 +	<plugin_classpath jar="/usr/share/java/batik-all.jar"/>
 +	<plugin_classpath jar="/usr/share/java/js.jar"/>
-+	<plugin_classpath jar="/usr/share/java/fop-transcoder.jar"/>
++	<plugin_classpath jar="/usr/share/java/fop.jar"/>
 +	<plugin_classpath jar="/usr/share/java/xercesImpl.jar"/>
 +	<plugin_classpath jar="/usr/share/java/xmlParserAPIs.jar"/>
 +	<plugin_classpath jar="/usr/share/java/avalon-framework.jar"/>
 +	<plugin_classpath jar="/usr/share/java/commons-logging.jar"/>
 +	<plugin_classpath jar="/usr/share/java/commons-io.jar"/>
++	<plugin_classpath jar="/usr/share/java/xmlgraphics-commons.jar"/>
++	<plugin_classpath jar="/usr/share/java/xml-apis-ext.jar"/>
  	<plugin_action 
  		documentation="%plugins/ExportPdf.xml_documentation" 
  		name="%plugins/ExportPdf.xml_name" base="freemind.extensions.ModeControllerHookAdapter" 

Modified: trunk/freemind/debian/patches/21_plug_svg_build.patch
===================================================================
--- trunk/freemind/debian/patches/21_plug_svg_build.patch	2009-02-24 22:29:28 UTC (rev 8011)
+++ trunk/freemind/debian/patches/21_plug_svg_build.patch	2009-02-25 20:34:10 UTC (rev 8012)
@@ -5,7 +5,7 @@
  <!--	<property name="additional.lib" value="${plugin.dir}/batik-awt-util.jar:${plugin.dir}/batik-dom.jar:${plugin.dir}/batik-svggen.jar:${plugin.dir}/batik-util.jar:${plugin.dir}/batik-xml.jar"/>
  	-->	
 -	<property name="additional.lib" value="${plugin.dir}/batik-awt-util.jar:${plugin.dir}/batik-bridge.jar:${plugin.dir}/batik-css.jar:${plugin.dir}/batik-dom.jar:${plugin.dir}/batik-extension.jar:${plugin.dir}/batik-ext.jar:${plugin.dir}/batik-gui-util.jar:${plugin.dir}/batik-gvt.jar:${plugin.dir}/batik-parser.jar:${plugin.dir}/batik-script.jar:${plugin.dir}/batik-svg-dom.jar:${plugin.dir}/batik-svggen.jar:${plugin.dir}/batik-swing.jar:${plugin.dir}/batik-transcoder.jar:${plugin.dir}/batik-util.jar:${plugin.dir}/batik-xml.jar:${plugin.dir}/js.jar:${plugin.dir}/pdf-transcoder.jar:${plugin.dir}/xerces_2_5_0.jar:${plugin.dir}/xml-apis.jar:${plugin.dir}/batik-squiggle.jar"/>
-+	<property name="additional.lib" value="/usr/share/java/batik-all.jar:/usr/share/java/js.jar:/usr/share/java/fop-transcoder.jar:/usr/share/java/xercesImpl.jar:/usr/share/java/xmlParserAPIs.jar"/>
++	<property name="additional.lib" value="/usr/share/java/batik-all.jar:/usr/share/java/js.jar:/usr/share/java/fop.jar:/usr/share/java/xercesImpl.jar:/usr/share/java/xmlParserAPIs.jar:/usr/share/java/avalon-framework.jar:/usr/share/java/xmlgraphics-commons.jar"/>
  	
  	<property name="additional.lib.pattern" value="${plugin.dir}/*.jar"/>
  

Added: trunk/freemind/debian/patches/41_plug_script_build.patch
===================================================================
--- trunk/freemind/debian/patches/41_plug_script_build.patch	                        (rev 0)
+++ trunk/freemind/debian/patches/41_plug_script_build.patch	2009-02-25 20:34:10 UTC (rev 8012)
@@ -0,0 +1,16 @@
+diff -Nur -x '*.orig' -x '*~' freemind-0.9.0~rc1/freemind/plugins/build_scripting.xml freemind-0.9.0~rc1.new/freemind/plugins/build_scripting.xml
+--- freemind-0.9.0~rc1/freemind/plugins/build_scripting.xml	2008-07-18 21:02:53.000000000 +0200
++++ freemind-0.9.0~rc1.new/freemind/plugins/build_scripting.xml	2009-02-25 20:16:07.000000000 +0100
+@@ -4,9 +4,9 @@
+ 	<property name="plugin.dir" value="plugins/script"/>
+ 	<property name="plugin.jar" value="scripting_plugin.jar" />
+ 	<property name="plugin.zip" value="scripting_plugin-${ver}.zip" />
+-	<property name="additional.lib" value="${plugin.dir}/groovy-all-1.5.6.jar"/>
++	<property name="additional.lib" value="/usr/share/java/groovy.jar"/>
+ 	
+ 	<property name="additional.lib.pattern" value="${plugin.dir}/*.jar"/>
+ 
+ 	<import file="build_import.xml" />
+-</project>
+\ No newline at end of file
++</project>

Added: trunk/freemind/debian/patches/50_plug_latex_off.patch
===================================================================
--- trunk/freemind/debian/patches/50_plug_latex_off.patch	                        (rev 0)
+++ trunk/freemind/debian/patches/50_plug_latex_off.patch	2009-02-25 20:34:10 UTC (rev 8012)
@@ -0,0 +1,18 @@
+diff -Nur -x '*.orig' -x '*~' freemind-0.9.0~rc1/freemind/plugins/build.xml freemind-0.9.0~rc1.new/freemind/plugins/build.xml
+--- freemind-0.9.0~rc1/freemind/plugins/build.xml	2008-04-18 23:18:25.000000000 +0200
++++ freemind-0.9.0~rc1.new/freemind/plugins/build.xml	2009-02-25 20:06:12.000000000 +0100
+@@ -9,6 +9,7 @@
+ 					<!-- The import script can't be executed. -->
+ 				    <exclude name="build_import.xml"/>
+ 				    <exclude name="build_jabber.xml"/>
++				    <exclude name="build_latex.xml"/>
+ 				</fileset>
+ 			</subant>
+ 		</sequential>
+@@ -26,4 +27,4 @@
+ 		<callant task="post"/>
+ 	</target>
+ 
+-</project>
+\ No newline at end of file
++</project>

More information about the pkg-java-commits mailing list