[med-svn] [jmodeltest] 01/14: Patch to use packaged jars

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository jmodeltest.

commit 2e86fa308512741dc3f877f2720b8465510e4e92
Author: Andreas Tille <tille at debian.org>
Date:   Fri Jan 15 17:38:35 2016 +0100

    Patch to use packaged jars
---
 debian/patches/series                         |  1 +
 debian/patches/use_debian_packaged_jars.patch | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/debian/patches/series b/debian/patches/series
index 2440c66..83fdf86 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 encoding.patch
+use_debian_packaged_jars.patch
diff --git a/debian/patches/use_debian_packaged_jars.patch b/debian/patches/use_debian_packaged_jars.patch
new file mode 100644
index 0000000..411103c
--- /dev/null
+++ b/debian/patches/use_debian_packaged_jars.patch
@@ -0,0 +1,22 @@
+--- a/build.xml
++++ b/build.xml
+@@ -3,9 +3,9 @@
+ 
+ 	<property name="src.dir" location="src/main/java" />
+ 	<property name="bin.dir" location="build/classes" />
+-	<property name="lib.dir" location="lib" />
++	<property name="lib.dir" location="/usr/share/java" />
+ 	<property name="dist.dir" location="dist" />
+-  <property name="exe.dir" location="${dist.dir}/exe/phyml" />
++  <property name="exe.dir" location="/usr/bin" />
+ 	<property name="log.dir" location="${dist.dir}/log" />
+ 	<property name="manual.dir" location="manual" />
+ 	<property name="src.resources.dir" location="src/main/resources" />
+@@ -29,7 +29,6 @@
+ 
+ 	<target name="compile" description="Compile code">
+ 		<mkdir dir="${bin.dir}" />
+-		<mkdir dir="${lib.dir}" />
+ 		<property environment="env" />
+ 		<property name="java6.boot.classpath" value="${env.JAVA6_BOOTCLASSES}" />
+ 		<javac srcdir="${src.dir}" destdir="${bin.dir}" includeAntRuntime="no" 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/jmodeltest.git