[ant] 01/01: Do not set the javadoc encoding twice (Closes: #821065)

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository ant.

commit 12bc20b3a0ee6b49b4d0a010847694fca8bee781
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Apr 15 09:50:09 2016 +0200

    Do not set the javadoc encoding twice (Closes: #821065)
---
 debian/changelog                                    | 6 ++++++
 debian/patches/0010-reproducible-javadoc-task.patch | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index d0d41d1..8859879 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ant (1.9.7-2) unstable; urgency=medium
+
+  * Do not set the javadoc encoding twice (Closes: #821065)
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Fri, 15 Apr 2016 09:49:01 +0200
+
 ant (1.9.7-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/debian/patches/0010-reproducible-javadoc-task.patch b/debian/patches/0010-reproducible-javadoc-task.patch
index f2c59ca..2679867 100644
--- a/debian/patches/0010-reproducible-javadoc-task.patch
+++ b/debian/patches/0010-reproducible-javadoc-task.patch
@@ -27,7 +27,7 @@ Forwarded: no
       * @param enc the name of the encoding for the source files.
       */
      public void setEncoding(final String enc) {
-+        this.encoding = encoding;
++        this.encoding = enc;
 +
          cmd.createArgument().setValue("-encoding");
          cmd.createArgument().setValue(enc);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/ant.git