[med-svn] [beast-mcmc] 06/09: Adapt patches

[Andreas Tille]

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

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

commit 0181e7d28a090cd431397e77294f525dd06f2cf7
Author: Andreas Tille <tille at debian.org>
Date:   Thu Jun 2 14:20:53 2016 +0200

    Adapt patches
---
 debian/patches/fix_classpath_in_build_tracer_xml.patch | 3 ++-
 debian/patches/fix_encoding.patch                      | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/patches/fix_classpath_in_build_tracer_xml.patch b/debian/patches/fix_classpath_in_build_tracer_xml.patch
index 84f2c91..d0a24a0 100644
--- a/debian/patches/fix_classpath_in_build_tracer_xml.patch
+++ b/debian/patches/fix_classpath_in_build_tracer_xml.patch
@@ -83,7 +83,7 @@ Description: Make sure also tracer is builded with Debian packages JARs
  
      <target name="linux" description="release Linux/Unix version of Tracer">
          <delete dir="${Linux_package_dir}" />
-@@ -203,55 +170,4 @@
+@@ -203,56 +170,4 @@
          <echo message="Linux/Unix version release is finished." />
      </target>
  
@@ -101,6 +101,7 @@ Description: Make sure also tracer is builded with Debian packages JARs
 -                        name="${name} v${version}"
 -                        mainclass="dr.app.tracer.application.TracerApp"
 -                        stubfile="${packaging_tools}/mac/universalJavaApplicationStub"
+-						useJavaXKey="true"
 -                        icon="${Mac_dir}/icons/Tracer.icns"
 -                        jvmversion="1.6+"
 -                        vmoptions="-Xmx1024M"
diff --git a/debian/patches/fix_encoding.patch b/debian/patches/fix_encoding.patch
index 70eb56e..16e6c2c 100644
--- a/debian/patches/fix_encoding.patch
+++ b/debian/patches/fix_encoding.patch
@@ -4,7 +4,7 @@ Description: Fix encoding issue
 
 --- a/src/dr/app/beauti/components/discrete/DiscreteTraitsComponentGenerator.java
 +++ b/src/dr/app/beauti/components/discrete/DiscreteTraitsComponentGenerator.java
-@@ -263,7 +263,7 @@ public class DiscreteTraitsComponentGene
+@@ -265,7 +265,7 @@ public class DiscreteTraitsComponentGene
  
          }
  
@@ -13,7 +13,7 @@ Description: Fix encoding issue
              writeStatisticModel(model, writer);
      }
  
-@@ -520,4 +520,4 @@ public class DiscreteTraitsComponentGene
+@@ -502,4 +502,4 @@ public class DiscreteTraitsComponentGene
          }
      }
  

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