[scala-2.10] 56/166: Use upstream build system

[Emmanuel Bourg]

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 6f39617500a935e3f58b6e1fa842c017a4ee6501
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Thu Mar 3 17:54:35 2011 +0100

    Use upstream build system
---
 debian/changelog             | 4 +++-
 debian/clean                 | 3 ---
 debian/rules                 | 8 +++++---
 debian/scala-doc.install     | 4 +++-
 debian/scala-library.install | 6 ++++--
 debian/scala.install         | 3 ++-
 debian/scala.manpages        | 3 ++-
 7 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9838c50..3205deb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 scala (2.8.1.dfsg-1) unstable; urgency=low
 
   * New upstream release (LP: #717745).
+  * Use upstream build system
+  * Set a fixed version number (The one from META-INF/MANIFEST.MF).
 
- -- Mehdi Dogguy <mehdi at debian.org>  Sat, 05 Mar 2011 19:23:06 +0100
+ -- Mehdi Dogguy <mehdi at debian.org>  Sat, 05 Mar 2011 19:26:17 +0100
 
 scala (2.7.7.dfsg-4) unstable; urgency=low
 
diff --git a/debian/clean b/debian/clean
deleted file mode 100644
index a5ad885..0000000
--- a/debian/clean
+++ /dev/null
@@ -1,3 +0,0 @@
-src/actors/scala/actors/ThreadPoolScheduler.scala
-dists
-build
diff --git a/debian/rules b/debian/rules
index 54fc019..dc1493f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,14 +2,16 @@
 
 export DH_VERBOSE=1
 
+BUNDLE_VERSION=$(shell sed -n "s/Bundle-Version: //p" META-INF/MANIFEST.MF)
+
 override_dh_auto_build:
-	ANT_OPTS="-Xmx1024M -Xss64M" ant -f debian/simpbuild.xml build docs dist
+	ANT_OPTS="-Xmx1024M -Xss64M" ant -Dversion.number=$(BUNDLE_VERSION) fastdist
 
 override_dh_auto_clean:
-	rm -rf simpbuild
+	rm -rf build dist
 
 override_dh_compress:
-	dh_compress -Xscript.js
+	dh_compress -X.js
 
 %:
 	dh $@
diff --git a/debian/scala-doc.install b/debian/scala-doc.install
index a635412..7d323bf 100644
--- a/debian/scala-doc.install
+++ b/debian/scala-doc.install
@@ -1 +1,3 @@
-simpbuild/api/library/scala/api/* usr/share/doc/scala-doc/html/
+dists/latest/doc/scala-devel-docs/api/*		usr/share/doc/scala-doc/html/
+dists/latest/doc/scala-devel-docs/examples/*	usr/share/doc/scala-doc/examples/
+dists/latest/doc/scala-devel-docs/tools/*	usr/share/doc/scala-doc/tools/
diff --git a/debian/scala-library.install b/debian/scala-library.install
index 0007f29..4ebb0e4 100644
--- a/debian/scala-library.install
+++ b/debian/scala-library.install
@@ -1,2 +1,4 @@
-simpbuild/lib/scala-library.jar usr/share/java/
-simpbuild/lib/scala-dbc.jar usr/share/java/
+dists/latest/lib/scala-library.jar	usr/share/java/
+dists/latest/lib/scala-dbc.jar		usr/share/java/
+dists/latest/lib/scala-swing.jar	usr/share/java/
+dists/latest/lib/scala-partest.jar	usr/share/java/
diff --git a/debian/scala.install b/debian/scala.install
index e1303f6..d87a6f6 100644
--- a/debian/scala.install
+++ b/debian/scala.install
@@ -1,2 +1,3 @@
-simpbuild/lib/scala-compiler.jar usr/share/java/
 debian/command-scripts/* usr/bin/
+dists/latest/lib/scala-compiler.jar	usr/share/java/
+dists/latest/lib/scalap.jar		usr/share/java/
diff --git a/debian/scala.manpages b/debian/scala.manpages
index d9c7052..7b834e3 100644
--- a/debian/scala.manpages
+++ b/debian/scala.manpages
@@ -1 +1,2 @@
-simpbuild/manual/man1/*.1
+dists/latest/man/man1/scala*.1
+dists/latest/man/man1/fsc.1

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/scala-2.10.git