Skip to content

Commits on Source 5

Show whitespace changes
Inline Side-by-side
debian/build.xml
View file @ ad7f5eff
......@@ -28,7 +28,7 @@
<property environment="env"/>
<property name="project.jarfile.name" value="BJLIB.jar"/>
<property name="class.path" value="${lib.dir}/commons-logging.jar ${lib.dir}/commons-cli.jar ${lib.dir}/commons-collections3.jar ${lib.dir}/commons-dbcp.jar ${lib.dir}/junit4.jar ${lib.dir}/commons-pool.jar ${lib.dir}/guava.jar ${lib.dir}/jgrapht0.8.jar ${lib.dir}/Jmol.jar /usr/share/icedtea-web/netx.jar ${lib.dir}/hamcrest.jar ${lib.dir}/json_simple.jar ${lib.dir}/commons-codec.jar ${lib.dir}/itext5.jar ${lib.dir}/Jmol.jar ${lib.dir}/log4j2.jar ${lib.dir}/json-simple.jar ${lib.dir}/slf4j-api.jar ${lib.dir}/log4j-over-slf4j.jar ${lib.dir}/commons-math.jar ${lib.dir}/xmlunit.jar ${lib.dir}/vecmath.jar"/>
<property name="class.path" value="${lib.dir}/commons-logging.jar ${lib.dir}/commons-cli.jar ${lib.dir}/commons-collections3.jar ${lib.dir}/commons-dbcp.jar ${lib.dir}/junit4.jar ${lib.dir}/commons-pool.jar ${lib.dir}/guava.jar ${lib.dir}/jgrapht0.8.jar ${lib.dir}/Jmol.jar /usr/share/icedtea-web/netx.jar ${lib.dir}/hamcrest.jar ${lib.dir}/json_simple.jar ${lib.dir}/commons-codec.jar ${lib.dir}/itext5.jar ${lib.dir}/Jmol.jar ${lib.dir}/log4j2.jar ${lib.dir}/json-simple.jar ${lib.dir}/slf4j-api.jar ${lib.dir}/log4j-over-slf4j.jar ${lib.dir}/commons-math.jar ${lib.dir}/xmlunit.jar ${lib.dir}/vecmath.jar ${lib.dir}/jaxb-api.jar ${lib.dir}/jaxb-impl.jar"/>
<path id="compile.classpath">
<fileset dir="${lib.dir}">
......@@ -52,6 +52,8 @@
<include name="slf4j-api.jar"/>
<include name="log4j-over-slf4j.jar"/>
<include name="vecmath.jar"/>
<include name="jaxb-api.jar"/>
<include name="jaxb-impl.jar"/>
</fileset>
<fileset dir="${dist.dir}">
<include name="*.jar"/>
......@@ -73,18 +75,9 @@
<target name="javadocs">
<mkdir dir="${docs.dir}"/>
<mkdir dir="${docs.lib.dir}"/>
<if><equals arg1="${ant.java.version}" arg2="1.8" />
<then>
<javadoc destdir="${docs.lib.dir}" sourcepath="${src.dir}" packagenames="org.*" encoding="UTF-8" additionalparam="-Xdoclint:none" classpathref="compile.classpath">
<link href="http://java.sun.com/j2se/1.6.0/docs/api/"/>
</javadoc>
</then>
<else>
<javadoc destdir="${docs.lib.dir}" sourcepath="${src.dir}" packagenames="org.*" encoding="UTF-8" additionalparam="-Xdoclint:none --add-modules java.se.ee" classpathref="compile.classpath">
<link href="http://java.sun.com/j2se/1.6.0/docs/api/"/>
</javadoc>
</else>
</if>
</target>
<target name="compile">
......@@ -128,7 +121,6 @@
</then>
<else>
<junit haltonfailure="yes" printsummary="yes" fork="true">
<jvmarg line="--add-modules java.se.ee"/>
<classpath refid="test.classpath"/>
<formatter type="plain" usefile="false" />
<batchtest>
......
debian/changelog
View file @ ad7f5eff
biojava4-live (4.2.12+dfsg-1) UNRELEASED; urgency=medium
biojava4-live (4.2.12+dfsg-1) unstable; urgency=medium
* Team upload.
......@@ -11,9 +11,14 @@ biojava4-live (4.2.12+dfsg-1) UNRELEASED; urgency=medium
* debhelper 11
* Point Vcs fields to salsa.debian.org
* Standards-Version: 4.3.0
TODO: #917655, #917667 (both bugs persist in this version)
-- Andreas Tille <tille@debian.org> Thu, 10 Jan 2019 11:35:04 +0100
[ tony mancill ]
* Add build-dep on libjaxb-api-java and libjaxb-java
* Add jaxb-api and jaxb-impl JARs to classpaths in debian/build.xml
Closes: #917655, #917667
* Drop --add-modules java.se.ee from javadoc task
-- Andreas Tille <tille@debian.org> Mon, 14 Jan 2019 16:05:19 +0100
biojava4-live (4.2.11+dfsg-1) unstable; urgency=medium
......
debian/control
View file @ ad7f5eff
......@@ -28,7 +28,9 @@ Build-Depends-Indep: libcommons-dbcp-java,
liblog4j2-java,
libslf4j-java,
libxmlunit-java,
libjgrapht-java
libjgrapht-java,
libjaxb-api-java,
libjaxb-java
Standards-Version: 4.3.0
Vcs-Browser: https://salsa.debian.org/med-team/biojava4-live
Vcs-Git: https://salsa.debian.org/med-team/biojava4-live.git
......