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 02fb8842d948f5f7bcc2cffa9ed7e8896dc09a3e Author: Mehdi Dogguy <[email protected]> Date: Sat Mar 5 20:19:32 2011 +0100 Add patch 0001-Use-system-ant-contrib.jar.patch --- debian/changelog | 3 ++- .../patches/0001-Use-system-ant-contrib.jar.patch | 22 ++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index f96d1c2..cc2a96b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,8 +9,9 @@ scala (2.8.1.dfsg-1) unstable; urgency=low * Add libmaven-ant-tasks-java, ant-contrib and ant-optional in Build-Depends. * Switch to source format 3.0 (quilt). + * Add patch 0001-Use-system-ant-contrib.jar.patch - -- Mehdi Dogguy <[email protected]> Sat, 05 Mar 2011 20:13:30 +0100 + -- Mehdi Dogguy <[email protected]> Sat, 05 Mar 2011 20:19:18 +0100 scala (2.7.7.dfsg-4) unstable; urgency=low diff --git a/debian/patches/0001-Use-system-ant-contrib.jar.patch b/debian/patches/0001-Use-system-ant-contrib.jar.patch new file mode 100644 index 0000000..49b2527 --- /dev/null +++ b/debian/patches/0001-Use-system-ant-contrib.jar.patch @@ -0,0 +1,22 @@ +From: Mehdi Dogguy <[email protected]> +Date: Sat, 5 Mar 2011 20:16:47 +0100 +Subject: [PATCH] Use system ant-contrib.jar + +--- + build.xml | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/build.xml b/build.xml +index 59cd959..97e6c0d 100644 +--- a/build.xml ++++ b/build.xml +@@ -206,7 +206,7 @@ INITIALISATION + <property name="scalac.args.all" value="${scalac.args} ${scalac.args.optimise}"/> + <property name="scalac.args.quick" value="${scalac.args.all} ${scalac.args.quickonly}"/> + <!-- Setting-up Ant contrib tasks --> +- <taskdef resource="net/sf/antcontrib/antlib.xml" classpath="${lib.dir}/ant/ant-contrib.jar"/> ++ <taskdef resource="net/sf/antcontrib/antlib.xml" classpath="/usr/share/java/ant-contrib.jar"/> + <!-- This is the start time for the distribution --> + <tstamp prefix="time"> + <format property="human" pattern="d MMMM yyyy, HH:mm:ss"/> +-- diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..1ac3d62 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +0001-Use-system-ant-contrib.jar.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
