This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch scala-2.11 in repository scala-2.10.
commit f485cd4cf04572965951000174324022ecb9c9bc Author: Emmanuel Bourg <[email protected]> Date: Mon Aug 8 12:29:39 2016 +0200 Removed 0002-Use-system-ant-contrib.jar.patch (ant-contrib is already on the Ant classpath) --- debian/changelog | 2 ++ debian/control | 2 +- debian/patches/0002-Use-system-ant-contrib.jar.patch | 14 -------------- debian/patches/series | 1 - 4 files changed, 3 insertions(+), 16 deletions(-) diff --git a/debian/changelog b/debian/changelog index d81862e..6680baa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ scala (2.11.8-1) UNRELEASED; urgency=medium - Use the 'debian' version of scala-xml and scala-parser-combinators * Fixed the GitHub links in the API documentation * Replaced the Git date/hash in the osgi version with 'unknown' + * Removed 0002-Use-system-ant-contrib.jar.patch (ant-contrib is already + on the Ant classpath) * debian/rules: Remove the log files left by the test suite * Standards-Version updated to 3.9.8 * Use a secure Vcs-Git URL diff --git a/debian/control b/debian/control index 144e8fb..73f506f 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Uploaders: Build-Depends: default-jdk, ant, - ant-contrib, + ant-contrib (>= 1.0~b3+svn177-6), ant-optional, bnd (>= 2.1.0), libjarjar-java, diff --git a/debian/patches/0002-Use-system-ant-contrib.jar.patch b/debian/patches/0002-Use-system-ant-contrib.jar.patch deleted file mode 100644 index 927edcc..0000000 --- a/debian/patches/0002-Use-system-ant-contrib.jar.patch +++ /dev/null @@ -1,14 +0,0 @@ -Description: Use system ant-contrib.jar -Author: Mehdi Dogguy <[email protected]> -Forwarded: not-needed ---- a/build.xml -+++ b/build.xml -@@ -246,7 +246,7 @@ - - <target name="init" depends="init.git"> - <!-- Set up Ant contrib tasks so we can use <if><then><else> instead of the clunky `unless` attribute --> -- <taskdef resource="net/sf/antcontrib/antlib.xml" classpath="${lib-ant.dir}/ant-contrib.jar"/> -+ <taskdef resource="net/sf/antcontrib/antlib.xml" classpath="${javalib.dir}/ant-contrib.jar"/> - - <property name="scala.ant.min.version" value="1.8.2"/> - <if><not><antversion atleast="${scala.ant.min.version}"/></not> diff --git a/debian/patches/series b/debian/patches/series index 562029d..db31d4f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -0002-Use-system-ant-contrib.jar.patch 0006-ignore-test-dependencies.patch 0008-disable-lib-fetching.patch 0009-local-repository.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/scala-2.10.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
