This is an automated email from the git hooks/post-receive script. tille pushed a commit to branch master in repository malt.
commit e5cb76b0c938c488f9da936377576e458de73996 Author: Andreas Tille <[email protected]> Date: Thu Nov 17 22:03:22 2016 +0100 Try hard to get build starting at least --- debian/patches/fix_malt_source_path.patch | 15 ++++++++++++++ .../ignore_megan-ce_source_for_the_moment.patch | 23 +++++++++++++++++++++ debian/patches/series | 3 +++ debian/patches/use_debian_packaged_jloda.patch | 24 ++++++++++++++++++++++ 4 files changed, 65 insertions(+) diff --git a/debian/patches/fix_malt_source_path.patch b/debian/patches/fix_malt_source_path.patch new file mode 100644 index 0000000..9489202 --- /dev/null +++ b/debian/patches/fix_malt_source_path.patch @@ -0,0 +1,15 @@ +Author: Andreas Tille <[email protected]> +Last-Update: Tue, 11 Oct 2016 20:08:16 +0200 +Description: MALT source is just here ... + +--- a/antbuild/build.xml ++++ b/antbuild/build.xml +@@ -4,7 +4,7 @@ + + <!-- 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="srcDir" value="src"/> + <property name="classDir" value="classes"/> + <property name="jar" value="${project_name}.jar"/> diff --git a/debian/patches/ignore_megan-ce_source_for_the_moment.patch b/debian/patches/ignore_megan-ce_source_for_the_moment.patch new file mode 100644 index 0000000..1283aca --- /dev/null +++ b/debian/patches/ignore_megan-ce_source_for_the_moment.patch @@ -0,0 +1,23 @@ +Author: Andreas Tille <[email protected]> +Last-Update: Tue, 11 Oct 2016 20:08:16 +0200 +Description: No idea whether megan-ce is needed to build MALT - assume + no for the moment + +--- a/antbuild/build.xml ++++ b/antbuild/build.xml +@@ -4,7 +4,6 @@ + + <!-- edit the following lines to your needs --> + <property name="project_name" value="MALT"/> +- <property name="meganSrcDir" value="../../megan-ce/src"/> + <property name="maltSrcDir" value="../../malt/src"/> + <property name="srcDir" value="src"/> + <property name="classDir" value="classes"/> +@@ -38,7 +37,6 @@ + <!-- 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/**"/> + </copy> + </target> diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..e7ff645 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,3 @@ +use_debian_packaged_jloda.patch +ignore_megan-ce_source_for_the_moment.patch +fix_malt_source_path.patch diff --git a/debian/patches/use_debian_packaged_jloda.patch b/debian/patches/use_debian_packaged_jloda.patch new file mode 100644 index 0000000..82f6f4e --- /dev/null +++ b/debian/patches/use_debian_packaged_jloda.patch @@ -0,0 +1,24 @@ +Author: Andreas Tille <[email protected]> +Last-Update: Tue, 11 Oct 2016 20:08:16 +0200 +Description: There is no point in copying jloda source since the packaged + version is used + +--- a/antbuild/build.xml ++++ b/antbuild/build.xml +@@ -4,7 +4,6 @@ + + <!-- edit the following lines to your needs --> + <property name="project_name" value="MALT"/> +- <property name="jlodaSrcDir" value="../../jloda/src"/> + <property name="meganSrcDir" value="../../megan-ce/src"/> + <property name="maltSrcDir" value="../../malt/src"/> + <property name="srcDir" value="src"/> +@@ -39,8 +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/**"/> + </copy> -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/malt.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
