[Pkg-scala-commits] [SCM] Scala packaging branch, master, updated. debian/2.7.2-2-7-gbe43263

[Min Huang]

The following commit has been merged in the master branch:
commit be432630a7bc0a3f6df7e30d5da001e47d25d731
Author: Min Huang <min.huang at alumni.usc.edu>
Date:   Sat Jan 17 05:01:10 2009 -0800

    Updated for 2.7.3 release

diff --git a/debian/changelog b/debian/changelog
index 483dfd6..da4ef4f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+scala (2.7.3-1) unstable; urgency=low
+
+  * New upstream release 
+  * Crash with OpenJDK installed is fixed (Closes: #505913)
+
+ -- Min Huang <min.huang at alumni.usc.edu>  Fri, 16 Jan 2009 17:14:06 -0800
+
 scala (2.7.2-2) unstable; urgency=low
 
   * Recompiling to upload on Min Huang's behalf.
diff --git a/debian/control b/debian/control
index f3c8837..8ddb238 100644
--- a/debian/control
+++ b/debian/control
@@ -5,13 +5,13 @@ Maintainer: Min Huang <min.huang at alumni.usc.edu>
 Uploaders: Mehdi Dogguy <dogguy at pps.jussieu.fr>, Lex Spoon <lex at debian.org>
 DM-Upload-Allowed: yes
 Standards-Version: 3.8.0
-Build-Depends: java-gcj-compat-dev,  gij | java-virtual-machine, ant,  debhelper (>= 7)
+Build-Depends: default-jdk-builddep, ant, debhelper (>= 7)
 Vcs-Browser: http://git.debian.org/?p=pkg-scala/packages/scala.git
 Vcs-Git: git://git.debian.org/git/pkg-scala/packages/scala.git
 
 Package: scala
 Architecture: all
-Depends: scala-library, java-gcj-compat-dev, gij | java-virtual-machine
+Depends: scala-library, default-jdk
 Description: The Scala programming language
  Scala is a Java-compatible programming language with many
  modern language features.  It is Java-compatible in that
@@ -28,7 +28,7 @@ Description: The Scala programming language
 
 Package: scala-library
 Architecture: all
-Depends: gij | java-virtual-machine
+Depends: default-jdk
 Description: The Scala standard library
  This run-time library is needed to run Scala programs.
 
diff --git a/debian/rules b/debian/rules
index f70655c..eba7c91 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,7 +17,7 @@ clean:
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_prep
 	dh_installdirs -A
 	dh_install
 	dh_installdocs -A

-- 
Scala packaging