[med-svn] [beast2-mcmc] 08/08: New upstream version

[Andreas Tille]

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

tille pushed a commit to branch master
in repository beast2-mcmc.

commit 79965b364a965474167ded4e594e30d73781b768
Author: Andreas Tille <tille at debian.org>
Date:   Wed May 4 09:46:32 2016 +0200

    New upstream version
---
 build.xml                                       | 30 ++++++++++++-------------
 debian/changelog                                |  2 +-
 debian/patches/fix_classpath_in_build_xml.patch |  4 ++--
 debian/patches/remove_appbundler.patch          |  4 ++--
 4 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/build.xml b/build.xml
index ee8e6f8..2a42ff8 100644
--- a/build.xml
+++ b/build.xml
@@ -8,23 +8,24 @@
     </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="lib" />
+    <property name="deblib" location="/usr/share/java" />
+    <property name="doc" location="doc" />
+    <property name="dist" location="build/dist" />
+    <property name="test" location="test" />
 
     <property name="main_class_BEAST" value="beast.app.beastapp.BeastMain" />
     <property name="report" value="build/junitreport" />
 
     <path id="classpath">
-        <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.5.jar"/>
+        <fileset dir="${deblib}" includes="beagle.jar"/>
+        <fileset dir="${deblib}" includes="jam.jar"/>
+        <fileset dir="${deblib}" includes="colt.jar"/>
+        <fileset dir="${deblib}" includes="fest-util.jar"/>
+        <fileset dir="${deblib}" includes="junit4.jar"/>
+        <fileset dir="${deblib}" includes="antlr4-runtime.jar"/>
     </path>
 
     <!--
@@ -161,7 +162,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.${version}.zip">
             <fileset dir="${release_dir}/package">
@@ -455,9 +456,6 @@
         <echo message="cp BEAST.v${version}.tgz ~/tmp"/>
     </target>
 
-    <!-- Define the appbundler task -->
-    <taskdef name="bundleapp" classname="com.oracle.appbundler.AppBundlerTask" classpath="../beast2/lib/bundler/appbundler-1.0.jar"/>
-
     <!--property name="AppleSigner" value="Developer ID Application: Alexei Drummond (6M6Y6L7RUP)" /-->
     <property name="AppleSigner" value="Developer ID Application: Remco Bouckaert (LHFJWE5U63)" />    
     
diff --git a/debian/changelog b/debian/changelog
index 045fc62..a7263a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-beast2-mcmc (2.4.0pre+dfsg-1) UNRELEASED; urgency=medium
+beast2-mcmc (2.4.1pre+dfsg-1) UNRELEASED; urgency=medium
 
   * Initial release (Closes: #???)
     Remaining issue: non-free JSON library
diff --git a/debian/patches/fix_classpath_in_build_xml.patch b/debian/patches/fix_classpath_in_build_xml.patch
index 4b6fdfa..f854fd9 100644
--- a/debian/patches/fix_classpath_in_build_xml.patch
+++ b/debian/patches/fix_classpath_in_build_xml.patch
@@ -43,12 +43,12 @@ Forwarded: no
      </path>
  
      <!--
-@@ -158,7 +159,7 @@
+@@ -161,7 +162,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.${version}.jar">
+         <jar jarfile="${release_dir}/package/beast.package.${version}.zip">
              <fileset dir="${release_dir}/package">
diff --git a/debian/patches/remove_appbundler.patch b/debian/patches/remove_appbundler.patch
index 00bdb1d..00c9f55 100644
--- a/debian/patches/remove_appbundler.patch
+++ b/debian/patches/remove_appbundler.patch
@@ -5,8 +5,8 @@ Description: Remove mac specific stuff breaking build on Linux when not
 
 --- a/build.xml
 +++ b/build.xml
-@@ -448,9 +448,6 @@
-         <echo message="Linux/Unix version release is finished." />
+@@ -456,9 +456,6 @@
+         <echo message="cp BEAST.v${version}.tgz ~/tmp"/>
      </target>
  
 -    <!-- Define the appbundler task -->

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