[med-svn] [beast2-mcmc] 05/08: Commit pending changes

[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 b2b36b769df9a6d483b6f118bc4e55fc0a6a9a7d
Author: Andreas Tille <tille at debian.org>
Date:   Wed May 4 09:43:32 2016 +0200

    Commit pending changes
---
 debian/patches/fix_classpath_in_build_xml.patch | 9 +++++++++
 debian/patches/remove_appbundler.patch          | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/debian/patches/fix_classpath_in_build_xml.patch b/debian/patches/fix_classpath_in_build_xml.patch
index 639a95a..4b6fdfa 100644
--- a/debian/patches/fix_classpath_in_build_xml.patch
+++ b/debian/patches/fix_classpath_in_build_xml.patch
@@ -43,3 +43,12 @@ Forwarded: no
      </path>
  
      <!--
+@@ -158,7 +159,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">
+             <fileset dir="${release_dir}/package">
diff --git a/debian/patches/remove_appbundler.patch b/debian/patches/remove_appbundler.patch
index acc3afd..00bdb1d 100644
--- a/debian/patches/remove_appbundler.patch
+++ b/debian/patches/remove_appbundler.patch
@@ -5,7 +5,7 @@ Description: Remove mac specific stuff breaking build on Linux when not
 
 --- a/build.xml
 +++ b/build.xml
-@@ -429,9 +429,6 @@
+@@ -448,9 +448,6 @@
          <echo message="Linux/Unix version release is finished." />
      </target>
  

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