Author: Andreas Tille <tille@debian.org>
Last-Updated: 2015-09-28
Subject: use Debian jars
Description: Make sure package builds with Debian packages JARs
Forwarded: not-needed

--- a/build.xml
+++ b/build.xml
@@ -9,12 +9,12 @@
     </description>
 
     <!-- set global properties for this build -->
-    <property name="src" location="../beast2/src" />
-    <property name="build" location="../beast2/build" />
-    <property name="lib" location="../beast2/lib" />
-    <property name="doc" location="../beast2/doc" />
-    <property name="dist" location="../beast2/build/dist" />
-    <property name="test" location="../beast2/test" />
+    <property name="src" location="src" />
+    <property name="build" location="build" />
+    <property name="lib" location="/usr/share/java" />
+    <property name="doc" location="doc" />
+    <property name="dist" location="build/dist" />
+    <property name="test" location="test" />
 
     <property name="main_class_BEASTLauncher" value="beast.app.beastapp.BeastLauncher" />
     <property name="report" value="build/junitreport" />
@@ -23,9 +23,9 @@
         <fileset dir="${lib}" includes="beagle.jar"/>
         <fileset dir="${lib}" includes="jam.jar"/>
         <fileset dir="${lib}" includes="colt.jar"/>
-        <fileset dir="${lib}" includes="fest.jar"/>
-        <fileset dir="${lib}" includes="junit-4.8.2.jar"/>
-        <fileset dir="${lib}" includes="antlr-runtime-4.7.jar"/>
+        <fileset dir="${lib}" includes="fest-util.jar"/>
+        <fileset dir="${lib}" includes="junit4.jar"/>
+        <fileset dir="${lib}" includes="antlr4-runtime.jar"/>
     </path>
 
     <!--
@@ -185,7 +185,7 @@
         <mkdir dir="${release_dir}/package/lib" />
         <copy file="${dist}/beast.src.jar" todir="${release_dir}/package/"/>
         <copy file="${dist}/beast.jar" todir="${release_dir}/package/lib/"/>
-        <copy file="../beast2/version.xml" todir="${release_dir}/package/"/>
+        <copy file="version.xml" todir="${release_dir}/package/"/>
 
         <jar jarfile="${release_dir}/package/BEAST.package.v${version}.zip">
             <fileset dir="${release_dir}/package">