Author: tille
Date: 2011-02-21 20:50:30 +0000 (Mon, 21 Feb 2011)
New Revision: 6051
Modified:
trunk/packages/beast-mcmc/trunk/debian/get-orig-source
trunk/packages/beast-mcmc/trunk/debian/patches/fix_classpath_in_build_xml.patch
trunk/packages/beast-mcmc/trunk/debian/rules
Log:
Use Debian packaged itext library
Modified: trunk/packages/beast-mcmc/trunk/debian/get-orig-source
===================================================================
--- trunk/packages/beast-mcmc/trunk/debian/get-orig-source 2011-02-21
18:25:02 UTC (rev 6050)
+++ trunk/packages/beast-mcmc/trunk/debian/get-orig-source 2011-02-21
20:50:30 UTC (rev 6051)
@@ -18,10 +18,12 @@
JRI.jar \
commons-math-2.0.jar \
figtreepanel.jar \
+ itext-1.4.5.jar \
jam.jar \
jdom.jar \
jebl.jar \
junit-4.4.jar \
+ libjri.jnilib \
; do
rm -rf ${TARDIR}/lib/$jar
done
Modified:
trunk/packages/beast-mcmc/trunk/debian/patches/fix_classpath_in_build_xml.patch
===================================================================
---
trunk/packages/beast-mcmc/trunk/debian/patches/fix_classpath_in_build_xml.patch
2011-02-21 18:25:02 UTC (rev 6050)
+++
trunk/packages/beast-mcmc/trunk/debian/patches/fix_classpath_in_build_xml.patch
2011-02-21 20:50:30 UTC (rev 6051)
@@ -8,12 +8,13 @@
<property name="dist" location="${build}/dist" />
<property name="main_class_BEAST" value="dr.app.beast.BeastMain" />
-@@ -20,6 +21,13 @@
+@@ -20,6 +21,14 @@
<path id="classpath">
<fileset dir="${lib}" includes="**/*.jar"/>
+ <fileset dir="${deblib}" includes="commons-math.jar"/>
+ <fileset dir="${deblib}" includes="figtree.jar"/>
++ <fileset dir="${deblib}" includes="itext1.jar"/>
+ <fileset dir="${deblib}" includes="jam.jar"/>
+ <fileset dir="${deblib}" includes="jdom1.jar"/>
+ <fileset dir="${deblib}" includes="jebl.jar"/>
@@ -22,28 +23,29 @@
</path>
<!-- start -->
-@@ -130,12 +138,8 @@
+@@ -130,12 +139,7 @@
<include name="org/virion/jam/**/*.png" />
<include name="dr/**/*.properties" />
</fileset>
- <zipgroupfileset dir="${lib}" includes="jebl.jar" />
- <zipgroupfileset dir="${lib}" includes="jam.jar" />
- <zipgroupfileset dir="${lib}" includes="jdom.jar" />
+- <zipgroupfileset dir="${lib}" includes="jdom.jar" />
- <zipgroupfileset dir="${lib}"
includes="commons-math-2.0.jar" />
<zipgroupfileset dir="${lib}" includes="mtj.jar" />
- <zipgroupfileset dir="${lib}" includes="JRI.jar" />
<zipgroupfileset dir="${lib}" includes="colt.jar" />
<zipgroupfileset dir="${lib}" includes="beagle.jar" />
</jar>
-@@ -193,8 +197,6 @@
+@@ -193,9 +197,6 @@
<fileset dir="${src}">
<include name="dr/**/*.png" />
</fileset>
- <zipgroupfileset dir="${lib}" includes="jam.jar" />
- <zipgroupfileset dir="${lib}" includes="jebl.jar" />
- <zipgroupfileset dir="${lib}" includes="jdom.jar" />
+- <zipgroupfileset dir="${lib}" includes="jdom.jar" />
<zipgroupfileset dir="${lib}"
includes="commons-math-2.0.jar" />
<zipgroupfileset dir="${lib}" includes="mtj.jar" />
+ </jar>
--- beast-mcmc-1.6.1+svnr3660.orig.orig/.classpath
+++ beast-mcmc-1.6.1+svnr3660.orig/.classpath
@@ -3,14 +3,14 @@
Modified: trunk/packages/beast-mcmc/trunk/debian/rules
===================================================================
--- trunk/packages/beast-mcmc/trunk/debian/rules 2011-02-21 18:25:02 UTC
(rev 6050)
+++ trunk/packages/beast-mcmc/trunk/debian/rules 2011-02-21 20:50:30 UTC
(rev 6051)
@@ -9,7 +9,7 @@
PACKAGE = beast-mcmc
DEBJAR := /usr/share/java
-export CLASSPATH :=
lib/itext-1.4.5.jar:lib/beagle.jar:lib/mpj.jar:lib/org.boehn.kmlframework_20090320.jar:$(DEBJAR)/junit4.jar:$(DEBJAR)/figtree.jar:lib/colt.jar:lib/options.jar:lib/mtj.jar:$(DEBJAR)/jam.jar:$(DEBJAR)/jdom1.jar:$(DEBJAR)/jebl.jar:$(DEBJAR)/commons-math.jar
+export CLASSPATH :=
$(DEBJAR)/itext.jar:lib/beagle.jar:lib/mpj.jar:lib/org.boehn.kmlframework_20090320.jar:$(DEBJAR)/junit4.jar:$(DEBJAR)/figtree.jar:lib/colt.jar:lib/options.jar:lib/mtj.jar:$(DEBJAR)/jam.jar:$(DEBJAR)/jdom1.jar:$(DEBJAR)/jebl.jar:$(DEBJAR)/commons-math.jar
# to run the test suite
JAVA := /usr/lib/jvm/java-6-openjdk/bin/java
_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/debian-med-commit
