[med-svn] [beast2-mcmc] 01/02: libantlr4-runtime-java is now packaged
Andreas Tille
tille at debian.org
Mon Nov 30 20:55:04 UTC 2015
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository beast2-mcmc.
commit 0877525eef13f8dccaf6d38c396891e73bbd97fb
Author: Andreas Tille <tille at debian.org>
Date: Mon Nov 30 21:52:36 2015 +0100
libantlr4-runtime-java is now packaged
---
debian/control | 1 +
debian/copyright | 4 +---
debian/patches/fix_classpath_in_build_xml.patch | 6 ++++--
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/debian/control b/debian/control
index 3b0559e..1ea2867 100644
--- a/debian/control
+++ b/debian/control
@@ -13,6 +13,7 @@ Build-Depends: debhelper (>= 9),
libhmsbeagle-java,
libcolt-free-java,
libfest-util-java,
+ libantlr4-runtime-java,
junit4,
texlive-latex-base,
texlive-latex-extra
diff --git a/debian/copyright b/debian/copyright
index 3ffd4d2..3fc51f2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -8,9 +8,7 @@ Files-Excluded: lib/b*.jar
lib/d*.jar
lib/f*.jar
lib/j*.jar
-Comment: Two *.jar files remain currently
- lib/antlr-runtime-4.5.jar
- Hopefully antlr4 ITP #800606 will be closed soon
+Comment: One *.jar file remain currently
release/common/tools/DensiTree.jar
Project https://github.com/rbouckaert/DensiTree needs to be
packaged.
diff --git a/debian/patches/fix_classpath_in_build_xml.patch b/debian/patches/fix_classpath_in_build_xml.patch
index a437201..639a95a 100644
--- a/debian/patches/fix_classpath_in_build_xml.patch
+++ b/debian/patches/fix_classpath_in_build_xml.patch
@@ -6,7 +6,7 @@ Forwarded: no
--- a/build.xml
+++ b/build.xml
-@@ -8,22 +8,23 @@
+@@ -8,23 +8,24 @@
</description>
<!-- set global properties for this build -->
@@ -33,11 +33,13 @@ Forwarded: no
- <fileset dir="${lib}" includes="colt.jar"/>
- <fileset dir="${lib}" includes="fest.jar"/>
- <fileset dir="${lib}" includes="junit-4.8.2.jar"/>
+- <fileset dir="${lib}" includes="antlr-runtime-4.5.jar"/>
+ <fileset dir="${deblib}" includes="beagle.jar"/>
+ <fileset dir="${deblib}" includes="jam.jar"/>
+ <fileset dir="${deblib}" includes="colt.jar"/>
+ <fileset dir="${deblib}" includes="fest-util.jar"/>
+ <fileset dir="${deblib}" includes="junit4.jar"/>
- <fileset dir="${lib}" includes="antlr-runtime-4.5.jar"/>
++ <fileset dir="${deblib}" includes="antlr4-runtime.jar"/>
</path>
+ <!--
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/beast2-mcmc.git
More information about the debian-med-commit
mailing list