[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#987096: marked as done (unblock: ant/1.10.9-4)

Your message dated Sun, 18 Apr 2021 18:15:40 +0000
with message-id <E1lYBxM-0006bZ-O3@respighi.debian.org>
and subject line unblock ant
has caused the Debian Bug report #987096,
regarding unblock: ant/1.10.9-4
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
987096: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=987096
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
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");
 +        }

--- End Message ---
--- Begin Message --- 
Unblocked.

--- End Message ---
Reply to: