This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository cdk.
commit bb95a0e195f752b494b6f1d7dc79d950dfa24372 Author: Emmanuel Bourg <ebo...@apache.org> Date: Fri Mar 30 22:01:26 2018 +0200 Fixed the build failure with Ant 1.10 (Closes: #894467) --- debian/changelog | 2 ++ debian/patches/ant19.patch | 24 +++++++++++++----------- debian/rules | 0 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5a2d9f3..2c686cf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,7 @@ cdk (1:1.2.10-7) UNRELEASED; urgency=medium + * Team upload. + * Fixed the build failure with Ant 1.10 (Closes: #894467) * Moved the package to Git -- Emmanuel Bourg <ebo...@apache.org> Fri, 30 Mar 2018 21:29:17 +0200 diff --git a/debian/patches/ant19.patch b/debian/patches/ant19.patch index 64d7c6d..dab20da 100644 --- a/debian/patches/ant19.patch +++ b/debian/patches/ant19.patch @@ -1,17 +1,19 @@ -Description: allow building with ant 1.9 +Description: allow building with Ant 1.9 or later Author: tony mancill <tmanc...@debian.org> - ---- -Origin: other Bug-Debian: http://bugs.debian.org/712349 - --- a/build.xml +++ b/build.xml -@@ -156,6 +156,7 @@ - <or> - <contains string="${ant.version}" substring="1.7.1"/> - <contains string="${ant.version}" substring="1.8"/> -+ <contains string="${ant.version}" substring="1.9"/> - </or> +@@ -152,12 +152,7 @@ </condition> + <!-- test Ant version --> +- <condition property="hasAnt17"> +- <or> +- <contains string="${ant.version}" substring="1.7.1"/> +- <contains string="${ant.version}" substring="1.8"/> +- </or> +- </condition> ++ <property name="hasAnt17" value="true"/> + + + <!-- test Java version --> diff --git a/debian/rules b/debian/rules old mode 100644 new mode 100755 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/cdk.git _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits