This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository scala-2.10.
commit 6ce1d336f42f7699a956c778927a9cee964aac66 Author: Emmanuel Bourg <[email protected]> Date: Mon Nov 14 23:15:20 2016 +0100 Removed 0002-Use-system-ant-contrib.jar.patch --- debian/patches/0002-Use-system-ant-contrib.jar.patch | 19 ------------------- debian/patches/0008-disable-lib-fetching.patch | 2 +- debian/patches/series | 2 -- debian/rules | 2 +- 4 files changed, 2 insertions(+), 23 deletions(-) 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 c8a7093..0000000 --- a/debian/patches/0002-Use-system-ant-contrib.jar.patch +++ /dev/null @@ -1,19 +0,0 @@ -From: Mehdi Dogguy <[email protected]> -Date: Thu, 23 Jun 2011 23:12:28 +0200 -Subject: Use system ant-contrib.jar - ---- - build.xml | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - ---- a/build.xml -+++ b/build.xml -@@ -202,7 +202,7 @@ - - <target name="init" depends="boot"> - <!-- 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"/> - - <!-- Add our maven ant tasks --> - <path id="maven-ant-tasks.classpath" path="${lib-ant.dir}/maven-ant-tasks-2.1.1.jar" /> diff --git a/debian/patches/0008-disable-lib-fetching.patch b/debian/patches/0008-disable-lib-fetching.patch index 530f7ff..e20711d 100644 --- a/debian/patches/0008-disable-lib-fetching.patch +++ b/debian/patches/0008-disable-lib-fetching.patch @@ -10,7 +10,7 @@ Forwarded: not-needed - <target name="init" depends="boot"> + <target name="init"> <!-- 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="${javalib.dir}/ant-contrib.jar"/> + <taskdef resource="net/sf/antcontrib/antlib.xml" classpath="${lib-ant.dir}/ant-contrib.jar"/> @@ -218,12 +218,14 @@ <mkdir dir="${user.home}/.m2/repository"/> diff --git a/debian/patches/series b/debian/patches/series index ba9ef7b..c8dca91 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,6 +1,4 @@ remove-non-ascii-ftbfs.patch -0002-Use-system-ant-contrib.jar.patch -#0003-Adapt-SCALA_HOME-and-TOOL_CLASSPATH-to-the-package-l.patch 0005-java7-compilation.patch 0006-ignore-pax-exam-dependencies.patch 0007-ignore-partest.patch diff --git a/debian/rules b/debian/rules index cc18894..58cbd4d 100755 --- a/debian/rules +++ b/debian/rules @@ -18,7 +18,7 @@ override_dh_auto_build: -Dgit.commit.date=unknown \ -Dscaladoc.url=https://github.com/scala/scala/tree/v$(BUNDLE_VERSION)/src \ -Djunit.version=4.x \ - -Djavalib.dir=/usr/share/java \ + -Dlib-ant.dir=/usr/share/java \ -Dextra.repo.url=file:///usr/share/maven-repo \ -Dlibrary.starr.jar=/usr/share/java/scala-library.jar \ -Dreflect.starr.jar=/usr/share/java/scala-reflect.jar \ -- 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
