This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository ant.
commit 8f2d06c4ee02e8fb69c2a773a99c47a9f97103d4 Author: Emmanuel Bourg <[email protected]> Date: Wed Mar 28 01:57:03 2018 +0200 Don't add the java.activation module when building the Javadoc --- debian/changelog | 2 +- debian/patches/0014-remove-java-activation-module.patch | 13 +++++++++++++ debian/patches/series | 1 + 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 26d3fcf..a9f4a23 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ant (1.10.2-1) UNRELEASED; urgency=medium +ant (1.10.3-1) UNRELEASED; urgency=medium * New upstream release - Refreshed the patches diff --git a/debian/patches/0014-remove-java-activation-module.patch b/debian/patches/0014-remove-java-activation-module.patch new file mode 100644 index 0000000..d2c7f40 --- /dev/null +++ b/debian/patches/0014-remove-java-activation-module.patch @@ -0,0 +1,13 @@ +Description: Don't add the java.activation module when building the Javadoc, this breaks the build, probably because JAF is already on the classpath +Author: Emmanuel Bourg <[email protected]> +Forwarded: no +--- a/build.xml ++++ b/build.xml +@@ -1502,7 +1502,6 @@ + <group title="Optional Types" packages="org.apache.tools.ant.types.optional*"/> + <group title="Ant Utilities" packages="org.apache.tools.ant.util*"/> + <classpath refid="tests-classpath"/> +- <arg line="${javadoc.jaf.module}"/> + </javadoc> + </target> + diff --git a/debian/patches/series b/debian/patches/series index d3353fc..95b89c4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ 0010-reproducible-javadoc-task.patch 0011-reproducible-propertyfile-task.patch 0013-auto-adjust-target.patch +0014-remove-java-activation-module.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/ant.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
