This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository malt.
commit 87ea8723379c19daeed7ee2ec7c8ce3646ad2cfe
Author: Andreas Tille <ti...@debian.org>
Date: Wed May 3 13:44:20 2017 +0200
Adapt patches
---
debian/patches/ignore_megan-ce_source_for_the_moment.patch | 4 ++--
debian/patches/use_debian_packaged_jloda.patch | 9 ++++-----
2 files changed, 6 insertions(+), 7 deletions(-)
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 1283aca..b05fb1b 100644
--- a/debian/patches/ignore_megan-ce_source_for_the_moment.patch
+++ b/debian/patches/ignore_megan-ce_source_for_the_moment.patch
@@ -17,7 +17,7 @@ Description: No idea whether megan-ce is needed to build MALT
- assume
<!-- copy sources -->
<target name="copy_sources" depends="copy_resources">
<copy todir="${srcDir}">
-- <fileset dir="${meganSrcDir}" excludes=".svn/** test/** malt/**"/>
- <fileset dir="${maltSrcDir}" excludes=".svn/** test/**"/>
+- <fileset dir="${meganSrcDir}"/>
+ <fileset dir="${maltSrcDir}"/>
</copy>
</target>
diff --git a/debian/patches/use_debian_packaged_jloda.patch
b/debian/patches/use_debian_packaged_jloda.patch
index 82f6f4e..7e10b89 100644
--- a/debian/patches/use_debian_packaged_jloda.patch
+++ b/debian/patches/use_debian_packaged_jloda.patch
@@ -13,12 +13,11 @@ 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,8 +38,6 @@
+@@ -39,7 +38,6 @@
<!-- copy sources -->
<target name="copy_sources" depends="copy_resources">
<copy todir="${srcDir}">
-- <fileset dir="${jlodaSrcDir}"
-- excludes=".svn/** jloda/matrix/** jloda/models/**
test/** bioinf1/** gbi/** gitter/**"/>
- <fileset dir="${meganSrcDir}" excludes=".svn/** test/** malt/**"/>
- <fileset dir="${maltSrcDir}" excludes=".svn/** test/**"/>
+- <fileset dir="${jlodaSrcDir}" excludes="com/apple/**"/>
+ <fileset dir="${meganSrcDir}"/>
+ <fileset dir="${maltSrcDir}"/>
</copy>
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/debian-med/malt.git
_______________________________________________
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
