Author: ewl-guest Date: 2010-02-06 14:21:40 +0000 (Sat, 06 Feb 2010) New Revision: 11510
Added: trunk/freemind/debian/patches/02_build_xml_jibx.patch Modified: trunk/freemind/debian/changelog trunk/freemind/debian/patches/03_freemind_sh.patch Log: adapt patches to use 1.1.6a versioned jar files. Modified: trunk/freemind/debian/changelog =================================================================== --- trunk/freemind/debian/changelog 2010-02-06 12:55:16 UTC (rev 11509) +++ trunk/freemind/debian/changelog 2010-02-06 14:21:40 UTC (rev 11510) @@ -1,7 +1,7 @@ freemind (0.9.0~rc6+dfsg-2) unstable; urgency=low * Change JiBX dependency to libjibx1.1-java (or libjibx-java 1.1.x for - Ubuntu). + Ubuntu), and adapt patches to use 1.1.6a versioned jar files. * Fix obsolete-relation-form-in-source in freemind depends: simplyhtml (> 0.13). * Improve existing MIME support and add MIME support for KDE3 Added: trunk/freemind/debian/patches/02_build_xml_jibx.patch =================================================================== --- trunk/freemind/debian/patches/02_build_xml_jibx.patch (rev 0) +++ trunk/freemind/debian/patches/02_build_xml_jibx.patch 2010-02-06 14:21:40 UTC (rev 11510) @@ -0,0 +1,14 @@ +diff -Nur -x '*.orig' -x '*~' freemind-0.9.0~rc6+dfsg/freemind/build.xml freemind-0.9.0~rc6+dfsg.new/freemind/build.xml +--- freemind-0.9.0~rc6+dfsg/freemind/build.xml 2010-02-06 15:16:35.000000000 +0100 ++++ freemind-0.9.0~rc6+dfsg.new/freemind/build.xml 2010-02-06 15:17:21.000000000 +0100 +@@ -38,8 +38,8 @@ + <!-- begin generator part --> + <property name="jibxhome" value="${java.dir}"/> + <property name="jibxjar" value="lib/bindings.jar"/> +- <property name="jibxruntimelibs" value="${jibxhome}/jibx-run.jar:${jibxhome}/xpp3.jar"/> +- <property name="jibxlibs" value="${jibxhome}/bcel.jar:${jibxhome}/jibx-bind.jar:${jibxhome}/jibx-extras.jar:${jibxruntimelibs}"/> ++ <property name="jibxruntimelibs" value="${jibxhome}/jibx-run-1.1.6a.jar:${jibxhome}/xpp3.jar"/> ++ <property name="jibxlibs" value="${jibxhome}/bcel.jar:${jibxhome}/jibx-bind-1.1.6a.jar:${jibxhome}/jibx-extras-1.1.6a.jar:${jibxruntimelibs}"/> + <taskdef name="bind" classname="org.jibx.binding.ant.CompileTask"> + <classpath path="${jibxlibs}"/> + </taskdef> Modified: trunk/freemind/debian/patches/03_freemind_sh.patch =================================================================== --- trunk/freemind/debian/patches/03_freemind_sh.patch 2010-02-06 12:55:16 UTC (rev 11509) +++ trunk/freemind/debian/patches/03_freemind_sh.patch 2010-02-06 14:21:40 UTC (rev 11510) @@ -19,7 +19,7 @@ -${freedir}/lib/jibx/xpp3.jar:\ +/usr/share/java/SimplyHTML.jar:\ +/usr/share/java/gnu-regexp.jar:\ -+/usr/share/java/jibx-run.jar:\ ++/usr/share/java/jibx-run-1.1.6a.jar:\ +/usr/share/java/xpp3.jar:\ ${freedir}/lib/bindings.jar:\ -${freedir}/lib/commons-lang-2.0.jar:\ _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits