Bug#987096: unblock: ant/1.10.9-4

[Emmanuel Bourg <ebourg@apache.org>]

Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package ant/1.10.9-4

This update fixes the RC bug #986518, the debdiff is copied below.

Thank you,

Emmanuel Bourg


unblock ant/1.10.9-4



diff --git a/debian/changelog b/debian/changelog
index 9fefeaf..d569877 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ant (1.10.9-4) unstable; urgency=medium
+
+  * Disable doclint only with the default doclet (Closes: #986518)
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Sat, 17 Apr 2021 15:55:11 +0200
+
 ant (1.10.9-3) unstable; urgency=medium

   * Disable doclint by default when building a Debian package (Closes: #981927)
diff --git a/debian/patches/0018-disable-doclint.patch b/debian/patches/0018-disable-doclint.patch
index 66166e5..2984428 100644
--- a/debian/patches/0018-disable-doclint.patch
+++ b/debian/patches/0018-disable-doclint.patch
@@ -7,7 +7,7 @@ Forwarded: not-needed
              log("Debian build on Java 9+ detected: Adding the --ignore-source-errors option");
          }

-+        if (LanguageLevel.isDebianBuild() && JavaEnvUtils.isAtLeastJavaVersion("9")) {
++        if (doclet == null && LanguageLevel.isDebianBuild() && JavaEnvUtils.isAtLeastJavaVersion("9")) {
 +            toExecute.createArgument().setValue("-Xdoclint:none");
 +            log("Debian build on Java 9+ detected: Adding the -Xdoclint:none option");
 +        }