Author: ewl-guest
Date: 2008-02-05 22:14:40 +0000 (Tue, 05 Feb 2008)
New Revision: 5597
Modified:
branches/freemind/BRANCH_0.8/debian/patches/01_build_xml.patch
branches/freemind/BRANCH_0.8/debian/patches/03_freemind_sh.patch
branches/freemind/BRANCH_0.8/debian/patches/06_build_xml_jaxme.nopatch
branches/freemind/BRANCH_0.8/debian/patches/07_freemind_sh_jaxme.nopatch
branches/freemind/BRANCH_0.8/debian/patches/51_base64_build_xml.patch
Log:
Remove the 1.0.5 version from forms.jar
Modified: branches/freemind/BRANCH_0.8/debian/patches/01_build_xml.patch
===================================================================
--- branches/freemind/BRANCH_0.8/debian/patches/01_build_xml.patch
2008-02-05 21:59:21 UTC (rev 5596)
+++ branches/freemind/BRANCH_0.8/debian/patches/01_build_xml.patch
2008-02-05 22:14:40 UTC (rev 5597)
@@ -17,7 +17,7 @@
- <property name="classpath"
value="${jaxb}:${xml}:lib/commons-lang-2.0.jar:lib/forms-1.0.5.jar"/>
+ <property name="jaxb"
value="${ant.dir}/jaxb-xjc.jar:${ant.dir}/jaxb-api.jar:${ant.dir}/jaxb-impl.jar:${ant.dir}/jaxb-libs.jar:${ant.dir}/namespace.jar:/usr/share/java/relaxngDatatype.jar:${ant.dir}/xsdlib.jar:${ant.dir}/jax-qname.jar"/>
+ <property name="xml" value="/usr/share/java/jaxp-1.2.jar"/>
-+ <property name="classpath"
value="${jaxb}:${xml}:/usr/share/java/commons-lang.jar:/usr/share/java/forms-1.0.5.jar"/>
++ <property name="classpath"
value="${jaxb}:${xml}:/usr/share/java/commons-lang.jar:/usr/share/java/forms.jar"/>
<property name="xsd.dir" value="." />
<property name="gen.dir" value="generated" />
<taskdef name="xjc" classname="com.sun.tools.xjc.XJCTask"
Modified: branches/freemind/BRANCH_0.8/debian/patches/03_freemind_sh.patch
===================================================================
--- branches/freemind/BRANCH_0.8/debian/patches/03_freemind_sh.patch
2008-02-05 21:59:21 UTC (rev 5596)
+++ branches/freemind/BRANCH_0.8/debian/patches/03_freemind_sh.patch
2008-02-05 22:14:40 UTC (rev 5597)
@@ -82,7 +82,7 @@
-${freedir}/lib/ant/lib/sax.jar:\
-${freedir}/lib/ant/lib/dom.jar:\
-${freedir}/lib/forms-1.0.5.jar:\
-+/usr/share/java/forms-1.0.5.jar:\
++/usr/share/java/forms.jar:\
+/usr/share/java/commons-lang.jar:\
+/usr/share/java/jaxp-1.2.jar:\
+/usr/share/java/relaxngDatatype.jar:\
Modified: branches/freemind/BRANCH_0.8/debian/patches/06_build_xml_jaxme.nopatch
===================================================================
--- branches/freemind/BRANCH_0.8/debian/patches/06_build_xml_jaxme.nopatch
2008-02-05 21:59:21 UTC (rev 5596)
+++ branches/freemind/BRANCH_0.8/debian/patches/06_build_xml_jaxme.nopatch
2008-02-05 22:14:40 UTC (rev 5597)
@@ -14,7 +14,7 @@
- <property name="jaxb"
value="${ant.dir}/jaxb-xjc.jar:${ant.dir}/jaxb-api.jar:${ant.dir}/jaxb-impl.jar:${ant.dir}/jaxb-libs.jar:${ant.dir}/namespace.jar:/usr/share/java/relaxngDatatype.jar:${ant.dir}/xsdlib.jar:${ant.dir}/jax-qname.jar"/>
+ <property name="jaxb"
value="${jaxme.dir}/jaxme2-0.5.jar:${jaxme.dir}/jaxme2-rt-0.5.jar:${jaxme.dir}/jaxmeapi-0.5.jar:${jaxme.dir}/jaxmejs-0.5.jar:${jaxme.dir}/jaxmepm-0.5.jar:${jaxme.dir}/jaxmexs-0.5.jar:/usr/share/java/relaxngDatatype.jar:${ant.dir}/xsdlib.jar"/>
<property name="xml" value="/usr/share/java/jaxp-1.2.jar"/>
- <property name="classpath"
value="${jaxb}:${xml}:/usr/share/java/commons-lang.jar:/usr/share/java/forms-1.0.5.jar"/>
+ <property name="classpath"
value="${jaxb}:${xml}:/usr/share/java/commons-lang.jar:/usr/share/java/forms.jar"/>
<property name="xsd.dir" value="." />
<property name="gen.dir" value="generated" />
- <taskdef name="xjc" classname="com.sun.tools.xjc.XJCTask"
Modified:
branches/freemind/BRANCH_0.8/debian/patches/07_freemind_sh_jaxme.nopatch
===================================================================
--- branches/freemind/BRANCH_0.8/debian/patches/07_freemind_sh_jaxme.nopatch
2008-02-05 21:59:21 UTC (rev 5596)
+++ branches/freemind/BRANCH_0.8/debian/patches/07_freemind_sh_jaxme.nopatch
2008-02-05 22:14:40 UTC (rev 5597)
@@ -18,6 +18,6 @@
+${jaxme.dir}/jaxmexs-0.5.jar:\
${freedir}/lib/ant/lib/xsdlib.jar:\
-${freedir}/lib/ant/lib/jax-qname.jar:\
- /usr/share/java/forms-1.0.5.jar:\
+ /usr/share/java/forms.jar:\
/usr/share/java/commons-lang.jar:\
/usr/share/java/jaxp-1.2.jar:\
Modified: branches/freemind/BRANCH_0.8/debian/patches/51_base64_build_xml.patch
===================================================================
--- branches/freemind/BRANCH_0.8/debian/patches/51_base64_build_xml.patch
2008-02-05 21:59:21 UTC (rev 5596)
+++ branches/freemind/BRANCH_0.8/debian/patches/51_base64_build_xml.patch
2008-02-05 22:14:40 UTC (rev 5597)
@@ -4,8 +4,8 @@
<!-- begin generator part -->
<property name="jaxb"
value="${ant.dir}/jaxb-xjc.jar:${ant.dir}/jaxb-api.jar:${ant.dir}/jaxb-impl.jar:${ant.dir}/jaxb-libs.jar:${ant.dir}/namespace.jar:/usr/share/java/relaxngDatatype.jar:${ant.dir}/xsdlib.jar:${ant.dir}/jax-qname.jar"/>
<property name="xml" value="/usr/share/java/jaxp-1.2.jar"/>
-- <property name="classpath"
value="${jaxb}:${xml}:/usr/share/java/commons-lang.jar:/usr/share/java/forms-1.0.5.jar"/>
-+ <property name="classpath"
value="${jaxb}:${xml}:/usr/share/java/commons-lang.jar:/usr/share/java/forms-1.0.5.jar:/usr/share/java/commons-codec.jar"/>
+- <property name="classpath"
value="${jaxb}:${xml}:/usr/share/java/commons-lang.jar:/usr/share/java/forms.jar"/>
++ <property name="classpath"
value="${jaxb}:${xml}:/usr/share/java/commons-lang.jar:/usr/share/java/forms.jar:/usr/share/java/commons-codec.jar"/>
<property name="xsd.dir" value="." />
<property name="gen.dir" value="generated" />
<taskdef name="xjc" classname="com.sun.tools.xjc.XJCTask"
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
