[axis] 59/60: Fixed the build failure with Ant 1.9.8 (Closes: #851030)

[Emmanuel Bourg]

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

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

commit 7831f78ff034ce5e0a959f05240f43e7f9604c90
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Jan 12 18:27:45 2017 +0100

    Fixed the build failure with Ant 1.9.8 (Closes: #851030)
---
 debian/changelog                       |  1 +
 debian/patches/ant-compatibility.patch | 15 +++++++++++++++
 debian/patches/series                  |  1 +
 3 files changed, 17 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index b6386fd..c01a234 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 axis (1.4-25) UNRELEASED; urgency=medium
 
+  * Fixed the build failure with Ant 1.9.8 (Closes: #851030)
   * Moved the package to Git
   * Standards-Version updated to 3.9.8
   * Switch to debhelper level 10
diff --git a/debian/patches/ant-compatibility.patch b/debian/patches/ant-compatibility.patch
new file mode 100644
index 0000000..15d6912
--- /dev/null
+++ b/debian/patches/ant-compatibility.patch
@@ -0,0 +1,15 @@
+Description: Fixes the compatibility with Ant 1.9.8 or later
+ (see https://bz.apache.org/bugzilla/show_bug.cgi?id=59402)
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/tools/build.xml
++++ b/tools/build.xml
+@@ -106,7 +106,7 @@
+     <fileset dir="${tools.dir}"
+       includes="*-tasks.properties"/>
+     <fileset dir="${tools.dir}" includes="org/**/*.xml"/>
+-    <fileset dir="${tools.dir}" file="log4j.properties"/>
++    <fileset dir="${tools.dir}" includes="log4j.properties"/>
+   </copy>
+   
+   <tstamp/>
diff --git a/debian/patches/series b/debian/patches/series
index bbd7595..cbf97a4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 axis-bz152255.patch
 javadoc.diff
 CVE-2014-3596.patch
+ant-compatibility.patch

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