[med-svn] [malt] 09/09: Get build.xml patches in a state where compilation at least starts

[Andreas Tille]

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

tille pushed a commit to branch master
in repository malt.

commit aee54a13ad04890e06743564ba711721d9eeeef8
Author: Andreas Tille <tille at debian.org>
Date:   Fri May 19 10:55:58 2017 +0200

    Get build.xml patches in a state where compilation at least starts
---
 debian/patches/fix_malt_source_path.patch                  | 10 +++++++++-
 debian/patches/ignore_megan-ce_source_for_the_moment.patch | 11 ++++++++++-
 debian/patches/use_debian_packaged_jloda.patch             | 12 +++++++++++-
 3 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/debian/patches/fix_malt_source_path.patch b/debian/patches/fix_malt_source_path.patch
index 9489202..b1c466a 100644
--- a/debian/patches/fix_malt_source_path.patch
+++ b/debian/patches/fix_malt_source_path.patch
@@ -9,7 +9,15 @@ Description: MALT source is just here ...
      <!-- edit the following lines to your needs -->
      <property name="project_name" value="MALT"/>
 -    <property name="maltSrcDir" value="../../malt/src"/>
-+    <property name="maltSrcDir" value="src"/>
++    <property name="maltSrcDir" value="../src"/>
      <property name="srcDir" value="src"/>
      <property name="classDir" value="classes"/>
      <property name="jar" value="${project_name}.jar"/>
+@@ -14,7 +14,6 @@
+ 
+     <path id="build.classpath">
+     	    <fileset dir="/usr/share/java/"  includes="jloda.jar"/>
+-	    <fileset dir="../../malt/jars/"  includes="*.jar"/>
+     </path>
+ 
+     <!-- init -->
diff --git a/debian/patches/ignore_megan-ce_source_for_the_moment.patch b/debian/patches/ignore_megan-ce_source_for_the_moment.patch
index b05fb1b..985b454 100644
--- a/debian/patches/ignore_megan-ce_source_for_the_moment.patch
+++ b/debian/patches/ignore_megan-ce_source_for_the_moment.patch
@@ -13,7 +13,16 @@ Description: No idea whether megan-ce is needed to build MALT - assume
      <property name="maltSrcDir" value="../../malt/src"/>
      <property name="srcDir" value="src"/>
      <property name="classDir" value="classes"/>
-@@ -38,7 +37,6 @@
+@@ -15,8 +14,6 @@
+ 
+     <path id="build.classpath">
+     	    <fileset dir="/usr/share/java/"  includes="jloda.jar"/>
+-    	    <fileset dir="../../megan-ce/jars"  includes="*.jar"/>
+-	    <fileset dir="../../megan-ce/jars/megan6server"  includes="*.jar"/>
+ 	    <fileset dir="../../malt/jars/"  includes="*.jar"/>
+     </path>
+ 
+@@ -37,7 +34,6 @@
      <!-- copy sources -->
      <target name="copy_sources" depends="copy_resources">
          <copy todir="${srcDir}">
diff --git a/debian/patches/use_debian_packaged_jloda.patch b/debian/patches/use_debian_packaged_jloda.patch
index 7e10b89..defe2f4 100644
--- a/debian/patches/use_debian_packaged_jloda.patch
+++ b/debian/patches/use_debian_packaged_jloda.patch
@@ -13,7 +13,17 @@ Description: There is no point in copying jloda source since the packaged
      <property name="meganSrcDir" value="../../megan-ce/src"/>
      <property name="maltSrcDir" value="../../malt/src"/>
      <property name="srcDir" value="src"/>
-@@ -39,7 +38,6 @@
+@@ -15,8 +14,7 @@
+     <!-- class path -->
+ 
+     <path id="build.classpath">
+-    	    <fileset dir="../../jloda/jars"  includes="*.jar"/>
+-	    <fileset dir="../../jloda/jars/batik-1.8"  includes="*.jar"/>
++    	    <fileset dir="/usr/share/java/"  includes="jloda.jar"/>
+     	    <fileset dir="../../megan-ce/jars"  includes="*.jar"/>
+ 	    <fileset dir="../../megan-ce/jars/megan6server"  includes="*.jar"/>
+ 	    <fileset dir="../../malt/jars/"  includes="*.jar"/>
+@@ -39,7 +37,6 @@
      <!-- copy sources -->
      <target name="copy_sources" depends="copy_resources">
          <copy todir="${srcDir}">

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