[Pkg-scala-commits] [SCM] Scala packaging branch, master, updated. debian/2.9.1.dfsg-1-14-gf1e1282

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit d856a3f688e7d467c0cba148cf71cd9781d00365
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Thu Dec 15 17:58:37 2011 +0100

    Build and install JLine

diff --git a/debian/ant-jline.properties b/debian/ant-jline.properties
index afa7031..1b2d3c6 100644
--- a/debian/ant-jline.properties
+++ b/debian/ant-jline.properties
@@ -1,3 +1,3 @@
 class.dir=dists/jline
 source.dir=src/jline/src
-jar.name=${class.dir}/jline.jar
+jar.name=lib/jline.jar
diff --git a/debian/rules b/debian/rules
index 5e3bdf2..0b2aec6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,9 @@ include $(CURDIR)/build.number
 BUNDLE_VERSION="$(version.major).$(version.minor).$(version.patch)"
 
 override_dh_auto_build:
+	# Build Jline
+	ant -f debian/build-jline.xml -propertyfile debian/ant-jline.properties
+	# Build Scala
 	ANT_OPTS="-Xmx1024M -Xss64M" ant -Dversion.number=$(BUNDLE_VERSION) fastdist
 
 	# Use jQuery from libjs-jquery{,ui}

-- 
Scala packaging