[Pkg-scala-commits] [SCM] Scala packaging branch, master, updated. debian/2.8.1.dfsg-1-12-ge5a9644

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit e5a9644052287d36b09a59231b516741d91598a1
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Thu Jun 23 23:07:22 2011 +0200

    dummy commit

diff --git a/debian/changelog b/debian/changelog
index 001fdd4..2fa4cea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ scala (2.9.0.1.dfsg-1) unstable; urgency=low
 
   [ Mehdi Dogguy ]
   * New upstream release (Closes: #631429) (LP: #782013).
+  * Refresh patch.
 
   [ Frank S. Thomas ]
   * Updated debian/copyright for Scala 2.9.0.1.
@@ -9,7 +10,7 @@ scala (2.9.0.1.dfsg-1) unstable; urgency=low
   * Fix spelling error in changelog.
   * Remove copyright information about docs/android-examples.
 
- -- Mehdi Dogguy <mehdi at debian.org>  Thu, 23 Jun 2011 22:46:56 +0200
+ -- Mehdi Dogguy <mehdi at debian.org>  Thu, 23 Jun 2011 23:12:48 +0200
 
 scala (2.8.1.dfsg-1) 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
index 49b2527..b62a9b7 100644
--- a/debian/patches/0001-Use-system-ant-contrib.jar.patch
+++ b/debian/patches/0001-Use-system-ant-contrib.jar.patch
@@ -1,5 +1,5 @@
 From: Mehdi Dogguy <mehdi at debian.org>
-Date: Sat, 5 Mar 2011 20:16:47 +0100
+Date: Thu, 23 Jun 2011 23:12:28 +0200
 Subject: [PATCH] Use system ant-contrib.jar
 
 ---
@@ -7,16 +7,16 @@ Subject: [PATCH] Use system ant-contrib.jar
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/build.xml b/build.xml
-index 59cd959..97e6c0d 100644
+index b121824..51986d6 100644
 --- a/build.xml
 +++ b/build.xml
-@@ -206,7 +206,7 @@ INITIALISATION
+@@ -211,7 +211,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 -->
+ 	  <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 -->
+     <!-- This is the start time for the distribution -->
      <tstamp prefix="time">
        <format property="human" pattern="d MMMM yyyy, HH:mm:ss"/>
 -- 

-- 
Scala packaging